imap-login: Retain client ID only when enabled

diff --git a/src/imap-login/imap-login-client.c b/src/imap-login/imap-login-client.c
index ab764594945694ddc8ad71baf54edc3e967ee888..fd0a4eb2a8a4c9d180add637b61f1527c31ef78b 100644 (file)
--- a/src/imap-login/imap-login-client.c
+++ b/src/imap-login/imap-login-client.c
@@ -217,7 +217,7 @@ static void cmd_id_handle_keyvalue(struct imap_client *client,
                client_id_str = !client_id_reserved_word(key);
        }
 
-       if (client_id_str &&
+       if (client->set->imap_id_retain && client_id_str &&
            (client->common.client_id == NULL ||
             str_len(client->common.client_id) + kvlen < LOGIN_MAX_CLIENT_ID_LEN)) {
                if (client->common.client_id == NULL) {