imap: Fixed enabling METADATA if imap_capability string was explicitly set

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index e0419ab34d7a2061fe3aa0b85d8ad5eb4ef7ba67..49e7a59d8157816b03ac873f686169e45cec4b60 100644 (file)
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -138,10 +138,10 @@ struct client *client_create(int fd_in, int fd_out, const char *session_id,
                if (!explicit_capability)
                        str_append(client->capability_string, " URLAUTH URLAUTH=BINARY");
        }
-       if (set->imap_metadata && *mail_set->mail_attribute_dict != '\0' &&
-           !explicit_capability) {
+       if (set->imap_metadata && *mail_set->mail_attribute_dict != '\0') {
                client->imap_metadata_enabled = TRUE;
-               str_append(client->capability_string, " METADATA");
+               if (!explicit_capability)
+                       str_append(client->capability_string, " METADATA");
        }
 
        ident = mail_user_get_anvil_userip_ident(client->user);