merge stable

diff --cc imap/imap.c
index 5d6f6a2b35a7c9dc98c748c6c77f83e5ecdafb06,7b1060a99d78f48b0d8183c831d1ee2617d43b4e..67b2c4ce3491573278f84c69915578399bfa8e1b
--- 1/imap/imap.c
--- 2/imap/imap.c
+++ b/imap/imap.c
@@@ -1406,21 -1418,7 +1427,9 @@@ int imap_close_mailbox (CONTEXT* ctx
      /* mailbox may not have fully loaded */
      if (ctx->hdrs[i] && ctx->hdrs[i]->data)
        imap_free_header_data ((IMAP_HEADER_DATA**)&(ctx->hdrs[i]->data));
-   hash_destroy (&idata->uid_hash, NULL);
 +  FREE (&idata->msn_index);
 +  idata->msn_index_size = 0;
  
-   for (i = 0; i < IMAP_CACHE_LEN; i++)
-   {
-     if (idata->cache[i].path)
-     {
-       unlink (idata->cache[i].path);
-       FREE (&idata->cache[i].path);
-     }
-   }
- 
-   mutt_bcache_close (&idata->bcache);
- 
    return 0;
  }