X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=fa8b032e9aabbc7110546d539db6fca008ba0305;hp=d053862dca1b55cb3b5f776db84d3bb43469f350;hb=1be17e195742335251ff8ee38b4ed12bcd3d4f0f;hpb=7144b415c73ff52615da3f8743a7801e6efa6bc7

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index d053862..fa8b032 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -57,6 +57,9 @@
 #include "modest-marshal.h"
 #include "modest-error.h"
 #include "modest-mail-operation.h"
+#include <modest-count-stream.h>
+#include <libgnomevfs/gnome-vfs.h>
+#include "modest-utils.h"
 
 #define KB 1024
 
@@ -132,6 +135,7 @@ struct _ModestMailOperationPrivate {
 typedef struct {
 	GetMsgAsyncUserCallback user_callback;
 	TnyHeader *header;
+	TnyIterator *more_msgs;
 	gpointer user_data;
 	ModestMailOperation *mail_op;
 	GDestroyNotify destroy_notify;
@@ -140,20 +144,6 @@ typedef struct {
 	gint total_bytes;
 } GetMsgInfo;
 
-typedef struct {
-	ModestMailOperation *mail_op;
-	TnyMsg *msg;
-	gulong msg_sent_handler;
-	gulong error_happened_handler;
-} SendMsgInfo;
-
-static void     send_mail_msg_sent_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg,
-					    guint nth, guint total, gpointer userdata);
-static void     send_mail_error_happened_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg,
-						  GError *error, gpointer userdata);
-static void     common_send_mail_operation_end (TnySendQueue *queue, TnyMsg *msg, 
-						SendMsgInfo *info);
-
 typedef struct _RefreshAsyncHelper {	
 	ModestMailOperation *mail_op;
 	RefreshAsyncUserCallback user_callback;	
@@ -164,6 +154,7 @@ typedef struct _XFerMsgsAsyncHelper
 {
 	ModestMailOperation *mail_op;
 	TnyList *headers;
+	TnyIterator *more_msgs;
 	TnyFolder *dest_folder;
 	XferMsgsAsyncUserCallback user_callback;	
 	gboolean delete;
@@ -506,21 +497,18 @@ modest_mail_operation_cancel (ModestMailOperation *self)
 	/* Set new status */
 	priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
 	
-	/* Cancel the mail operation. We need to wrap it between this
-	   start/stop operations to allow following calls to the
-	   account */
+	/* Cancel the mail operation */
 	g_return_val_if_fail (priv->account, FALSE);
+	tny_account_cancel (priv->account);
 
 	if (priv->op_type == MODEST_MAIL_OPERATION_TYPE_SEND) {
 		ModestTnySendQueue *queue;
 		queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (priv->account));
-		/* Cancel sending without removing the item */
-		tny_send_queue_cancel (TNY_SEND_QUEUE (queue), FALSE, NULL);
-	} else {
-		/* Cancel operation */
-		tny_account_cancel (priv->account);
-	}
 
+		/* Cancel the sending of the following next messages */
+		tny_send_queue_cancel (TNY_SEND_QUEUE (queue), TNY_SEND_QUEUE_CANCEL_ACTION_SUSPEND, NULL);
+	}
+	
 	return canceled;
 }
 
@@ -617,7 +605,6 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
 {
 	TnySendQueue *send_queue = NULL;
 	ModestMailOperationPrivate *priv;
-	SendMsgInfo *info;
 	
 	g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self));
 	g_return_if_fail (transport_account && TNY_IS_TRANSPORT_ACCOUNT (transport_account));
@@ -643,90 +630,12 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
 		/* Add the msg to the queue */
 		modest_mail_operation_notify_start (self);
 
-		info = g_slice_new0 (SendMsgInfo);
-
-		info->mail_op = g_object_ref (self);
-		info->msg = g_object_ref (msg);
-		info->msg_sent_handler = g_signal_connect (G_OBJECT (send_queue), "msg-sent",
-				G_CALLBACK (send_mail_msg_sent_handler), info);
-		info->error_happened_handler = g_signal_connect (G_OBJECT (send_queue), "error-happened",
-				G_CALLBACK (send_mail_error_happened_handler), info);
-
-		modest_tny_send_queue_add (MODEST_TNY_SEND_QUEUE(send_queue), 
-				msg, 
-				&(priv->error));
-
-		priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
-	}
+		tny_send_queue_add_async (send_queue, msg, NULL, NULL, NULL);
 
