merge: bugs-common

 * Reset buffy->new for the current mailbox in IMAP.

diff --cc imap/imap.c
index 84a73732f2ee304126e3250fffbf750afc0f2d62,2b1fc6d978ce1e3b601bf90cd549f7b7b4fb70cc..feb06efe48fdf3a8e5b73f8f5e92b56ac3c5199e
--- 1/imap/imap.c
--- 2/imap/imap.c
+++ b/imap/imap.c
@@@ -1510,8 -1501,13 +1510,11 @@@ int imap_buffy_check (int force, int ch
      if (mailbox->magic != M_IMAP)
        continue;
  
 -    mailbox->new = 0;
 -
      if (imap_get_mailbox (mailbox->path, &idata, name, sizeof (name)) < 0)
+     {
+       mailbox->new = 0;
        continue;
+     }
  
      /* Don't issue STATUS on the selected mailbox, it will be NOOPed or
       * IDLEd elsewhere.