IMAP keepalive might have been interacting badly with $timeout when IDLE

was enabled. Use force option for IDLE too.

diff --git a/imap/imap.c b/imap/imap.c
index 0732cd139c4358b155a21d232537cf0d485aceeb..8f14a84c74dbbe65e32526e389863848cda6c696 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1187,7 +1187,7 @@ int imap_check_mailbox (CONTEXT *ctx, int *index_hint, int force)
   /* try IDLE first */
   if (option (OPTIMAPIDLE) && mutt_bit_isset (idata->capabilities, IDLE)
       && (idata->state != IMAP_IDLE
-          || time(NULL) >= idata->lastread + ImapKeepalive))
+          || force || time(NULL) >= idata->lastread + ImapKeepalive))
   {
     imap_cmd_start (idata, "IDLE");
     do