-}
-
-static void
-common_send_mail_operation_end (TnySendQueue *queue, TnyMsg *msg,
-				SendMsgInfo *info)
-{
-	g_signal_handler_disconnect (queue, info->msg_sent_handler);
-	g_signal_handler_disconnect (queue, info->error_happened_handler);
-
-	g_object_unref (info->msg);
-	modest_mail_operation_notify_end (info->mail_op);
-	g_object_unref (info->mail_op);
-
-	g_slice_free (SendMsgInfo, info);
-}
-
-static void     
-send_mail_msg_sent_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg,
-			    guint nth, guint total, gpointer userdata)
-{
-	SendMsgInfo *info = (SendMsgInfo *) userdata;
-	TnyHeader *hdr1, *hdr2;
-	const char *msgid1, *msgid2;
-	hdr1 = tny_msg_get_header(msg);
-	hdr2 = tny_msg_get_header(info->msg);
-	msgid1 = tny_header_get_message_id(hdr1);
-	msgid2 = tny_header_get_message_id(hdr2);
-	if (msgid1 == NULL) msgid1 = "(null)";
-	if (msgid2 == NULL) msgid2 = "(null)";
-
-	if (!strcmp (msgid1, msgid2)) {
-		ModestMailOperationPrivate *priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
 		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-
-		common_send_mail_operation_end (queue, msg, info);
+		modest_mail_operation_notify_end (self);
 	}
-	g_object_unref(G_OBJECT(hdr1));
-	g_object_unref(G_OBJECT(hdr2));
-}
-
-static void     
-send_mail_error_happened_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg,
-				  GError *error, gpointer userdata)
-{
-	SendMsgInfo *info = (SendMsgInfo *) userdata;
-	TnyHeader *hdr1, *hdr2;
-	const char *msgid1, *msgid2;
-	
-	hdr1 = tny_msg_get_header(msg);
-	hdr2 = tny_msg_get_header(info->msg);
-	msgid1 = tny_header_get_message_id(hdr1);
-	msgid2 = tny_header_get_message_id(hdr2);
-	if (msgid1 == NULL) msgid1 = "(null)";
-	if (msgid2 == NULL) msgid2 = "(null)";
-
-	if (!strcmp (msgid1, msgid2)) {
-		if (error != NULL)
-			g_warning ("%s: %s\n", __FUNCTION__, error->message);
-		ModestMailOperationPrivate *priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
-		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-			     MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
-			     "modest: send mail failed\n");
 
-		common_send_mail_operation_end (queue, msg, info);
-	}
-	g_object_unref(G_OBJECT(hdr1));
-	g_object_unref(G_OBJECT(hdr2));
 }
 
 
@@ -819,6 +728,7 @@ create_msg_thread (gpointer thread_data)
 	return NULL;
 }
 
