diff -r 2aea8ff5e26f src/lib-storage/index/maildir/maildir-sync.c
--- a/src/lib-storage/index/maildir/maildir-sync.c	Tue Mar 20 17:46:06 2012 +0200
+++ b/src/lib-storage/index/maildir/maildir-sync.c	Thu May 17 00:34:29 2012 +0300
@@ -495,6 +495,9 @@
 		move_count = MAILDIR_RENAME_RESCAN_COUNT + 1;
 	} else
 #endif
+	if (errno == ELOOP && move_count > 0 && !final) {
+		move_count = MAILDIR_RENAME_RESCAN_COUNT + 1;
+	} else
 
 	if (errno != 0) {
 		mail_storage_set_critical(storage,