diff -up evolution-data-server-3.8.5/camel/camel-imapx-conn-manager.c.imapx-conn-manager-ext evolution-data-server-3.8.5/camel/camel-imapx-conn-manager.c

--- evolution-data-server-3.8.5/camel/camel-imapx-conn-manager.c.imapx-conn-manager-ext	2013-07-23 13:57:46.000000000 +0200

+++ evolution-data-server-3.8.5/camel/camel-imapx-conn-manager.c	2014-05-13 14:17:43.115983665 +0200

@@ -47,6 +47,7 @@ struct _CamelIMAPXConnManagerPrivate {

 	GList *connections;

 	GWeakRef store;

 	GRWLock rw_lock;

+	guint limit_max_connections;

 };

 struct _ConnectionInfo {

@@ -54,6 +55,7 @@ struct _ConnectionInfo {

 	CamelIMAPXServer *is;

 	GHashTable *folder_names;

 	gchar *selected_folder;

+	GError *shutdown_error;

 	volatile gint ref_count;

 };

@@ -68,7 +70,9 @@ G_DEFINE_TYPE (

 	CAMEL_TYPE_OBJECT)

 static void

-imapx_conn_shutdown (CamelIMAPXServer *is, CamelIMAPXConnManager *con_man);

+imapx_conn_shutdown (CamelIMAPXServer *is,

+		     const GError *error,

+		     CamelIMAPXConnManager *con_man);

 static void

 imapx_conn_update_select (CamelIMAPXServer *is,

@@ -91,6 +95,7 @@ connection_info_new (CamelIMAPXServer *i

 	g_mutex_init (&cinfo->lock);

 	cinfo->is = g_object_ref (is);

 	cinfo->folder_names = folder_names;

+	cinfo->shutdown_error = NULL;

 	cinfo->ref_count = 1;

 	return cinfo;

@@ -114,11 +119,15 @@ connection_info_unref (ConnectionInfo *c

 	g_return_if_fail (cinfo->ref_count > 0);

 	if (g_atomic_int_dec_and_test (&cinfo->ref_count)) {

-		camel_imapx_server_connect (cinfo->is, NULL, NULL);

+		camel_imapx_server_shutdown (cinfo->is, cinfo->shutdown_error);

+		g_signal_handlers_disconnect_matched (cinfo->is, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, imapx_conn_shutdown, NULL);

+		g_signal_handlers_disconnect_matched (cinfo->is, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, imapx_conn_update_select, NULL);

+

 		g_mutex_clear (&cinfo->lock);

 		g_object_unref (cinfo->is);

 		g_hash_table_destroy (cinfo->folder_names);

 		g_free (cinfo->selected_folder);

+		g_clear_error (&cinfo->shutdown_error);

 		g_slice_free (ConnectionInfo, cinfo);

 	}

@@ -132,6 +141,7 @@ connection_info_cancel_and_unref (Connec

 	g_signal_handlers_disconnect_matched (cinfo->is, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, imapx_conn_shutdown, NULL);

 	g_signal_handlers_disconnect_matched (cinfo->is, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, imapx_conn_update_select, NULL);

+	camel_imapx_server_shutdown (cinfo->is, cinfo->shutdown_error);

 	g_cancellable_cancel (cinfo->is->cancellable);

 	connection_info_unref (cinfo);

 }

@@ -145,8 +155,9 @@ connection_info_is_available (Connection

 	g_mutex_lock (&cinfo->lock);

-	/* Available means it's not tracking any folder names. */

-	available = (g_hash_table_size (cinfo->folder_names) == 0);

+	/* Available means it's not tracking any folder names or no jobs are running. */

+	available = (g_hash_table_size (cinfo->folder_names) == 0) ||

+		    camel_imapx_server_get_command_count (cinfo->is) == 0;

 	g_mutex_unlock (&cinfo->lock);

@@ -234,6 +245,23 @@ connection_info_set_selected_folder (Con

 	g_mutex_unlock (&cinfo->lock);

 }

+static void

+connection_info_set_shutdown_error (ConnectionInfo *cinfo,

+                                    const GError *shutdown_error)

+{

+	g_return_if_fail (cinfo != NULL);

+

+	g_mutex_lock (&cinfo->lock);

+

+	if (cinfo->shutdown_error != shutdown_error) {

+		g_clear_error (&cinfo->shutdown_error);

+		if (shutdown_error)

+			cinfo->shutdown_error = g_error_copy (shutdown_error);

+	}

+

+	g_mutex_unlock (&cinfo->lock);

+}

+

 static GList *

 imapx_conn_manager_list_info (CamelIMAPXConnManager *con_man)

 {

@@ -416,11 +444,9 @@ camel_imapx_conn_manager_init (CamelIMAP

 	g_rw_lock_init (&con_man->priv->rw_lock);

 }

-/* Static functions go here */

-

-/* TODO destroy unused connections in a time-out loop */

 static void

 imapx_conn_shutdown (CamelIMAPXServer *is,

+		     const GError *error,

                      CamelIMAPXConnManager *con_man)

 {

 	ConnectionInfo *cinfo;

@@ -432,6 +458,14 @@ imapx_conn_shutdown (CamelIMAPXServer *i

 		imapx_conn_manager_remove_info (con_man, cinfo);

 		connection_info_unref (cinfo);

 	}

+

+	/* If one connection ends with this error, then it means all

+	   other opened connections also may end with the same error,

+	   thus better to kill them all from the list of connections.

+	*/

+	if (g_error_matches (error, CAMEL_IMAPX_SERVER_ERROR, CAMEL_IMAPX_SERVER_ERROR_TRY_RECONNECT)) {

+		camel_imapx_conn_manager_close_connections (con_man, error);

+	}

 }

 static void

@@ -451,14 +485,10 @@ imapx_conn_update_select (CamelIMAPXServ

 	old_selected_folder = connection_info_dup_selected_folder (cinfo);

 	if (old_selected_folder != NULL) {

-		IMAPXJobQueueInfo *jinfo;

-

-		jinfo = camel_imapx_server_get_job_queue_info (is);

-		if (!g_hash_table_lookup (jinfo->folders, old_selected_folder)) {

+		if (!camel_imapx_server_folder_name_in_jobs (is, old_selected_folder)) {

 			connection_info_remove_folder_name (cinfo, old_selected_folder);

 			c (is->tagprefix, "Removed folder %s from connection folder list - select changed \n", old_selected_folder);

 		}

-		camel_imapx_destroy_job_queue_info (jinfo);

 		g_free (old_selected_folder);

 	}

@@ -471,14 +501,15 @@ imapx_conn_update_select (CamelIMAPXServ

 /* This should find a connection if the slots are full, returns NULL if there are slots available for a new connection for a folder */

 static CamelIMAPXServer *

 imapx_find_connection_unlocked (CamelIMAPXConnManager *con_man,

-                                const gchar *folder_name)

+                                const gchar *folder_name,

+				gboolean for_expensive_job)

 {

 	CamelStore *store;

 	CamelSettings *settings;

 	CamelIMAPXServer *is = NULL;

 	ConnectionInfo *cinfo = NULL;

 	GList *list, *link;

-	guint concurrent_connections;

+	guint concurrent_connections, opened_connections, expensive_connections = 0;

 	guint min_jobs = G_MAXUINT;

 	/* Caller must be holding CON_WRITE_LOCK. */

@@ -492,24 +523,85 @@ imapx_find_connection_unlocked (CamelIMA

 		camel_imapx_settings_get_concurrent_connections (

 		CAMEL_IMAPX_SETTINGS (settings));

+	if (con_man->priv->limit_max_connections > 0 &&

+	    con_man->priv->limit_max_connections < concurrent_connections)

+		concurrent_connections = con_man->priv->limit_max_connections;

+

 	g_object_unref (settings);

 	/* XXX Have a dedicated connection for INBOX ? */

+	opened_connections = g_list_length (con_man->priv->connections);

 	list = con_man->priv->connections;

 	/* If a folder was not given, find the least-busy connection. */

-	if (folder_name == NULL)

+	if (folder_name == NULL) {

 		goto least_busy;

+	}

 	/* First try to find a connection already handling this folder. */

 	for (link = list; link != NULL; link = g_list_next (link)) {

 		ConnectionInfo *candidate = link->data;

-		if (connection_info_has_folder_name (candidate, folder_name)) {

+		if (camel_imapx_server_has_expensive_command (candidate->is))

+			expensive_connections++;

+

+		if (connection_info_has_folder_name (candidate, folder_name) &&

+		    (opened_connections >= concurrent_connections || for_expensive_job || !camel_imapx_server_has_expensive_command (candidate->is))) {

+			if (cinfo) {

+				/* group expensive jobs into one connection */

+				if (for_expensive_job && camel_imapx_server_has_expensive_command (cinfo->is))

+					continue;

+

+				if (!for_expensive_job && camel_imapx_server_get_command_count (cinfo->is) < camel_imapx_server_get_command_count (candidate->is))

+					continue;

+

+				connection_info_unref (cinfo);

+			}

+

 			cinfo = connection_info_ref (candidate);

+			if (for_expensive_job && camel_imapx_server_has_expensive_command (cinfo->is))

+				goto exit;

+		}

+	}

+

+ least_busy:

+	if (for_expensive_job) {

+		/* allow only half connections being with expensive operations */

+		if (expensive_connections > 0 &&

+		    expensive_connections < concurrent_connections / 2 &&

+		    opened_connections < concurrent_connections)

 			goto exit;

+

+		/* cinfo here doesn't have any expensive command, thus ignore it */

+		if (cinfo) {

+			connection_info_unref (cinfo);

+			cinfo = NULL;

 		}

+

+		/* Pick the connection with the least number of jobs in progress among those with expensive jobs. */

+		for (link = list; link != NULL; link = g_list_next (link)) {

+			ConnectionInfo *candidate = link->data;

+			guint jobs;

+

+			if (!camel_imapx_server_has_expensive_command (candidate->is))

+				continue;

+

+			jobs = camel_imapx_server_get_command_count (candidate->is);

+

+			if (cinfo == NULL) {

+				cinfo = connection_info_ref (candidate);

+				min_jobs = jobs;

+

+			} else if (jobs < min_jobs) {

+				connection_info_unref (cinfo);

+				cinfo = connection_info_ref (candidate);

+				min_jobs = jobs;

+			}

+		}

+

+		if (cinfo)

+			goto exit;

 	}

 	/* Next try to find a connection not handling any folders. */

@@ -517,44 +609,59 @@ imapx_find_connection_unlocked (CamelIMA

 		ConnectionInfo *candidate = link->data;

 		if (connection_info_is_available (candidate)) {

+			if (cinfo)

+				connection_info_unref (cinfo);

 			cinfo = connection_info_ref (candidate);

 			goto exit;

 		}

 	}

-least_busy:

+	/* open a new connection, if there is a room for it */

+	if (opened_connections < concurrent_connections && (!for_expensive_job || opened_connections < concurrent_connections / 2)) {

+		if (cinfo && camel_imapx_server_get_command_count (cinfo->is) != 0) {

+			connection_info_unref (cinfo);

+			cinfo = NULL;

+		}

+		goto exit;

+	} else {

+		if (cinfo)

+			min_jobs = camel_imapx_server_get_command_count (cinfo->is);

+	}

+

 	/* Pick the connection with the least number of jobs in progress. */

 	for (link = list; link != NULL; link = g_list_next (link)) {

 		ConnectionInfo *candidate = link->data;

-		IMAPXJobQueueInfo *jinfo = NULL;

-

-		jinfo = camel_imapx_server_get_job_queue_info (candidate->is);

+		gint n_commands = camel_imapx_server_get_command_count (candidate->is);

 		if (cinfo == NULL) {

 			cinfo = connection_info_ref (candidate);

-			min_jobs = jinfo->queue_len;

+			min_jobs = n_commands;

-		} else if (jinfo->queue_len < min_jobs) {

+		} else if (n_commands < min_jobs) {

 			connection_info_unref (cinfo);

 			cinfo = connection_info_ref (candidate);

-			min_jobs = jinfo->queue_len;

+			min_jobs = n_commands;

 		}

-

-		camel_imapx_destroy_job_queue_info (jinfo);

 	}

 exit:

 	if (cinfo != NULL && folder_name != NULL)

 		connection_info_insert_folder_name (cinfo, folder_name);

+	if (camel_debug_flag (conman)) {

+		printf ("%s: for-expensive:%d will return:%p cmd-count:%d has-expensive:%d found:%d; connections opened:%d max:%d\n", G_STRFUNC, for_expensive_job, cinfo, cinfo ? camel_imapx_server_get_command_count (cinfo->is) : -2, cinfo ? camel_imapx_server_has_expensive_command (cinfo->is) : -2, expensive_connections, g_list_length (list), concurrent_connections);

+		for (link = list; link != NULL; link = g_list_next (link)) {

+			ConnectionInfo *candidate = link->data;

+

+			printf ("   cmds:%d has-expensive:%d avail:%d cinfo:%p server:%p\n", camel_imapx_server_get_command_count (candidate->is), camel_imapx_server_has_expensive_command (candidate->is), connection_info_is_available (candidate), candidate, candidate->is);

+		}

+	}

+

 	if (cinfo != NULL) {

 		is = g_object_ref (cinfo->is);

 		connection_info_unref (cinfo);

 	}

-	if (camel_debug_flag (conman))

-		g_assert (!(concurrent_connections == g_list_length (con_man->priv->connections) && is == NULL));

-

 	g_object_unref (store);

 	return is;

@@ -601,9 +708,11 @@ imapx_create_new_connection_unlocked (Ca

 	 *     authenticate at once, so this should be thread-safe.

 	 */

 	imapx_store->authenticating_server = g_object_ref (is);

+	camel_imapx_store_set_authenticating_concurrent_connection (imapx_store, con_man->priv->connections != NULL);

 	success = camel_imapx_server_connect (is, cancellable, error);

 	g_object_unref (imapx_store->authenticating_server);

 	imapx_store->authenticating_server = NULL;

+	camel_imapx_store_set_authenticating_concurrent_connection (imapx_store, FALSE);

 	if (!success) {

 		g_clear_object (&is);

@@ -626,7 +735,7 @@ imapx_create_new_connection_unlocked (Ca

 	con_man->priv->connections = g_list_prepend (

 		con_man->priv->connections, cinfo);

-	c (is->tagprefix, "Created new connection for %s and total connections %d \n", folder_name, g_list_length (con_man->priv->connections));

+	c (is->tagprefix, "Created new connection %p (server:%p) for %s; total connections %d\n", cinfo, cinfo->is, folder_name, g_list_length (con_man->priv->connections));

 exit:

 	g_object_unref (store);

@@ -656,6 +765,7 @@ camel_imapx_conn_manager_ref_store (Came

 CamelIMAPXServer *

 camel_imapx_conn_manager_get_connection (CamelIMAPXConnManager *con_man,

                                          const gchar *folder_name,

+					 gboolean for_expensive_job,

                                          GCancellable *cancellable,

                                          GError **error)

 {

@@ -669,10 +779,36 @@ camel_imapx_conn_manager_get_connection

 	/* Check if we got cancelled while waiting for the lock. */

 	if (!g_cancellable_set_error_if_cancelled (cancellable, error)) {

-		is = imapx_find_connection_unlocked (con_man, folder_name);

-		if (is == NULL)

-			is = imapx_create_new_connection_unlocked (

-				con_man, folder_name, cancellable, error);

+		is = imapx_find_connection_unlocked (con_man, folder_name, for_expensive_job);

+		if (is == NULL) {

+			GError *local_error = NULL;

+

+			is = imapx_create_new_connection_unlocked (con_man, folder_name, cancellable, &local_error);

+

+			if (!is) {

+				gboolean limit_connections =

+					g_error_matches (local_error, CAMEL_IMAPX_SERVER_ERROR,

+					CAMEL_IMAPX_SERVER_ERROR_CONCURRENT_CONNECT_FAILED) &&

+					con_man->priv->connections;

+

+				c ('*', "Failed to open a new connection, while having %d opened, with error: %s; will limit connections: %s\n",

+					g_list_length (con_man->priv->connections),

+					local_error ? local_error->message : "Unknown error",

+					limit_connections ? "yes" : "no");

+

+				if (limit_connections) {

+					/* limit to one-less than current connection count - be nice to the server */

+					con_man->priv->limit_max_connections = g_list_length (con_man->priv->connections) - 1;

+					if (!con_man->priv->limit_max_connections)

+						con_man->priv->limit_max_connections = 1;

+

+					g_clear_error (&local_error);

+					is = imapx_find_connection_unlocked (con_man, folder_name, for_expensive_job);

+				} else if (local_error) {

+					g_propagate_error (error, local_error);

+				}

+			}

+		}

 	}

 	CON_WRITE_UNLOCK (con_man);

@@ -706,7 +842,6 @@ camel_imapx_conn_manager_update_con_info

                                           const gchar *folder_name)

 {

 	ConnectionInfo *cinfo;

-	IMAPXJobQueueInfo *jinfo;

 	g_return_if_fail (CAMEL_IS_IMAPX_CONN_MANAGER (con_man));

@@ -716,28 +851,35 @@ camel_imapx_conn_manager_update_con_info

 	if (cinfo == NULL)

 		return;

-	jinfo = camel_imapx_server_get_job_queue_info (cinfo->is);

-	if (!g_hash_table_lookup (jinfo->folders, folder_name)) {

+	if (camel_imapx_server_folder_name_in_jobs (is, folder_name)) {

 		connection_info_remove_folder_name (cinfo, folder_name);

 		c (is->tagprefix, "Removed folder %s from connection folder list - op done \n", folder_name);

 	}

-	camel_imapx_destroy_job_queue_info (jinfo);

 	connection_info_unref (cinfo);

 }

 void

-camel_imapx_conn_manager_close_connections (CamelIMAPXConnManager *con_man)

+camel_imapx_conn_manager_close_connections (CamelIMAPXConnManager *con_man,

+					    const GError *error)

 {

+	GList *iter, *connections;

+

 	g_return_if_fail (CAMEL_IS_IMAPX_CONN_MANAGER (con_man));

 	CON_WRITE_LOCK (con_man);

-	g_list_free_full (

-		con_man->priv->connections,

-		(GDestroyNotify) connection_info_cancel_and_unref);

+	c('*', "Closing all %d connections, with propagated error: %s\n", g_list_length (con_man->priv->connections), error ? error->message : "none");

+

+	connections = con_man->priv->connections;

 	con_man->priv->connections = NULL;

 	CON_WRITE_UNLOCK (con_man);

+

+	for (iter = connections; iter; iter = g_list_next (iter)) {

+		connection_info_set_shutdown_error (iter->data, error);

+	}

+

+	g_list_free_full (connections, (GDestroyNotify) connection_info_cancel_and_unref);

 }

diff -up evolution-data-server-3.8.5/camel/camel-imapx-conn-manager.h.imapx-conn-manager-ext evolution-data-server-3.8.5/camel/camel-imapx-conn-manager.h

--- evolution-data-server-3.8.5/camel/camel-imapx-conn-manager.h.imapx-conn-manager-ext	2013-07-23 13:57:56.000000000 +0200

+++ evolution-data-server-3.8.5/camel/camel-imapx-conn-manager.h	2014-05-13 14:17:43.116983665 +0200

@@ -71,10 +71,12 @@ CamelIMAPXServer *

 		camel_imapx_conn_manager_get_connection

 						(CamelIMAPXConnManager *con_man,

 						 const gchar *folder_name,

+						 gboolean for_expensive_job,

 						 GCancellable *cancellable,

 						 GError **error);

 void		camel_imapx_conn_manager_close_connections

-						(CamelIMAPXConnManager *con_man);

+						(CamelIMAPXConnManager *con_man,

+						 const GError *error);

 GList *		camel_imapx_conn_manager_get_connections

 						(CamelIMAPXConnManager *con_man);

 void		camel_imapx_conn_manager_update_con_info

diff -up evolution-data-server-3.8.5/camel/camel-imapx-folder.c.imapx-conn-manager-ext evolution-data-server-3.8.5/camel/camel-imapx-folder.c

--- evolution-data-server-3.8.5/camel/camel-imapx-folder.c.imapx-conn-manager-ext	2013-07-23 14:01:51.000000000 +0200

+++ evolution-data-server-3.8.5/camel/camel-imapx-folder.c	2014-05-13 14:17:43.116983665 +0200

@@ -303,47 +303,27 @@ imapx_search_by_uids (CamelFolder *folde

 {

 	CamelIMAPXFolder *ifolder;

 	CamelIMAPXSearch *isearch;

-	CamelIMAPXServer *server = NULL;

-	CamelStore *parent_store;

 	GPtrArray *matches;

-	const gchar *folder_name;

-	gboolean online;

 	if (uids->len == 0)

 		return g_ptr_array_new ();

 	ifolder = CAMEL_IMAPX_FOLDER (folder);

-	folder_name = camel_folder_get_full_name (folder);

-	parent_store = camel_folder_get_parent_store (folder);

-

-	online = camel_offline_store_get_online (

-		CAMEL_OFFLINE_STORE (parent_store));

-

-	if (online) {

-		/* do not panic when the server cannot be reached for whatever reason,

-		 * show offline data at least */

-		server = camel_imapx_store_get_server (

-			CAMEL_IMAPX_STORE (parent_store),

-			folder_name, cancellable, NULL);

-	}

 	g_mutex_lock (&ifolder->search_lock);

 	isearch = CAMEL_IMAPX_SEARCH (ifolder->search);

-	camel_imapx_search_set_server (isearch, server);

 	camel_folder_search_set_folder (ifolder->search, folder);

+	camel_imapx_search_set_cancellable_and_error (isearch, cancellable, error);

 	matches = camel_folder_search_search (

 		ifolder->search, expression, uids, cancellable, error);

-	camel_imapx_search_set_server (isearch, NULL);

+	camel_imapx_search_set_cancellable_and_error (isearch, NULL, NULL);

 	g_mutex_unlock (&ifolder->search_lock);

-	if (server != NULL)

-		g_object_unref (server);

-

 	return matches;

 }

@@ -355,44 +335,24 @@ imapx_count_by_expression (CamelFolder *

 {

 	CamelIMAPXFolder *ifolder;

 	CamelIMAPXSearch *isearch;

-	CamelIMAPXServer *server = NULL;

-	CamelStore *parent_store;

-	const gchar *folder_name;

-	gboolean online;

 	guint32 matches;

 	ifolder = CAMEL_IMAPX_FOLDER (folder);

-	folder_name = camel_folder_get_full_name (folder);

-	parent_store = camel_folder_get_parent_store (folder);

-

-	online = camel_offline_store_get_online (

-		CAMEL_OFFLINE_STORE (parent_store));

-

-	if (online) {

-		/* do not panic when the server cannot be reached for whatever reason,

-		 * show offline data at least */

-		server = camel_imapx_store_get_server (

-			CAMEL_IMAPX_STORE (parent_store),

-			folder_name, cancellable, NULL);

-	}

 	g_mutex_lock (&ifolder->search_lock);

 	isearch = CAMEL_IMAPX_SEARCH (ifolder->search);

-	camel_imapx_search_set_server (isearch, server);

 	camel_folder_search_set_folder (ifolder->search, folder);

+	camel_imapx_search_set_cancellable_and_error (isearch, cancellable, error);

 	matches = camel_folder_search_count (

 		ifolder->search, expression, cancellable, error);

-	camel_imapx_search_set_server (isearch, NULL);

+	camel_imapx_search_set_cancellable_and_error (isearch, NULL, NULL);

 	g_mutex_unlock (&ifolder->search_lock);

-	if (server != NULL)

-		g_object_unref (server);

-

 	return matches;

 }

@@ -404,44 +364,24 @@ imapx_search_by_expression (CamelFolder

 {

 	CamelIMAPXFolder *ifolder;

 	CamelIMAPXSearch *isearch;

-	CamelIMAPXServer *server = NULL;

-	CamelStore *parent_store;

 	GPtrArray *matches;

-	const gchar *folder_name;

-	gboolean online;

 	ifolder = CAMEL_IMAPX_FOLDER (folder);

-	folder_name = camel_folder_get_full_name (folder);

-	parent_store = camel_folder_get_parent_store (folder);

-

-	online = camel_offline_store_get_online (

-		CAMEL_OFFLINE_STORE (parent_store));

-

-	if (online) {

-		/* do not panic when the server cannot be reached for whatever reason,

-		 * show offline data at least */

-		server = camel_imapx_store_get_server (

-			CAMEL_IMAPX_STORE (parent_store),

-			folder_name, cancellable, NULL);

-	}

 	g_mutex_lock (&ifolder->search_lock);

 	isearch = CAMEL_IMAPX_SEARCH (ifolder->search);

-	camel_imapx_search_set_server (isearch, server);

 	camel_folder_search_set_folder (ifolder->search, folder);

+	camel_imapx_search_set_cancellable_and_error (isearch, cancellable, error);

 	matches = camel_folder_search_search (

 		ifolder->search, expression, NULL, cancellable, error);

-	camel_imapx_search_set_server (isearch, NULL);

+	camel_imapx_search_set_cancellable_and_error (isearch, NULL, NULL);

 	g_mutex_unlock (&ifolder->search_lock);

-	if (server != NULL)

-		g_object_unref (server);

-

 	return matches;

 }

@@ -466,8 +406,11 @@ imapx_append_message_sync (CamelFolder *

 	CamelStore *parent_store;

 	CamelIMAPXStore *istore;

 	CamelIMAPXServer *server;

+	const gchar *folder_name;

+	GError *local_error = NULL;

 	gboolean success = FALSE;

+	folder_name = camel_folder_get_full_name (folder);

 	parent_store = camel_folder_get_parent_store (folder);

 	istore = CAMEL_IMAPX_STORE (parent_store);

@@ -482,11 +425,27 @@ imapx_append_message_sync (CamelFolder *

 	if (appended_uid)

 		*appended_uid = NULL;

-	server = camel_imapx_store_get_server (istore, NULL, cancellable, error);

+	server = camel_imapx_store_get_server (istore, folder_name, FALSE, cancellable, error);

 	if (server) {

 		success = camel_imapx_server_append_message (

-			server, folder, message, info, appended_uid, cancellable, error);

+			server, folder, message, info, appended_uid, cancellable, &local_error);

+		camel_imapx_store_op_done (istore, server, folder_name);

 		g_object_unref (server);

+

+		while (!success && g_error_matches (local_error, CAMEL_IMAPX_SERVER_ERROR, CAMEL_IMAPX_SERVER_ERROR_TRY_RECONNECT)) {

+			g_clear_error (&local_error);

+

+			server = camel_imapx_store_get_server (istore, folder_name, FALSE, cancellable, &local_error);

+			if (server) {

+				success = camel_imapx_server_append_message (

+					server, folder, message, info, appended_uid, cancellable, &local_error);

+				camel_imapx_store_op_done (istore, server, folder_name);

+				g_object_unref (server);

+			}

+		}

+

+		if (local_error)

+			g_propagate_error (error, local_error);

 	}

 	return success;

@@ -501,6 +460,7 @@ imapx_expunge_sync (CamelFolder *folder,

 	CamelIMAPXStore *istore;

 	CamelIMAPXServer *server;

 	const gchar *folder_name;

+	GError *local_error = NULL;

 	gboolean success = FALSE;

 	folder_name = camel_folder_get_full_name (folder);

@@ -515,13 +475,25 @@ imapx_expunge_sync (CamelFolder *folder,

 		return FALSE;

 	}

-	server = camel_imapx_store_get_server (

-		istore, folder_name, cancellable, error);

+	server = camel_imapx_store_get_server (istore, folder_name, FALSE, cancellable, error);

 	if (server != NULL) {

-		success = camel_imapx_server_expunge (

-			server, folder, cancellable, error);

+		success = camel_imapx_server_expunge (server, folder, cancellable, &local_error);

 		camel_imapx_store_op_done (istore, server, folder_name);

 		g_object_unref (server);

+

+		while (!success && g_error_matches (local_error, CAMEL_IMAPX_SERVER_ERROR, CAMEL_IMAPX_SERVER_ERROR_TRY_RECONNECT)) {

+			g_clear_error (&local_error);

+

+			server = camel_imapx_store_get_server (istore, folder_name, FALSE, cancellable, &local_error);

+			if (server != NULL) {

+				success = camel_imapx_server_expunge (server, folder, cancellable, &local_error);

+				camel_imapx_store_op_done (istore, server, folder_name);

+				g_object_unref (server);

+			}

+		}

+

+		if (local_error)

+			g_propagate_error (error, local_error);

 	}

 	return success;

@@ -539,6 +511,7 @@ imapx_fetch_messages_sync (CamelFolder *

 	CamelIMAPXStore *istore;

 	CamelIMAPXServer *server;

 	const gchar *folder_name;

+	GError *local_error = NULL;

 	gboolean success = FALSE;

 	folder_name = camel_folder_get_full_name (folder);

@@ -557,19 +530,66 @@ imapx_fetch_messages_sync (CamelFolder *

 	if (!camel_service_connect_sync (service, cancellable, error))

 		return FALSE;

-	server = camel_imapx_store_get_server (

-		istore, folder_name, cancellable, error);

+	server = camel_imapx_store_get_server (istore, folder_name, TRUE, cancellable, error);

 	if (server != NULL) {

-		success = camel_imapx_server_fetch_messages (

-			server, folder, type, limit, cancellable, error);

+		success = camel_imapx_server_fetch_messages (server, folder, type, limit, cancellable, &local_error);

 		camel_imapx_store_op_done (istore, server, folder_name);

 		g_object_unref (server);

+

+		while (!success && g_error_matches (local_error, CAMEL_IMAPX_SERVER_ERROR, CAMEL_IMAPX_SERVER_ERROR_TRY_RECONNECT)) {

+			g_clear_error (&local_error);

+

+			server = camel_imapx_store_get_server (istore, folder_name, TRUE, cancellable, &local_error);

+			if (server != NULL) {

+				success = camel_imapx_server_fetch_messages (server, folder, type, limit, cancellable, &local_error);

+				camel_imapx_store_op_done (istore, server, folder_name);

+				g_object_unref (server);

+			}

+		}

+