+
 void
 modest_mail_operation_create_msg (ModestMailOperation *self,
 				  const gchar *from, const gchar *to,
@@ -831,8 +741,11 @@ modest_mail_operation_create_msg (ModestMailOperation *self,
 				  ModestMailOperationCreateMsgCallback callback,
 				  gpointer userdata)
 {
+	ModestMailOperationPrivate *priv;
 	CreateMsgInfo *info = NULL;
 
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
 	info = g_slice_new0 (CreateMsgInfo);
 	info->mail_op = g_object_ref (self);
 
@@ -866,36 +779,59 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self,
 					TnyMsg *msg,
 					gpointer userdata)
 {
+	ModestMailOperationPrivate *priv = NULL;
 	SendNewMailInfo *info = (SendNewMailInfo *) userdata;
 	TnyFolder *draft_folder = NULL;
 	TnyFolder *outbox_folder = NULL;
-	TnyHeader *header;
+	TnyHeader *header = NULL;
 	GError *err = NULL;
 
 	if (!msg) {
 		goto end;
 	}
 
-	/* Call mail operation */
-	modest_mail_operation_send_mail (self, info->transport_account, msg);
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
-	/* Remove old mail from its source folder */
-	draft_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account),
-							      TNY_FOLDER_TYPE_DRAFTS);
-	if (!draft_folder) {
-		g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL drafts folder", __FUNCTION__);
-		goto end;
-	}
-	outbox_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account),
-							       TNY_FOLDER_TYPE_OUTBOX);
-	if (!outbox_folder) {
-		g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL outbox folder", __FUNCTION__);
+	if (priv->error) {
+		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+		modest_mail_operation_notify_end (self);
 		goto end;
 	}
+
+	/* Call mail operation */
+	modest_mail_operation_send_mail (self, info->transport_account, msg);
+
 	if (info->draft_msg != NULL) {
 		TnyFolder *folder = NULL;
 		TnyFolder *src_folder = NULL;
 		TnyFolderType folder_type;		
+		TnyTransportAccount *transport_account = NULL;
+
+		/* To remove the old mail from its source folder, we need to get the
+		 * transport account of the original draft message (the transport account
+		 * might have been changed by the user) */
+		header = tny_msg_get_header (info->draft_msg);
+		transport_account = modest_tny_account_store_get_transport_account_from_outbox_header(
+			modest_runtime_get_account_store(), header);
+		if (transport_account == NULL)
+			transport_account = g_object_ref(info->transport_account);
+		draft_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account),
+								      TNY_FOLDER_TYPE_DRAFTS);
+		outbox_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account),
+								       TNY_FOLDER_TYPE_OUTBOX);
+		g_object_unref(transport_account);
+
+		if (!draft_folder) {
+			g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL drafts folder",
+				   __FUNCTION__);
+			goto end;
+		}
+		if (!outbox_folder) {
+			g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL outbox folder",
+				   __FUNCTION__);
+			goto end;
+		}
+
 		folder = tny_msg_get_folder (info->draft_msg);		
 		if (folder == NULL) goto end;
 		folder_type = modest_tny_folder_guess_folder_type (folder);
@@ -910,17 +846,17 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self,
 
 		/* Note: This can fail (with a warning) if the message is not really already in a folder,
 		 * because this function requires it to have a UID. */		
-		header = tny_msg_get_header (info->draft_msg);
 		tny_folder_remove_msg (src_folder, header, NULL);
 
 		tny_folder_sync (folder, TRUE, &err); /* FALSE --> don't expunge */
 /* 		tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL);  /\* expunge *\/ */
 		
-		g_object_unref (header);
 		g_object_unref (folder);
 	}
 
 end:
+	if (header)
+		g_object_unref (header);
 	if (err != NULL)
 		g_error_free(err);	
 	if (info->draft_msg)
@@ -1229,7 +1165,7 @@ internal_folder_observer_finalize (GObject *object)
 static void
 tny_folder_observer_init (TnyFolderObserverIface *iface) 
 {
-	iface->update_func = internal_folder_observer_update;
+	iface->update = internal_folder_observer_update;
 }
 static void
 internal_folder_observer_class_init (InternalFolderObserverClass *klass) 
@@ -1280,7 +1216,6 @@ update_account_get_msg_async_cb (TnyFolder *folder,
 	g_slice_free (GetMsgInfo, msg_info);
 }
 
