Mail index view sync: Don't look for expunges if we already did it once.

--HG--
branch : HEAD

diff --git a/src/lib-index/mail-index-view-sync.c b/src/lib-index/mail-index-view-sync.c
index 7b714a37f716d3e5243ef79d01460a2cff7d8fca..37fbbc8cdf71491eab4073f92066bc4b1a862928 100644 (file)
--- a/src/lib-index/mail-index-view-sync.c
+++ b/src/lib-index/mail-index-view-sync.c
@@ -329,6 +329,9 @@ mail_index_view_sync_begin(struct mail_index_view *view,
                        ctx->failed = TRUE;
                        return ctx;
                }
+               have_expunges = expunge_count > 0;
+       } else {
+               have_expunges = view_sync_have_expunges(view);
        }
 
        ctx->finish_min_msg_count = reset ? 0 :
@@ -343,7 +346,6 @@ mail_index_view_sync_begin(struct mail_index_view *view,
                                     view->index->filepath);
        }
 
-       have_expunges = view_sync_have_expunges(view);
        if (!have_expunges) {
                /* no expunges, we can just replace the map */
                if (view->index->map->hdr.messages_count <