diff --git a/THANKS b/THANKS
index aa25ee8f..15d4ff7f 100644
--- a/THANKS
+++ b/THANKS
@@ -13,6 +13,7 @@ Victor Eduardo <victor@elementaryos.org>
 Daniel Foré <daniel@elementaryos.org>
 Sven Hagemann <sven@rednose.nl>
 Timo Kluck <tkluck@infty.nl>
+Kai Mast <mail@kai-mast.de>
 Thomas Moschny <thomas.moschny@gmx.de>
 Robert Park <rbpark@exolucere.ca>
 Mario Sanchez Prada <msanchez@igalia.com>
diff --git a/src/engine/imap/decoders/imap-select-examine-results.vala b/src/engine/imap/decoders/imap-select-examine-results.vala
index 8ecf30d0..3e0c2904 100644
--- a/src/engine/imap/decoders/imap-select-examine-results.vala
+++ b/src/engine/imap/decoders/imap-select-examine-results.vala
@@ -90,6 +90,10 @@ public class Geary.Imap.SelectExamineResults : Geary.Imap.CommandResults {
                                     ok_response.response_code.get_as_list(1));
                             break;
                             
+                            case ResponseCodeType.MYRIGHTS:
+                                // not implemented
+                            break;
+                            
                             default:
                                 message("Unknown line in SELECT/EXAMINE response: \"%s\"", data.to_string());
                             break;
diff --git a/src/engine/imap/response/imap-response-code-type.vala b/src/engine/imap/response/imap-response-code-type.vala
index 2dcc2d10..15d22029 100644
--- a/src/engine/imap/response/imap-response-code-type.vala
+++ b/src/engine/imap/response/imap-response-code-type.vala
@@ -14,7 +14,8 @@ public enum Geary.Imap.ResponseCodeType {
     TRY_CREATE,
     UIDVALIDITY,
     UIDNEXT,
-    UNSEEN;
+    UNSEEN,
+    MYRIGHTS;
     
     public string to_string() {
         switch (this) {
@@ -48,6 +49,9 @@ public enum Geary.Imap.ResponseCodeType {
             case UNSEEN:
                 return "unseen";
             
+            case MYRIGHTS:
+                return "myrights";
+            
             default:
                 assert_not_reached();
         }
@@ -85,6 +89,9 @@ public enum Geary.Imap.ResponseCodeType {
             case "unseen":
                 return UNSEEN;
             
+            case "myrights":
+                return MYRIGHTS;
+            
             default:
                 throw new ImapError.PARSE_ERROR("Unknown response code \"%s\"", value);
         }