-
 static void
 inbox_refreshed_cb (TnyFolder *inbox, 
 		    gboolean canceled, 
@@ -1297,7 +1232,6 @@ inbox_refreshed_cb (TnyFolder *inbox,
 	TnyList *new_headers = NULL;
 	gboolean headers_only, ignore_limit;
 	TnyTransportAccount *transport_account;
-	ModestTnySendQueue *send_queue;
 
 	info = (UpdateAccountInfo *) user_data;
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
@@ -1408,18 +1342,34 @@ inbox_refreshed_cb (TnyFolder *inbox,
 	g_ptr_array_free (new_headers_array, FALSE);
 
  send_mail:
-	/* Send mails */
-	priv->done = 0;
-	priv->total = 0;
-
 	/* Get the transport account */
 	transport_account = (TnyTransportAccount *)
 		modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(),
 										    info->account_name);
-	
-	/* Try to send */
-	send_queue = modest_runtime_get_send_queue (transport_account);
-	modest_tny_send_queue_try_to_send (send_queue);
+
+	if (transport_account) {
+		ModestTnySendQueue *send_queue;
+		TnyFolder *outbox;
+		guint num_messages;
+
+		send_queue = modest_runtime_get_send_queue (transport_account);
+
+		/* Get outbox folder */
+		outbox = tny_send_queue_get_outbox (TNY_SEND_QUEUE (send_queue));
+		num_messages = tny_folder_get_all_count (outbox);
+		g_object_unref (outbox);
+
+		if (num_messages != 0) {
+			/* Send mails */
+			g_object_unref (priv->account);
+
+			/* Reenable suspended items */
+			modest_tny_send_queue_wakeup (MODEST_TNY_SEND_QUEUE (send_queue));
+
+			/* Try to send */
+			tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE (send_queue));
+		}
+	} 
 
 	/* Check if the operation was a success */
 	if (!priv->error)
@@ -1545,13 +1495,14 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 	ModestTnyAccountStore *account_store = NULL;
 	TnyStoreAccount *store_account = NULL;
 	TnyList *folders;
+	ModestMailOperationState *state;
 
 	/* Init mail operation */
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 	priv->total = 0;
 	priv->done  = 0;
 	priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
-	priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
+	priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND_AND_RECEIVE;
 
 	/* Get the store account */
 	account_store = modest_runtime_get_account_store ();
@@ -1577,17 +1528,15 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 	modest_mail_operation_notify_start (self);
 
 	/* notify about the start of the operation */ 
-	ModestMailOperationState *state;
 	state = modest_mail_operation_clone_state (self);
 	state->done = 0;
 	state->total = 0;
 
 	/* Start notifying progress */
-	g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 
-			0, state, NULL);
+	g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
 	g_slice_free (ModestMailOperationState, state);
 	
-	/* Get all folders and continue in the callback */    
+	/* Get all folders and continue in the callback */ 
 	folders = tny_simple_list_new ();
 	tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account),
 					    folders, NULL,
@@ -2201,19 +2150,32 @@ get_msg_async_cb (TnyFolder *folder,
 
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
 	priv->done++;
-	finished = (priv->done == priv->total) ? TRUE : FALSE;
+
+	if (info->more_msgs) {
+		tny_iterator_next (info->more_msgs);
+		finished = (tny_iterator_is_done (info->more_msgs));
+	} else {
+		finished = (priv->done == priv->total) ? TRUE : FALSE;
+	}
 
 	/* Check errors */
 	if (canceled || err) {
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS;
-		if (!priv->error)
+		if (err) {
+			priv->error = g_error_copy ((const GError *) err);
+			priv->error->domain = MODEST_MAIL_OPERATION_ERROR;
+		}
+		if (!priv->error) {
 			g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 				     MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
 				     err->message);
-	} else {
+		}
+	} else if (finished && priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) {
 		/* Set the success status before calling the user callback */
-		if (finished && priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
-			priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+	} else if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+		canceled = TRUE;
+		finished = TRUE;
 	}
 
 
@@ -2230,12 +2192,28 @@ get_msg_async_cb (TnyFolder *folder,
 
 		/* Notify about operation end */
 		modest_mail_operation_notify_end (info->mail_op);
-	}
 
-	/* Clean */
-	g_object_unref (info->header);
-	g_object_unref (info->mail_op);
-	g_slice_free (GetMsgInfo, info);
+		/* Clean */
+		if (info->more_msgs)
+			g_object_unref (info->more_msgs);
+		g_object_unref (info->header);
+		g_object_unref (info->mail_op);
+		g_slice_free (GetMsgInfo, info);
+	} else if (info->more_msgs) {
+		TnyHeader *header = TNY_HEADER (tny_iterator_get_current (info->more_msgs));
+		TnyFolder *folder = tny_header_get_folder (header);
+
+		g_object_unref (info->header);
+		info->header = g_object_ref (header);
+
+		/* Retrieve the next message */
+		tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, info);
+
+		g_object_unref (header);
+		g_object_unref (folder);
+	} else {
+		g_warning ("%s: finished != TRUE but no messages left", __FUNCTION__);
+	}
 }
 
 void 
@@ -2260,8 +2238,8 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 
 	/* Get account and set it into mail_operation */
 	if (tny_list_get_length (header_list) >= 1) {
-		iter = tny_list_create_iterator (header_list);
-		TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+		TnyIterator *iterator = tny_list_create_iterator (header_list);
+		TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iterator));
 		if (header) {
 			TnyFolder *folder = tny_header_get_folder (header);
 			if (folder) {		
@@ -2270,18 +2248,14 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 			}
 			g_object_unref (header);
 		}
