diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 0d85986..d004233 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1319,8 +1319,8 @@ camel_folder_summary_save_to_db (CamelFolderSummary *s, CamelException *ex)
 	s->flags &= ~CAMEL_SUMMARY_DIRTY;
 
 	count = cfs_count_dirty(s);
-	if (!count)
-		return 0;
+	if (!count) 
+		return camel_folder_summary_header_save_to_db (s, ex);
 
 	printf("Saving %d/%d dirty records of %s\n", count, g_hash_table_size (s->loaded_infos), s->folder->full_name);
 
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index 6b0781d..317ef1c 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -847,15 +847,13 @@ mbox_summary_sync_quick(CamelMboxSummary *mbs, gboolean expunge, CamelFolderChan
 			goto error;			
 		}
 
-		/* Somehow this isn't required */
-		/*
 		if (camel_mime_parser_tell_start_from(mp) != info->frompos) {
 			g_warning("Didn't get the next message where I expected (%d) got %d instead",
 				  (int)info->frompos, (int)camel_mime_parser_tell_start_from(mp));
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
 					     _("Summary and folder mismatch, even after a sync"));
 			goto error;
-		} */
+		} 
 
 		if (camel_mime_parser_step(mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM_END) {
 			g_warning("camel_mime_parser_step failed (2)");
@@ -1066,14 +1064,13 @@ camel_mbox_summary_sync_mbox(CamelMboxSummary *cls, guint32 flags, CamelFolderCh
 			goto error;
 		}
 
-		/* Somehow this isn't required */
-		/*if (camel_mime_parser_tell_start_from(mp) != info->frompos) {
+		if (camel_mime_parser_tell_start_from(mp) != info->frompos) {
 			g_warning("Didn't get the next message where I expected (%d) got %d instead",
 				  (int)info->frompos, (int)camel_mime_parser_tell_start_from(mp));
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
 					     _("Summary and folder mismatch, even after a sync"));
 			goto error;
-		}*/
+		}
 
 		lastdel = FALSE;
 		if ((flags&1) && info->info.info.flags & CAMEL_MESSAGE_DELETED) {
