imap: imap_client_enable_imap4rev2() - Make IMAP4rev2 imply UTF8=ACCEPT

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index 8884e8b179a28ea2e6b4bb96d2dbed67890b3a4e..47709aa4009d9780064c7bc560731d5cf1c77745 100644 (file)
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -1665,11 +1665,14 @@ static bool imap_client_enable_imap4rev2(struct client *client)
                return FALSE;
        }
 
-       if (client->mailbox != NULL)
+       if (client->mailbox != NULL) {
                mailbox_enable(client->mailbox, MAILBOX_FEATURE_IMAP4REV2);
+               mailbox_enable(client->mailbox, MAILBOX_FEATURE_UTF8ACCEPT);
+       }
 
-       /* If IMAP4rev2 is enabled always enable QRESYNC */
+       /* If IMAP4rev2 is enabled also enable QRESYNC and UTF8=ACCEPT */
        client_enable(client, imap_feature_qresync);
+       client_enable(client, imap_feature_utf8accept);
        return TRUE;
 }
 #endif