--- evolution-data-server-3.0.2.1/camel/providers/imapx/camel-imapx-server.c.orig	2011-08-05 14:36:57.392936698 +0200
+++ evolution-data-server-3.0.2.1/camel/providers/imapx/camel-imapx-server.c	2011-08-05 15:51:10.149831559 +0200
@@ -4600,19 +4600,27 @@
 
 	if (ic->error != NULL || ic->status->result != IMAPX_OK) {
 		if (!job->error) {
-			if (ic->error == NULL)
+			if (ic->error == NULL) {
+		if (strncmp(ic->name, "STORE", 5) == 0) {
+		        g_warning("STORE found; skipping");
+		} else {
 				g_set_error (
 					&job->error, CAMEL_IMAPX_ERROR, 1,
-					"Error syncing changes: %s", ic->status->text);
-			else {
+					"Error syncing changes: %s running %s", ic->status->text, ic->name);
+					}
+			} else {
 				g_propagate_error (&job->error, ic->error);
 				ic->error = NULL;
 			}
 		} else if (ic->error) {
 			g_clear_error (&ic->error);
 		}
-
-		failed = TRUE;
+		if (strncmp(ic->name, "STORE", 5) == 0) {
+		        g_warning("STORE found; skipping");
+		} else {
+		        g_warning("different error: FAIL");
+		        failed = TRUE;
+		}
 	}
 
 	/* lock cache ? */
@@ -4703,7 +4711,8 @@
 				if ( (on && (((flags ^ sflags) & flags) & flag))
 				     || (!on && (((flags ^ sflags) & ~flags) & flag))) {
 					if (ic == NULL) {
-						ic = camel_imapx_command_new (
+					        g_warning("Not user set");						
+					        ic = camel_imapx_command_new (
 							is, "STORE", job->folder,
 							job->cancellable, "UID STORE ");
 						ic->complete = imapx_command_sync_changes_done;
@@ -4741,6 +4750,7 @@
 					CamelIMAPXMessageInfo *info = c->infos->pdata[i];
 
 					if (ic == NULL) {
+					        g_warning("User set");
 						ic = camel_imapx_command_new (
 							is, "STORE", job->folder,
 							job->cancellable, "UID STORE ");