-
-		if (tny_list_get_length (header_list) == 1) {
-			g_object_unref (iter);
-			iter = NULL;
-		}
+		g_object_unref (iterator);
 	}
 
 	msg_list_size = compute_message_list_size (header_list);
 
 	modest_mail_operation_notify_start (self);
 	iter = tny_list_create_iterator (header_list);
-	while (!tny_iterator_is_done (iter)) {
+	if (!tny_iterator_is_done (iter)) {
 		/* notify about the start of the operation */
 		ModestMailOperationState *state;
 		state = modest_mail_operation_clone_state (self);
@@ -2298,6 +2272,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 		msg_info = g_slice_new0 (GetMsgInfo);
 		msg_info->mail_op = g_object_ref (self);
 		msg_info->header = g_object_ref (header);
+		msg_info->more_msgs = g_object_ref (iter);
 		msg_info->user_callback = user_callback;
 		msg_info->user_data = user_data;
 		msg_info->destroy_notify = notify;
@@ -2311,7 +2286,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 		/* Free and go on */
 		g_object_unref (header);
 		g_object_unref (folder);
-		tny_iterator_next (iter);
+		g_slice_free (ModestMailOperationState, state);
 	}
 	g_object_unref (iter);
 }
@@ -2393,7 +2368,7 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self,
 				   TnyList *headers,
 				  gboolean remove_to_trash /*ignored*/)
 {
-	TnyFolder *folder;
+	TnyFolder *folder = NULL;
 	ModestMailOperationPrivate *priv;
 	TnyIterator *iter = NULL;
 	TnyHeader *header = NULL;
@@ -2406,14 +2381,23 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self,
 	if (remove_to_trash)
 		g_warning ("remove to trash is not implemented");
 
+	if (tny_list_get_length(headers) == 0) {
+		g_warning ("%s: list of headers is empty\n", __FUNCTION__);
+		goto cleanup; /* nothing to do */
+	}
+	
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
-
 	remove_headers = g_object_ref(headers);
 
 	/* Get folder from first header and sync it */
-	iter = tny_list_create_iterator (headers);
+	iter = tny_list_create_iterator (headers);	
 	header = TNY_HEADER (tny_iterator_get_current (iter));
-	folder = tny_header_get_folder (header);
+
+	folder = tny_header_get_folder (header);	
+	if (!TNY_IS_FOLDER(folder)) {
+		g_warning ("%s: could not get folder for header\n", __FUNCTION__);
+		goto cleanup;
+	}
 
 	/* Don't remove messages that are being sent */
 	if (modest_tny_folder_is_local_folder (folder)) {
@@ -2466,13 +2450,13 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self,
 		account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
 		leave_on_server =
 			modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
-					account_name);
-
+								account_name);
+		
 		proto = tny_account_get_proto (account);
 		if (proto) {
 			account_proto = modest_protocol_info_get_transport_store_protocol (proto);
 		}
-
+		
 		if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) ||
 		    modest_tny_folder_is_remote_folder (folder) == FALSE)
 			expunge = TRUE;
@@ -2493,10 +2477,15 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self,
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 
 	/* Free */
-	g_object_unref (remove_headers);
-	g_object_unref (header);
-	g_object_unref (iter);
-	g_object_unref (G_OBJECT (folder));
+cleanup:
+	if (remove_headers)
+		g_object_unref (remove_headers);
+	if (header)
+		g_object_unref (header);
+	if (iter)
+		g_object_unref (iter);
+	if (folder)
+		g_object_unref (folder);
 
 	/* Notify about operation end */
 	modest_mail_operation_notify_end (self);
@@ -2579,8 +2568,7 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u
 	XFerMsgsAsyncHelper *helper;
 	ModestMailOperation *self;
 	ModestMailOperationPrivate *priv;
-	TnyIterator *iter = NULL;
-	TnyHeader *header = NULL;
+	gboolean finished = TRUE;
 
 	helper = (XFerMsgsAsyncHelper *) user_data;
 	self = helper->mail_op;
@@ -2597,56 +2585,68 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u
 			     MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
 			     _("Error trying to refresh the contents of %s"),
 			     tny_folder_get_name (folder));
