--- a/src/lib-storage/index/maildir/maildir-uidlist.c	Sat Feb 06 21:05:18 2010 +0200
+++ b/src/lib-storage/index/maildir/maildir-uidlist.c	Sat Feb 06 21:08:55 2010 +0200
@@ -123,6 +123,7 @@
 	uint32_t prev_uid;
 };
 
+static int maildir_uidlist_open_latest(struct maildir_uidlist *uidlist);
 static bool maildir_uidlist_iter_next_rec(struct maildir_uidlist_iter_ctx *ctx,
 					  struct maildir_uidlist_rec **rec_r);
 
@@ -871,11 +872,10 @@
 	}
 }
 
-int maildir_uidlist_refresh(struct maildir_uidlist *uidlist)
+static int maildir_uidlist_open_latest(struct maildir_uidlist *uidlist)
 {
-        unsigned int i;
-        bool retry, recreated;
-        int ret;
+	bool recreated;
+	int ret;
 
 	if (uidlist->fd != -1) {
 		ret = maildir_uidlist_has_changed(uidlist, &recreated);
@@ -885,9 +885,28 @@
 			return ret < 0 ? -1 : 1;
 		}
 
-		if (recreated)
-			maildir_uidlist_close(uidlist);
+		if (!recreated)
+			return 0;
+		maildir_uidlist_close(uidlist);
+	}
+
+	uidlist->fd = nfs_safe_open(uidlist->path, O_RDWR);
+	if (uidlist->fd == -1 && errno != ENOENT) {
+		mail_storage_set_critical(uidlist->ibox->box.storage,
+			"open(%s) failed: %m", uidlist->path);
+		return -1;
 	}
+	return 0;
+}
+
+int maildir_uidlist_refresh(struct maildir_uidlist *uidlist)
+{
+        unsigned int i;
+        bool retry;
+        int ret;
+
+	if (maildir_uidlist_open_latest(uidlist) < 0)
+		return -1;
 
         for (i = 0; ; i++) {
 		ret = maildir_uidlist_update_read(uidlist, &retry,
@@ -1430,18 +1449,12 @@
 	if (maildir_uidlist_want_recreate(ctx))
 		return maildir_uidlist_recreate(uidlist);
 
-	if (uidlist->fd == -1) {
-		/* NOREFRESH flag used. we're just appending some messages. */
+	if (!uidlist->locked_refresh || uidlist->fd == -1) {
+		/* make sure we have the latest file (e.g. NOREFRESH used) */
 		i_assert(uidlist->initial_hdr_read);
-
-		uidlist->fd = nfs_safe_open(uidlist->path, O_RDWR);
-		if (uidlist->fd == -1) {
-			mail_storage_set_critical(storage,
-				"open(%s) failed: %m", uidlist->path);
+		if (maildir_uidlist_open_latest(uidlist) < 0)
 			return -1;
-		}
 	}
-
 	i_assert(ctx->first_unwritten_pos != (unsigned int)-1);
 
 	if (lseek(uidlist->fd, 0, SEEK_END) < 0) {