diff -up evolution-3.8.5/modules/mail/e-mail-shell-view-private.c.redundant-folder-save evolution-3.8.5/modules/mail/e-mail-shell-view-private.c
--- evolution-3.8.5/modules/mail/e-mail-shell-view-private.c.redundant-folder-save	2013-08-03 15:23:06.000000000 +0200
+++ evolution-3.8.5/modules/mail/e-mail-shell-view-private.c	2014-01-30 12:33:53.241856551 +0100
@@ -498,18 +498,10 @@ mail_shell_view_reader_update_actions_cb
 }
 
 static void
-mail_shell_view_prepare_for_quit_done_cb (CamelFolder *folder,
-                                          gpointer user_data)
-{
-	g_object_unref (E_ACTIVITY (user_data));
-}
-
-static void
 mail_shell_view_prepare_for_quit_cb (EMailShellView *mail_shell_view,
                                      EActivity *activity)
 {
 	EMailShellContent *mail_shell_content;
-	CamelFolder *folder;
 	EMailReader *reader;
 	EMailView *mail_view;
 	GtkWidget *message_list;
@@ -522,18 +514,11 @@ mail_shell_view_prepare_for_quit_cb (EMa
 	mail_view = e_mail_shell_content_get_mail_view (mail_shell_content);
 
 	reader = E_MAIL_READER (mail_view);
-	folder = e_mail_reader_get_folder (reader);
 	message_list = e_mail_reader_get_message_list (reader);
-
 	message_list_save_state (MESSAGE_LIST (message_list));
 
-	if (folder == NULL)
-		return;
-
-	mail_sync_folder (
-		folder, TRUE,
-		mail_shell_view_prepare_for_quit_done_cb,
-		g_object_ref (activity));
+	/* Do not sync folder content here, it's duty of EMailBackend,
+	   which does it for all accounts */
 }
 
 static void