-	} else {
-		priv->done = 1;
-		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+	} else if (priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+		if (helper->more_msgs) {
+			/* We'll transfer the next message in the list */
+			tny_iterator_next (helper->more_msgs);
+			if (!tny_iterator_is_done (helper->more_msgs)) {
+				GObject *next_header;
+				g_object_unref (helper->headers);
+				helper->headers = tny_simple_list_new ();
+				next_header = tny_iterator_get_current (helper->more_msgs);
+				tny_list_append (helper->headers, next_header);
+				g_object_unref (next_header);
+				finished = FALSE;
+			}
+		}
 
-		/* Update folder counts */
-		tny_folder_poke_status (folder);		
-		tny_folder_poke_status (helper->dest_folder);		
+		if (finished) {
+			priv->done = 1;
+			priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+		}
 	}
 
-	
-	/* Mark headers as deleted and seen */
-	if ((helper->delete) && 
-	    (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS)) {
-		iter = tny_list_create_iterator (helper->headers);
-		while (!tny_iterator_is_done (iter)) {
-			header = TNY_HEADER (tny_iterator_get_current (iter));
-			tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED);
-			tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
-			g_object_unref (header);
+	if (finished) {
 
-			tny_iterator_next (iter);
-		}
-	}
-		
+		/* Update folder counts */
+		tny_folder_poke_status (folder);
+		tny_folder_poke_status (helper->dest_folder);
 
-	/* Notify about operation end */
-	modest_mail_operation_notify_end (self);
+		/* Notify about operation end */
+		modest_mail_operation_notify_end (self);
 
-	/* If user defined callback function was defined, call it */
-	if (helper->user_callback) {
-		/* This is not a GDK lock because we are a Tinymail callback and
-	 	 * Tinymail already acquires the Gdk lock */
+		/* If user defined callback function was defined, call it */
+		if (helper->user_callback) {
+			/* This is not a GDK lock because we are a Tinymail callback and
+			 * Tinymail already acquires the Gdk lock */
 
-		/* no gdk_threads_enter (), CHECKED */
-		helper->user_callback (self, helper->user_data);
-		/* no gdk_threads_leave (), CHECKED */
-	}
+			/* no gdk_threads_enter (), CHECKED */
+			helper->user_callback (self, helper->user_data);
+			/* no gdk_threads_leave (), CHECKED */
+		}
 
-	/* Free */
-	if (helper->headers)
-		g_object_unref (helper->headers);
-	if (helper->dest_folder)
-		g_object_unref (helper->dest_folder);
-	if (helper->mail_op)
-		g_object_unref (helper->mail_op);
-	if (folder)
-		g_object_unref (folder);
-	if (iter)
-		g_object_unref (iter);
-	g_slice_free (XFerMsgsAsyncHelper, helper);
+		/* Free */
+		if (helper->more_msgs)
+			g_object_unref (helper->more_msgs);
+		if (helper->headers)
+			g_object_unref (helper->headers);
+		if (helper->dest_folder)
+			g_object_unref (helper->dest_folder);
+		if (helper->mail_op)
+			g_object_unref (helper->mail_op);
+		if (folder)
+			g_object_unref (folder);
+		g_slice_free (XFerMsgsAsyncHelper, helper);
+	} else {
+		/* Transfer more messages */
+		tny_folder_transfer_msgs_async (folder,
+						helper->headers,
+						helper->dest_folder,
+						helper->delete,
+						transfer_msgs_cb,
+						transfer_msgs_status_cb,
+						helper);
+	}
 }
 
 static guint
@@ -2696,6 +2696,7 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 	XFerMsgsAsyncHelper *helper = NULL;
 	TnyHeader *header = NULL;
 	ModestTnyFolderRules rules = 0;
+	TnyAccount *dst_account = NULL;
 
 	g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self));
 	g_return_if_fail (headers && TNY_IS_LIST (headers));
@@ -2758,7 +2759,6 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 	helper = g_slice_new0 (XFerMsgsAsyncHelper);
 	helper->mail_op = g_object_ref(self);
 	helper->dest_folder = g_object_ref(folder);
-	helper->headers = g_object_ref(headers);
 	helper->user_callback = user_callback;
 	helper->user_data = user_data;
 	helper->delete = delete_original;
