From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 25 Dec 2017 20:48:00 +0000 (+0200)
Subject: imapc: gmail-migration: Fetch X-GM-MSGID for new mails as well
X-Git-Tag: 2.2.34~127
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b185c7932f5d3eaad0b016987693dbce7ba8cefb;p=thirdparty%2Fdovecot%2Fcore.git

imapc: gmail-migration: Fetch X-GM-MSGID for new mails as well

I'm not sure why it was originally restricted only for the initial FETCH.
Fetching GUIDs for new mails can be just as useful.
---

diff --git a/src/lib-storage/index/imapc/imapc-mailbox.c b/src/lib-storage/index/imapc/imapc-mailbox.c
index 7cf160af77..385665e5ee 100644
--- a/src/lib-storage/index/imapc/imapc-mailbox.c
+++ b/src/lib-storage/index/imapc/imapc-mailbox.c
@@ -194,8 +194,7 @@ void imapc_mailbox_fetch_state(struct imapc_mailbox *mbox, string_t *str,
 	if (IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_GMAIL_MIGRATION)) {
 		enum mailbox_info_flags flags;
 
-		if (first_uid == 1 &&
-		    !mail_index_is_in_memory(mbox->box.index)) {
+		if (!mail_index_is_in_memory(mbox->box.index)) {
 			/* these can be efficiently fetched among flags and
 			   stored into cache */
 			str_append(str, " X-GM-MSGID");