diff -up evolution-data-server-3.8.5/camel/camel-imapx-store.c.imapx-disconnect-changes evolution-data-server-3.8.5/camel/camel-imapx-store.c
--- evolution-data-server-3.8.5/camel/camel-imapx-store.c.imapx-disconnect-changes	2014-04-07 14:55:07.661322786 +0200
+++ evolution-data-server-3.8.5/camel/camel-imapx-store.c	2014-04-07 14:55:07.745322782 +0200
@@ -303,15 +303,15 @@ imapx_disconnect_sync (CamelService *ser
 {
 	CamelIMAPXStore *istore = CAMEL_IMAPX_STORE (service);
 	CamelServiceClass *service_class;
+	gboolean res;
 
 	service_class = CAMEL_SERVICE_CLASS (camel_imapx_store_parent_class);
-	if (!service_class->disconnect_sync (service, clean, cancellable, error))
-		return FALSE;
+	res = service_class->disconnect_sync (service, clean, cancellable, error);
 
 	if (istore->con_man != NULL)
 		camel_imapx_conn_manager_close_connections (istore->con_man);
 
-	return TRUE;
+	return res;
 }
 
 static CamelAuthenticationResult