@@ -2768,16 +2768,35 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 
 	/* Get account and set it into mail_operation */
 	priv->account = modest_tny_folder_get_account (src_folder);
+	dst_account = modest_tny_folder_get_account (folder);
+
+	if (priv->account == dst_account) {
+		/* Transfer all messages at once using the fast
+		 * method. Note that depending on the server this
+		 * might not be that fast, and might not be
+		 * user-cancellable either */
+		helper->headers = g_object_ref (headers);
+		helper->more_msgs = NULL;
+	} else {
+		/* Transfer messages one by one so the user can cancel
+		 * the operation */
+		GObject *hdr;
+		helper->headers = tny_simple_list_new ();
+		helper->more_msgs = tny_list_create_iterator (headers);
+		hdr = tny_iterator_get_current (helper->more_msgs);
+		tny_list_append (helper->headers, hdr);
+		g_object_unref (hdr);
+	}
 
-	/* Transfer messages */
 	modest_mail_operation_notify_start (self);
 	tny_folder_transfer_msgs_async (src_folder, 
-					headers, 
+					helper->headers, 
 					folder, 
 					delete_original, 
 					transfer_msgs_cb, 
 					transfer_msgs_status_cb,
 					helper);
+	g_object_unref (dst_account);
 }
 
 
@@ -2905,6 +2924,77 @@ modest_mail_operation_refresh_folder  (ModestMailOperation *self,
 				  helper);
 }
 
+static void
+run_queue_stop (ModestTnySendQueue *queue,
+		ModestMailOperation *self)
+{
+	ModestMailOperationPrivate *priv;
+
+	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+	g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (queue));
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+	priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+
+	modest_mail_operation_notify_end (self);
+	g_signal_handlers_disconnect_by_func (queue, run_queue_stop, self);
+	g_object_unref (self);
+}
+void
+modest_mail_operation_run_queue (ModestMailOperation *self,
+				 ModestTnySendQueue *queue)
+{
+	ModestMailOperationPrivate *priv;
+
+	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+	g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (queue));
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+	priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+	priv->account = TNY_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (queue)));
+	priv->op_type = MODEST_MAIL_OPERATION_TYPE_RUN_QUEUE;
+
+	modest_mail_operation_notify_start (self);
+	g_object_ref (self);
+	g_signal_connect ((gpointer) queue, "queue-stop", G_CALLBACK (run_queue_stop), (gpointer) self);
+}
+
+static void
+sync_folder_finish_callback (TnyFolder *self, gboolean cancelled, GError *err, ModestMailOperation *mail_op)
+{
+	ModestMailOperationPrivate *priv;
+
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op);
+	if (err != NULL) {
+		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+			     MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
+			     err->message);
+		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+	} else {
+		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+	}
+	modest_mail_operation_notify_end (mail_op);
+	g_object_unref (mail_op);
+}
+
+void
+modest_mail_operation_sync_folder (ModestMailOperation *self,
+				   TnyFolder *folder, gboolean expunge)
+{
+	ModestMailOperationPrivate *priv;
+
+	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+	g_return_if_fail (TNY_IS_FOLDER (folder));
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+	priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+	priv->account = TNY_ACCOUNT (tny_folder_get_account (folder));
+	priv->op_type = MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER;
+
+	modest_mail_operation_notify_start (self);
+	g_object_ref (self);
+	tny_folder_sync_async (folder, expunge, (TnyFolderCallback) sync_folder_finish_callback, NULL, self);
+}
 
 static void
 modest_mail_operation_notify_start (ModestMailOperation *self)
@@ -3002,6 +3092,8 @@ modest_mail_operation_to_string (ModestMailOperation *self)
 	case MODEST_MAIL_OPERATION_TYPE_OPEN:    type= "OPEN";    break;
 	case MODEST_MAIL_OPERATION_TYPE_DELETE:  type= "DELETE";  break;
 	case MODEST_MAIL_OPERATION_TYPE_INFO:    type= "INFO";    break;
+	case MODEST_MAIL_OPERATION_TYPE_RUN_QUEUE: type= "RUN-QUEUE"; break;
+	case MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER: type= "SYNC-FOLDER"; break;
 	case MODEST_MAIL_OPERATION_TYPE_UNKNOWN: type= "UNKNOWN"; break;
 	default: type = "UNEXPECTED"; break;
 	}