X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=b21a8319200745e58d515d3a706ed8be9cc6800d;hb=cae12da07efc7fa2463ec5b57dc39a446a75cba5;hp=02d635bf96290fde18d346fd4e61ddac6609c643;hpb=8ec1d3d4c817b5ca85019311fb0f6b87a077683d;p=modest

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 02d635b..b21a831 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -35,6 +35,9 @@
 #include <tny-folder-store-query.h>
 #include <tny-camel-stream.h>
 #include <tny-camel-pop-store-account.h>
+#include <tny-camel-pop-folder.h>
+#include <tny-camel-imap-folder.h>
+#include <tny-camel-mem-stream.h>
 #include <tny-simple-list.h>
 #include <tny-send-queue.h>
 #include <tny-status.h>
@@ -54,6 +57,7 @@
 #include "modest-mail-operation.h"
 
 #define KB 1024
+#define GET_SIZE_BUFFER_SIZE 128
 
 /* 'private'/'protected' functions */
 static void modest_mail_operation_class_init (ModestMailOperationClass *klass);
@@ -70,8 +74,7 @@ static void     get_msg_status_cb (GObject *obj,
 				   TnyStatus *status,  
 				   gpointer user_data);
 
-static void     modest_mail_operation_notify_end (ModestMailOperation *self,
-						  gboolean need_lock);
+static void     modest_mail_operation_notify_end (ModestMailOperation *self);
 
 static gboolean did_a_cancel = FALSE;
 
@@ -126,6 +129,44 @@ typedef struct _XFerMsgAsyncHelper
 	gpointer user_data;
 } XFerMsgAsyncHelper;
 
+typedef void (*ModestMailOperationCreateMsgCallback) (ModestMailOperation *mail_op,
+						      TnyMsg *msg,
+						      gpointer userdata);
+
+static void          modest_mail_operation_create_msg (ModestMailOperation *self,
+						       const gchar *from, const gchar *to,
+						       const gchar *cc, const gchar *bcc,
+						       const gchar *subject, const gchar *plain_body,
+						       const gchar *html_body, const GList *attachments_list,
+						       TnyHeaderFlags priority_flags,
+						       ModestMailOperationCreateMsgCallback callback,
+						       gpointer userdata);
+
+static gboolean      idle_notify_queue (gpointer data);
+typedef struct
+{
+	ModestMailOperation *mail_op;
+	gchar *from;
+	gchar *to;
+	gchar *cc;
+	gchar *bcc;
+	gchar *subject;
+	gchar *plain_body;
+	gchar *html_body;
+	GList *attachments_list;
+	TnyHeaderFlags priority_flags;
+	ModestMailOperationCreateMsgCallback callback;
+	gpointer userdata;
+} CreateMsgInfo;
+
+typedef struct
+{
+	ModestMailOperation *mail_op;
+	TnyMsg *msg;
+	ModestMailOperationCreateMsgCallback callback;
+	gpointer userdata;
+} CreateMsgIdleInfo;
+
 /* globals */
 static GObjectClass *parent_class = NULL;
 
@@ -374,7 +415,7 @@ modest_mail_operation_cancel (ModestMailOperation *self)
 	/* This emits progress-changed on which the mail operation queue is
 	 * listening, so the mail operation is correctly removed from the
 	 * queue without further explicit calls. */
-	modest_mail_operation_notify_end (self, FALSE);
+	modest_mail_operation_notify_end (self);
 	
 	return TRUE;
 }
@@ -523,7 +564,166 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
 
 	/* TODO: do this in the handler of the "msg-sent"
 	   signal.Notify about operation end */
-	modest_mail_operation_notify_end (self, FALSE);
+	modest_mail_operation_notify_end (self);
+}
+
+static gboolean
+idle_create_msg_cb (gpointer idle_data)
+{
+	CreateMsgIdleInfo *info = (CreateMsgIdleInfo *) idle_data;
+
+	gdk_threads_enter ();
+	info->callback (info->mail_op, info->msg, info->userdata);
+	gdk_threads_leave ();
+	g_object_unref (info->mail_op);
+	if (info->msg)
+		g_object_unref (info->msg);
+	g_slice_free (CreateMsgIdleInfo, info);
+
+	return FALSE;
+}
+
+static gpointer 
+create_msg_thread (gpointer thread_data)
+{
+	CreateMsgInfo *info = (CreateMsgInfo *) thread_data;
+	TnyMsg *new_msg = NULL;
+	ModestMailOperationPrivate *priv;
+
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op);
+	if (info->html_body == NULL) {
+		new_msg = modest_tny_msg_new (info->to, info->from, info->cc, 
+					      info->bcc, info->subject, info->plain_body, 
+					      info->attachments_list); /* FIXME: attachments */
+	} else {
+		new_msg = modest_tny_msg_new_html_plain (info->to, info->from, info->cc,
+							 info->bcc, info->subject, info->html_body,
+							 info->plain_body, info->attachments_list);
+	}
+
+	if (new_msg) {
+		TnyHeader *header;
+		/* Set priority flags in message */
+		header = tny_msg_get_header (new_msg);
+		if (info->priority_flags != 0)
+			tny_header_set_flags (header, info->priority_flags);
+		if (info->attachments_list != NULL) {
+			tny_header_set_flags (header, TNY_HEADER_FLAG_ATTACHMENTS);
+		}
+		g_object_unref (G_OBJECT(header));
+	} else {
+		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+			     MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
+			     "modest: failed to create a new msg\n");
+	}
+
+
+	g_free (info->to);
+	g_free (info->from);
+	g_free (info->cc);
+	g_free (info->bcc);
+	g_free (info->plain_body);
+	g_free (info->html_body);
+	g_free (info->subject);
+	g_list_foreach (info->attachments_list, (GFunc) g_object_unref, NULL);
+	g_list_free (info->attachments_list);
+
+	if (info->callback) {
+		CreateMsgIdleInfo *idle_info;
+		idle_info = g_slice_new0 (CreateMsgIdleInfo);
+		idle_info->mail_op = info->mail_op;
+		g_object_ref (info->mail_op);
+		idle_info->msg = new_msg;
+		if (new_msg)
+			g_object_ref (new_msg);
+		idle_info->callback = info->callback;
+		idle_info->userdata = info->userdata;
+		g_idle_add (idle_create_msg_cb, idle_info);
+	} else {
+		g_idle_add (idle_notify_queue, g_object_ref (info->mail_op));
+	}
+
+	g_object_unref (info->mail_op);
+	g_slice_free (CreateMsgInfo, info);
+	return NULL;
+}
+
+void
+modest_mail_operation_create_msg (ModestMailOperation *self,
+				  const gchar *from, const gchar *to,
+				  const gchar *cc, const gchar *bcc,
+				  const gchar *subject, const gchar *plain_body,
+				  const gchar *html_body,
+				  const GList *attachments_list,
+				  TnyHeaderFlags priority_flags,
+				  ModestMailOperationCreateMsgCallback callback,
+				  gpointer userdata)
+{
+	CreateMsgInfo *info = NULL;
+
+	info = g_slice_new0 (CreateMsgInfo);
+	info->mail_op = self;
+	g_object_ref (self);
+
+	info->from = g_strdup (from);
+	info->to = g_strdup (to);
+	info->cc = g_strdup (cc);
+	info->subject = g_strdup (subject);
+	info->plain_body = g_strdup (plain_body);
+	info->html_body = g_strdup (html_body);
+	info->attachments_list = g_list_copy ((GList *) attachments_list);
+	g_list_foreach (info->attachments_list, (GFunc) g_object_ref, NULL);
+	info->priority_flags = priority_flags;
+
+	info->callback = callback;
+	info->userdata = userdata;
+
+	g_thread_create (create_msg_thread, info, FALSE, NULL);
+}
+
+typedef struct
+{
+	TnyTransportAccount *transport_account;
+	TnyMsg *draft_msg;
+} SendNewMailInfo;
+
+static void
+modest_mail_operation_send_new_mail_cb (ModestMailOperation *self,
+					TnyMsg *msg,
+					gpointer userdata)
+{
+	SendNewMailInfo *info = (SendNewMailInfo *) userdata;
+	TnyFolder *folder;
+	TnyHeader *header;
+
+	if (!msg) {
+		goto end;
+	}
+
+	/* Call mail operation */
+	modest_mail_operation_send_mail (self, info->transport_account, msg);
+
+	folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_DRAFTS);
+	if (folder) {
+		if (info->draft_msg != NULL) {
+			header = tny_msg_get_header (info->draft_msg);
+			/* 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. */
+			tny_folder_remove_msg (folder, header, NULL);
+			tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
+			tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+			g_object_unref (header);
+		}
+	}
+
+end:
+	if (info->draft_msg)
+		g_object_unref (info->draft_msg);
+	if (info->transport_account)
+		g_object_unref (info->transport_account);
+	g_slice_free (SendNewMailInfo, info);
+	modest_mail_operation_notify_end (self);
 }
 
 void
@@ -537,10 +737,8 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
 				     const GList *attachments_list,
 				     TnyHeaderFlags priority_flags)
 {
-	TnyMsg *new_msg = NULL;
-	TnyFolder *folder = NULL;
-	TnyHeader *header = NULL;
 	ModestMailOperationPrivate *priv = NULL;
+	SendNewMailInfo *info;
 
 	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
 	g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
@@ -556,69 +754,37 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
 			     _("Error trying to send a mail. You need to set at least one recipient"));
 		return;
 	}
+	info = g_slice_new0 (SendNewMailInfo);
+	info->transport_account = transport_account;
+	if (transport_account)
+		g_object_ref (transport_account);
+	info->draft_msg = draft_msg;
+	if (draft_msg)
+		g_object_ref (draft_msg);
+	modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body,
+					  attachments_list, priority_flags,
+					  modest_mail_operation_send_new_mail_cb, info);
 
-	if (html_body == NULL) {
-		new_msg = modest_tny_msg_new (to, from, cc, bcc, subject, plain_body, (GSList *) attachments_list); /* FIXME: attachments */
-	} else {
-		new_msg = modest_tny_msg_new_html_plain (to, from, cc, bcc, subject, html_body, plain_body, (GSList *) attachments_list);
-	}
-	if (!new_msg) {
-		g_printerr ("modest: failed to create a new msg\n");
-		return;
-	}
-
-	/* Set priority flags in message */
-	header = tny_msg_get_header (new_msg);
-	if (priority_flags != 0)
-		tny_header_set_flags (header, priority_flags);
-
-	/* Call mail operation */
-	modest_mail_operation_send_mail (self, transport_account, new_msg);
-
-	folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS);
-	if (folder) {
-		if (draft_msg != NULL) {
-			header = tny_msg_get_header (draft_msg);
-			/* 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. */
-			tny_folder_remove_msg (folder, header, NULL);
-			g_object_unref (header);
-		}
-	}
-
-	/* Free */
-	g_object_unref (G_OBJECT (new_msg));
 }
 
-void
-modest_mail_operation_save_to_drafts (ModestMailOperation *self,
-				      TnyTransportAccount *transport_account,
-				      TnyMsg *draft_msg,
-				      const gchar *from,  const gchar *to,
-				      const gchar *cc,  const gchar *bcc,
-				      const gchar *subject, const gchar *plain_body,
-				      const gchar *html_body,
-				      const GList *attachments_list,
-				      TnyHeaderFlags priority_flags)
+typedef struct
+{
+	TnyTransportAccount *transport_account;
+	TnyMsg *draft_msg;
+	ModestMsgEditWindow *edit_window;
+} SaveToDraftsInfo;
+
+static void
+modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self,
+					 TnyMsg *msg,
+					 gpointer userdata)
 {
-	TnyMsg *msg = NULL;
 	TnyFolder *folder = NULL;
 	TnyHeader *header = NULL;
 	ModestMailOperationPrivate *priv = NULL;
-
-	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-	g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
+	SaveToDraftsInfo *info = (SaveToDraftsInfo *) userdata;
 
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-
-	/* Get account and set it into mail_operation */
-	priv->account = g_object_ref (transport_account);
-
-	if (html_body == NULL) {
-		msg = modest_tny_msg_new (to, from, cc, bcc, subject, plain_body, (GSList *) attachments_list); /* FIXME: attachments */
-	} else {
-		msg = modest_tny_msg_new_html_plain (to, from, cc, bcc, subject, html_body, plain_body, (GSList *) attachments_list);
-	}
 	if (!msg) {
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
@@ -627,11 +793,7 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self,
 		goto end;
 	}
 
-	/* add priority flags */
-	header = tny_msg_get_header (msg);
-	tny_header_set_flags (header, priority_flags);
-
-	folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS);
+	folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_DRAFTS);
 	if (!folder) {
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
@@ -640,11 +802,13 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self,
 		goto end;
 	}
 
-	if (draft_msg != NULL) {
-		header = tny_msg_get_header (draft_msg);
+	if (info->draft_msg != NULL) {
+		header = tny_msg_get_header (info->draft_msg);
 		/* Remove the old draft expunging it */
 		tny_folder_remove_msg (folder, header, NULL);
-		tny_folder_sync (folder, TRUE, &(priv->error));
+		tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
+		tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+		tny_folder_sync (folder, FALSE, &(priv->error));  /* FALSE --> don't expunge */
 		g_object_unref (header);
 	}
 	
@@ -656,13 +820,60 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self,
 	else
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 
+	if (info->edit_window)
+		modest_msg_edit_window_set_draft (info->edit_window, msg);
+
+
 end:
-	if (msg)
-		g_object_unref (G_OBJECT(msg));
 	if (folder)
 		g_object_unref (G_OBJECT(folder));
+	if (info->edit_window)
+		g_object_unref (G_OBJECT(info->edit_window));
+	if (info->draft_msg)
+		g_object_unref (G_OBJECT (info->draft_msg));
+	if (info->transport_account)
+		g_object_unref (G_OBJECT(info->transport_account));
+	g_slice_free (SaveToDraftsInfo, info);
+
+ 	modest_mail_operation_notify_end (self);
+}
+
+void
+modest_mail_operation_save_to_drafts (ModestMailOperation *self,
+				      TnyTransportAccount *transport_account,
+				      TnyMsg *draft_msg,
+				      ModestMsgEditWindow *edit_window,
+				      const gchar *from,  const gchar *to,
+				      const gchar *cc,  const gchar *bcc,
+				      const gchar *subject, const gchar *plain_body,
+				      const gchar *html_body,
+				      const GList *attachments_list,
+				      TnyHeaderFlags priority_flags)
+{
+	ModestMailOperationPrivate *priv = NULL;
+	SaveToDraftsInfo *info = NULL;
+
+	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+	g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
+
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+	/* Get account and set it into mail_operation */
+	priv->account = g_object_ref (transport_account);
+
+	info = g_slice_new0 (SaveToDraftsInfo);
+	info->transport_account = g_object_ref (transport_account);
+	info->draft_msg = draft_msg;
+	if (draft_msg)
+		g_object_ref (draft_msg);
+	info->edit_window = edit_window;
+	if (edit_window)
+		g_object_ref (edit_window);
+
+	modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body,
+					  attachments_list, priority_flags,
+					  modest_mail_operation_save_to_drafts_cb, info);
 
- 	modest_mail_operation_notify_end (self, FALSE);
 }
 
 typedef struct 
@@ -676,8 +887,18 @@ typedef struct
 	gchar *account_name;
 	UpdateAccountCallback callback;
 	gpointer user_data;
+	gint new_headers;
 } UpdateAccountInfo;
 
+typedef struct
+{
+	ModestMailOperation *mail_op;
+	TnyMimePart *mime_part;
+	gssize size;
+	GetMimePartSizeCallback callback;
+	gpointer userdata;
+} GetMimePartSizeInfo;
+
 /***** I N T E R N A L    F O L D E R    O B S E R V E R *****/
 /* We use this folder observer to track the headers that have been
  * added to a folder */
@@ -701,9 +922,6 @@ G_DEFINE_TYPE_WITH_CODE (InternalFolderObserver,
 static void
 foreach_add_item (gpointer header, gpointer user_data)
 {
-	/* printf("DEBUG: %s: header subject=%s\n", 
-	 * __FUNCTION__, tny_header_get_subject(TNY_HEADER(header)));
-	 */
 	tny_list_prepend (TNY_LIST (user_data), 
 			  g_object_ref (G_OBJECT (header)));
 }
@@ -725,10 +943,6 @@ internal_folder_observer_update (TnyFolderObserver *self, TnyFolderChange *chang
 		list = tny_simple_list_new ();
 		tny_folder_change_get_added_headers (change, list);
 
-		/* printf ("DEBUG: %s: Calling foreach with a list of size=%d\n", 
-		 * 	__FUNCTION__, tny_list_get_length(list));
-		 */
-		 
 		/* Add them to the folder observer */
 		tny_list_foreach (list, foreach_add_item, 
 				  derived->new_headers);
@@ -799,8 +1013,6 @@ recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all
 static gboolean
 idle_notify_progress (gpointer data)
 {
-	gdk_threads_enter ();
-
 	ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
 	ModestMailOperationState *state;
 
@@ -808,8 +1020,6 @@ idle_notify_progress (gpointer data)
 	g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
 	g_slice_free (ModestMailOperationState, state);
 	
-	gdk_threads_leave ();
-
 	return TRUE;
 }
 
@@ -821,8 +1031,6 @@ idle_notify_progress (gpointer data)
 static gboolean
 idle_notify_progress_once (gpointer data)
 {
-	gdk_threads_enter ();
-
 	ModestPair *pair;
 
 	pair = (ModestPair *) data;
@@ -833,25 +1041,20 @@ idle_notify_progress_once (gpointer data)
 	g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second);
 	g_object_unref (pair->first);
 
-	gdk_threads_leave ();
-
 	return FALSE;
 }
 
 /* 
- * Used by update_account_thread to notify the queue from the main
+ * Used to notify the queue from the main
  * loop. We call it inside an idle call to achieve that
  */
 static gboolean
-idle_notify_update_account_queue (gpointer data)
+idle_notify_queue (gpointer data)
 {
 	ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
-	ModestMailOperationPrivate *priv = NULL;
-
-	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op);
 
 	/* Do not need to block, the notify end will do it for us */	
-	modest_mail_operation_notify_end (mail_op, TRUE);
+	modest_mail_operation_notify_end (mail_op);
 	g_object_unref (mail_op);
 
 	return FALSE;
@@ -897,6 +1100,27 @@ set_last_updated_idle (gpointer data)
 	return FALSE;
 }
 
+static gboolean
+idle_update_account_cb (gpointer data)
+{
+	UpdateAccountInfo *idle_info;
+
+	idle_info = (UpdateAccountInfo *) data;
+
+	gdk_threads_enter ();
+	idle_info->callback (idle_info->mail_op,
+			     idle_info->new_headers,
+			     idle_info->user_data);
+	gdk_threads_leave ();
+
+	/* Frees */
+	g_object_unref (idle_info->mail_op);
+	g_free (idle_info);
+
+	return FALSE;
+}
+
+
 static gpointer
 update_account_thread (gpointer thr_user_data)
 {
@@ -951,7 +1175,7 @@ update_account_thread (gpointer thr_user_data)
 	   Gtk+. We use a timeout in order to provide more status
 	   information, because the sync tinymail call does not
 	   provide it for the moment */
-	gint timeout = g_timeout_add (250, idle_notify_progress, info->mail_op);
+	gint timeout = g_timeout_add (100, idle_notify_progress, info->mail_op);
 
 	/* Refresh folders */
 	new_headers = g_ptr_array_new ();
@@ -1071,8 +1295,9 @@ update_account_thread (gpointer thr_user_data)
 		g_ptr_array_free (new_headers, FALSE);
 	}
 	
-	/* Perform send */
-	priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND;
+	/* Perform send (if operation was not cancelled) */
+	if (did_a_cancel) goto out;		
+/* 	priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND; */
 	priv->done = 0;
 	priv->total = 0;
 	if (priv->account != NULL) 
@@ -1081,9 +1306,9 @@ update_account_thread (gpointer thr_user_data)
 	
 	send_queue = modest_runtime_get_send_queue (info->transport_account);
 	if (send_queue) {
-		timeout = g_timeout_add (250, idle_notify_progress, info->mail_op);
+/* 		timeout = g_timeout_add (250, idle_notify_progress, info->mail_op); */
 		modest_tny_send_queue_try_to_send (send_queue);
-		g_source_remove (timeout);
+/* 		g_source_remove (timeout); */
 	} else {
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 			     MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
@@ -1104,20 +1329,23 @@ update_account_thread (gpointer thr_user_data)
 	}
 
  out:
-	/* Notify about operation end. Note that the info could be
-	   freed before this idle happens, but the mail operation will
-	   be still alive */
-	g_idle_add (idle_notify_update_account_queue, g_object_ref (info->mail_op));
 
 	if (info->callback) {
+		UpdateAccountInfo *idle_info;
+
 		/* This thread is not in the main lock */
-		gdk_threads_enter ();
-		info->callback (info->mail_op, 
-				(new_headers) ? new_headers->len : 0, 
-				info->user_data);
-		gdk_threads_leave ();
+		idle_info = g_malloc0 (sizeof (UpdateAccountInfo));
+		idle_info->mail_op = g_object_ref (info->mail_op);
+		idle_info->new_headers = (new_headers) ? new_headers->len : 0;
+		idle_info->callback = info->callback;
+		g_idle_add (idle_update_account_cb, idle_info);
 	}
-	
+
+	/* Notify about operation end. Note that the info could be
+	   freed before this idle happens, but the mail operation will
+	   be still alive */
+	g_idle_add (idle_notify_queue, g_object_ref (info->mail_op));
+
 	/* Frees */
 	g_object_unref (query);
 	g_object_unref (all_folders);
@@ -1159,7 +1387,7 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 	 * if necessary:
 	 * TODO: Is there some way to trigger this for every attempt to 
 	 * use the network? */
-	if (!modest_platform_connect_and_wait(NULL))
+	if (!modest_platform_connect_and_wait (NULL))
 		goto error;
 
 	/* Get the Modest account */
@@ -1229,7 +1457,7 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 	priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 	if (callback) 
 		callback (self, 0, user_data);
-	modest_mail_operation_notify_end (self, FALSE);
+	modest_mail_operation_notify_end (self);
 	return FALSE;
 }
 
@@ -1280,7 +1508,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
 	}
 
 	/* Notify about operation end */
-	modest_mail_operation_notify_end (self, FALSE);
+	modest_mail_operation_notify_end (self);
 
 	return new_folder;
 }
@@ -1321,7 +1549,8 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
 								      TNY_FOLDER_TYPE_TRASH);
 		/* TODO: error_handling */
 		 modest_mail_operation_xfer_folder (self, folder,
-						    TNY_FOLDER_STORE (trash_folder), TRUE);
+						    TNY_FOLDER_STORE (trash_folder), 
+						    TRUE, NULL, NULL);
 	} else {
 		TnyFolderStore *parent = tny_folder_get_folder_store (folder);
 
@@ -1335,7 +1564,7 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
 
  end:
 	/* Notify about operation end */
-	modest_mail_operation_notify_end (self, FALSE);
+	modest_mail_operation_notify_end (self);
 }
 
 static void
@@ -1346,15 +1575,16 @@ transfer_folder_status_cb (GObject *obj,
 	ModestMailOperation *self;
 	ModestMailOperationPrivate *priv;
 	ModestMailOperationState *state;
+	XFerMsgAsyncHelper *helper;
 
 	g_return_if_fail (status != NULL);
 	g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_COPY_FOLDER);
 
-	self = MODEST_MAIL_OPERATION (user_data);
-	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+	helper = (XFerMsgAsyncHelper *) user_data;
+	g_return_if_fail (helper != NULL);
 
-	if ((status->position == 1) && (status->of_total == 100))
-		return;
+	self = helper->mail_op;
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
 	priv->done = status->position;
 	priv->total = status->of_total;
@@ -1373,12 +1603,15 @@ transfer_folder_cb (TnyFolder *folder,
 		    GError **err, 
 		    gpointer user_data)
 {
+	XFerMsgAsyncHelper *helper;
 	ModestMailOperation *self = NULL;
 	ModestMailOperationPrivate *priv = NULL;
 
-	self = MODEST_MAIL_OPERATION (user_data);
+	helper = (XFerMsgAsyncHelper *) user_data;
+	g_return_if_fail (helper != NULL);       
 
-	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+	self = helper->mail_op;
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
 	if (*err) {
 		priv->error = g_error_copy (*err);
@@ -1395,22 +1628,34 @@ transfer_folder_cb (TnyFolder *folder,
 		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 	}
 		
+	/* Notify about operation end */
+	modest_mail_operation_notify_end (self);
+
+	/* If user defined callback function was defined, call it */
+	if (helper->user_callback) {
+		gdk_threads_enter ();
+		helper->user_callback (priv->source, helper->user_data);
+		gdk_threads_leave ();
+	}
+
 	/* Free */
+	g_object_unref (helper->mail_op);
+	g_slice_free   (XFerMsgAsyncHelper, helper);
 	g_object_unref (folder);
 	g_object_unref (into);
-
-	/* Notify about operation end */
-	modest_mail_operation_notify_end (self, TRUE);
 }
 
 void
 modest_mail_operation_xfer_folder (ModestMailOperation *self,
 				   TnyFolder *folder,
 				   TnyFolderStore *parent,
-				   gboolean delete_original)
+				   gboolean delete_original,
+				   XferMsgsAsynUserCallback user_callback,
+				   gpointer user_data)
 {
 	ModestMailOperationPrivate *priv = NULL;
-	ModestTnyFolderRules parent_rules, rules;
+	ModestTnyFolderRules parent_rules = 0, rules; 
+	XFerMsgAsyncHelper *helper = NULL;
 
 	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
 	g_return_if_fail (TNY_IS_FOLDER (folder));
@@ -1428,6 +1673,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 	
 	/* The moveable restriction is applied also to copy operation */
 	if ((!TNY_IS_FOLDER_STORE (parent)) || (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE)) {
+		printf("DEBUG: %s: Not allowing the move.\n", __FUNCTION__);
  		/* Set status failed and set an error */
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
@@ -1435,7 +1681,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 			     _("mail_in_ui_folder_move_target_error"));
 
 		/* Notify the queue */
-		modest_mail_operation_notify_end (self, FALSE);
+		modest_mail_operation_notify_end (self);
 	} else if (TNY_IS_FOLDER (parent) && 
 		   (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE)) {
  		/* Set status failed and set an error */
@@ -1445,12 +1691,20 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 			     _("FIXME: parent folder does not accept new folders"));
 
 		/* Notify the queue */
-		modest_mail_operation_notify_end (self, FALSE);
+		modest_mail_operation_notify_end (self);
 	} else {
 		/* Pick references for async calls */
 		g_object_ref (folder);
 		g_object_ref (parent);
 
+		/* Create the helper */
+		helper = g_slice_new0 (XFerMsgAsyncHelper);
+		helper->mail_op = g_object_ref(self);
+		helper->dest_folder = NULL;
+		helper->headers = NULL;
+		helper->user_callback = user_callback;
+		helper->user_data = user_data;
+		
 		/* Move/Copy folder */		
 		tny_folder_copy_async (folder,
 				       parent,
@@ -1458,7 +1712,8 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 				       delete_original,
 				       transfer_folder_cb,
 				       transfer_folder_status_cb,
-				       self);
+				       helper);
+/* 				       self); */
 	}
 }
 
@@ -1469,6 +1724,7 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
 {
 	ModestMailOperationPrivate *priv;
 	ModestTnyFolderRules rules;
+	XFerMsgAsyncHelper *helper;
 
 	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
 	g_return_if_fail (TNY_IS_FOLDER_STORE (folder));
@@ -1489,23 +1745,32 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
 			     _("FIXME: unable to rename"));
 
 		/* Notify about operation end */
-		modest_mail_operation_notify_end (self, FALSE);
+		modest_mail_operation_notify_end (self);
 	} else if (!strcmp (name, " ") || strchr (name, '/')) {
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 			     MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
 			     _("FIXME: unable to rename"));
 		/* Notify about operation end */
-		modest_mail_operation_notify_end (self, FALSE);
+		modest_mail_operation_notify_end (self);
 	} else {
 		TnyFolderStore *into;
 
+		/* Create the helper */
+		helper = g_slice_new0 (XFerMsgAsyncHelper);
+		helper->mail_op = g_object_ref(self);
+		helper->dest_folder = NULL;
+		helper->headers = NULL;
+		helper->user_callback = NULL;
+		helper->user_data = NULL;
+
 		/* Rename. Camel handles folder subscription/unsubscription */
 		into = tny_folder_get_folder_store (folder);
 		tny_folder_copy_async (folder, into, name, TRUE,
 				 transfer_folder_cb,
 				 transfer_folder_status_cb,
-				 self);
+				 helper);
+/* 				 self); */
 		if (into)
 			g_object_unref (into);		
 	}
@@ -1559,8 +1824,101 @@ void modest_mail_operation_get_msg (ModestMailOperation *self,
 			     _("Error trying to get a message. No folder found for header"));
 
 		/* Notify the queue */
-		modest_mail_operation_notify_end (self, FALSE);
+		modest_mail_operation_notify_end (self);
+	}
+}
+
+static gboolean
+idle_get_mime_part_size_cb (gpointer userdata)
+{
+	GetMimePartSizeInfo *idle_info;
+
+	idle_info = (GetMimePartSizeInfo *) userdata;
+
+	gdk_threads_enter ();
+	idle_info->callback (idle_info->mail_op,
+			     idle_info->size,
+			     idle_info->userdata);
+	gdk_threads_leave ();
+
+	g_object_unref (idle_info->mail_op);
+	g_slice_free (GetMimePartSizeInfo, idle_info);
+
+	return FALSE;
+}
+
+static gpointer
+get_mime_part_size_thread (gpointer thr_user_data)
+{
+	GetMimePartSizeInfo *info;
+	gchar read_buffer[GET_SIZE_BUFFER_SIZE];
+	TnyStream *stream;
+	gssize readed_size;
+	gssize total = 0;
+	ModestMailOperationPrivate *priv;
+
+	info = (GetMimePartSizeInfo *) thr_user_data;
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
+
+	stream = tny_camel_mem_stream_new ();
+	tny_mime_part_decode_to_stream (info->mime_part, stream);
+	tny_stream_reset (stream);
+	if (tny_stream_is_eos (stream)) {
+		tny_stream_close (stream);
+		stream = tny_mime_part_get_stream (info->mime_part);
+	}
+	
+	while (!tny_stream_is_eos (stream)) {
+		readed_size = tny_stream_read (stream, read_buffer, GET_SIZE_BUFFER_SIZE);
+		total += readed_size;
 	}
+
+	if (info->callback) {
+		GetMimePartSizeInfo *idle_info;
+
+		idle_info = g_slice_new0 (GetMimePartSizeInfo);
+		idle_info->mail_op = g_object_ref (info->mail_op);
+		idle_info->size = total;
+		idle_info->callback = info->callback;
+		idle_info->userdata = info->userdata;
+		g_idle_add (idle_get_mime_part_size_cb, idle_info);
+	}
+
+	g_idle_add (idle_notify_queue, g_object_ref (info->mail_op));
+
+	g_object_unref (info->mail_op);
+	g_object_unref (stream);
+	g_object_unref (info->mime_part);
+	g_slice_free  (GetMimePartSizeInfo, info);
+
+	return NULL;
+}
+
+void          
+modest_mail_operation_get_mime_part_size (ModestMailOperation *self,
+					  TnyMimePart *part,
+					  GetMimePartSizeCallback user_callback,
+					  gpointer user_data,
+					  GDestroyNotify notify)
+{
+	GetMimePartSizeInfo *info;
+	ModestMailOperationPrivate *priv;
+	GThread *thread;
+	
+	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+	g_return_if_fail (TNY_IS_MIME_PART (part));
+	
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+	priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+	info = g_slice_new0 (GetMimePartSizeInfo);
+	info->mail_op = g_object_ref (self);
+	info->mime_part = g_object_ref (part);
+	info->callback = user_callback;
+	info->userdata = user_data;
+
+	thread = g_thread_create (get_mime_part_size_thread, info, FALSE, NULL);
+
 }
 
 static void
@@ -1584,42 +1942,33 @@ get_msg_cb (TnyFolder *folder,
 	if (*error) {
 		priv->error = g_error_copy (*error);
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-		goto out;
-	}
-	if (cancelled) {
+	} else if (cancelled) {
 		priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 			     MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
 			     _("Error trying to refresh the contents of %s"),
 			     tny_folder_get_name (folder));
-		goto out;
-	}
-
-	/* The mail operation might have been canceled in which case we do not
-	   want to notify anyone anymore. */
-	if(priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+	} else {
 		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+	}
 
-		/* If user defined callback function was defined, call it */
-		if (helper->user_callback) {
-			/* This callback is called into an iddle by tinymail,
-			   and idles are not in the main lock */
-			gdk_threads_enter ();
-			helper->user_callback (self, helper->header, msg, helper->user_data);
-			gdk_threads_leave ();
-		}
+	/* If user defined callback function was defined, call it even
+	   if the operation failed*/
+	if (helper->user_callback) {
+		/* This callback is called into an iddle by tinymail,
+		   and idles are not in the main lock */
+		gdk_threads_enter ();
+		helper->user_callback (self, helper->header, msg, helper->user_data);
+		gdk_threads_leave ();	
 	}
 
- out:
 	/* Free */
+	g_object_unref (helper->mail_op);
 	g_object_unref (helper->header);
 	g_slice_free (GetMsgAsyncHelper, helper);
 		
 	/* Notify about operation end */
-	if(priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED)
-		modest_mail_operation_notify_end (self, TRUE);
-
-	g_object_unref (G_OBJECT (self));
+	modest_mail_operation_notify_end (self);
 }
 
 static void     
@@ -1644,9 +1993,6 @@ get_msg_status_cb (GObject *obj,
 	if(priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
 		return;
 
-	if ((status->position == 1) && (status->of_total == 100))
-		return;
-
 	priv->done = 1;
 	priv->total = 1;
 
@@ -1789,7 +2135,7 @@ get_msgs_full_thread (gpointer thr_user_data)
 		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 
 	/* Notify about operation end */
-	g_idle_add (idle_notify_update_account_queue, g_object_ref (info->mail_op));
+	g_idle_add (idle_notify_queue, g_object_ref (info->mail_op));
 
 	/* Free thread resources. Will be called after all previous idles */
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE + 1, get_msgs_full_destroyer, info, NULL);
@@ -1878,7 +2224,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 			     MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT,
 			     _("emev_ni_ui_imap_msg_size_exceed_error"));
 		/* Remove from queue and free resources */
-		modest_mail_operation_notify_end (self, FALSE);
+		modest_mail_operation_notify_end (self);
 		if (notify)
 			notify (user_data);
 	}
@@ -1886,9 +2232,8 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 
 
 void 
-modest_mail_operation_remove_msg (ModestMailOperation *self,
-				  TnyHeader *header,
-				  gboolean remove_to_trash)
+modest_mail_operation_remove_msg (ModestMailOperation *self,  TnyHeader *header,
+				  gboolean remove_to_trash /*ignored*/)
 {
 	TnyFolder *folder;
 	ModestMailOperationPrivate *priv;
@@ -1896,6 +2241,9 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
 	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
 	g_return_if_fail (TNY_IS_HEADER (header));
 
+	if (remove_to_trash)
+		g_warning ("remove to trash is not implemented");
+
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 	folder = tny_header_get_folder (header);
 
@@ -1904,46 +2252,22 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
 
 	priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
-	/* Delete or move to trash */
-	if (remove_to_trash) {
-		TnyFolder *trash_folder;
-		TnyStoreAccount *store_account;
 
-		store_account = TNY_STORE_ACCOUNT (modest_tny_folder_get_account (folder));
-		trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(store_account),
-								      TNY_FOLDER_TYPE_TRASH);
-		if (trash_folder) {
-			TnyList *headers;
-
-			/* Create list */
-			headers = tny_simple_list_new ();
-			tny_list_append (headers, G_OBJECT (header));
-			g_object_unref (header);
-
-			/* Move to trash */
-			modest_mail_operation_xfer_msgs (self, headers, trash_folder, TRUE, NULL, NULL);
-			g_object_unref (headers);
-/* 			g_object_unref (trash_folder); */
-		} else {
-			ModestMailOperationPrivate *priv;
-
-			/* Set status failed and set an error */
-			priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-			priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-			g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-				     MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
-				     _("Error trying to delete a message. Trash folder not found"));
-		}
-
-		g_object_unref (G_OBJECT (store_account));
-	} else {
-		tny_folder_remove_msg (folder, header, &(priv->error));
-		if (!priv->error) {
-			tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
-			tny_folder_sync(folder, TRUE, &(priv->error));
-		}
+	tny_folder_remove_msg (folder, header, &(priv->error));
+	if (!priv->error) {
+		tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
+		tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+
+		if (TNY_IS_CAMEL_IMAP_FOLDER (folder))
+			tny_folder_sync(folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */
+		else if (TNY_IS_CAMEL_POP_FOLDER (folder))
+			tny_folder_sync(folder, TRUE, &(priv->error)); /* TRUE --> expunge */
+		else
+			/* lcoal folders */
+			tny_folder_sync(folder, TRUE, &(priv->error)); /* TRUE --> expunge */
 	}
-
+	
+	
 	/* Set status */
 	if (!priv->error)
 		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
@@ -1954,7 +2278,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
 	g_object_unref (G_OBJECT (folder));
 
 	/* Notify about operation end */
-	modest_mail_operation_notify_end (self, FALSE);
+	modest_mail_operation_notify_end (self);
 }
 
 static void
@@ -1977,9 +2301,6 @@ transfer_msgs_status_cb (GObject *obj,
 	self = helper->mail_op;
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-	if ((status->position == 1) && (status->of_total == 100))
-		return;
-
 	priv->done = status->position;
 	priv->total = status->of_total;
 
@@ -2016,6 +2337,9 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer
 		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 	}
 
+	/* Notify about operation end */
+	modest_mail_operation_notify_end (self);
+
 	/* If user defined callback function was defined, call it */
 	if (helper->user_callback) {
 		gdk_threads_enter ();
@@ -2030,8 +2354,6 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer
 	g_slice_free   (XFerMsgAsyncHelper, helper);
 	g_object_unref (folder);
 
-	/* Notify about operation end */
-	modest_mail_operation_notify_end (self, TRUE);
 }
 
 void
@@ -2048,6 +2370,9 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 	XFerMsgAsyncHelper *helper;
 	TnyHeader *header;
 	ModestTnyFolderRules rules;
+	const gchar *id1 = NULL;
+	const gchar *id2 = NULL;
+	gboolean same_folder = FALSE;
 
 	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
 	g_return_if_fail (TNY_IS_LIST (headers));
@@ -2065,9 +2390,35 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 			     MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
-			     _("FIXME: folder does not accept msgs"));
+			     _CS("ckct_ib_unable_to_paste_here"));
 		/* Notify the queue */
-		modest_mail_operation_notify_end (self, FALSE);
+		modest_mail_operation_notify_end (self);
+		return;
+	}
+		
+	/* Get source folder */
+	iter = tny_list_create_iterator (headers);
+	header = TNY_HEADER (tny_iterator_get_current (iter));
+	src_folder = tny_header_get_folder (header);
+	g_object_unref (header);
+	g_object_unref (iter);
+
+	/* Check folder source and destination */
+	id1 = tny_folder_get_id (src_folder);
+	id2 = tny_folder_get_id (TNY_FOLDER(folder));
+	same_folder = !g_ascii_strcasecmp (id1, id2);
+	if (same_folder) {
+ 		/* Set status failed and set an error */
+		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+			     MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER,
+			     _("mcen_ib_unable_to_copy_samefolder"));
+		
+		/* Notify the queue */
+		modest_mail_operation_notify_end (self);
+		
+		/* Free */
+		g_object_unref (src_folder);		
 		return;
 	}
 
@@ -2079,13 +2430,6 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 	helper->user_callback = user_callback;
 	helper->user_data = user_data;
 
-	/* Get source folder */
-	iter = tny_list_create_iterator (headers);
-	header = TNY_HEADER (tny_iterator_get_current (iter));
-	src_folder = tny_header_get_folder (header);
-	g_object_unref (header);
-	g_object_unref (iter);
-
 	/* Get account and set it into mail_operation */
 	priv->account = modest_tny_folder_get_account (src_folder);
 
@@ -2130,12 +2474,11 @@ on_refresh_folder (TnyFolder   *folder,
 	}
 
 	priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-
  out:
 	/* Call user defined callback, if it exists */
 	if (helper->user_callback) {
 		gdk_threads_enter ();
-		helper->user_callback (priv->source, folder, helper->user_data);
+		helper->user_callback (self, folder, helper->user_data);
 		gdk_threads_leave ();
 	}
 
@@ -2145,7 +2488,7 @@ on_refresh_folder (TnyFolder   *folder,
 	g_object_unref (folder);
 
 	/* Notify about operation end */
-	modest_mail_operation_notify_end (self, TRUE);
+	modest_mail_operation_notify_end (self);
 }
 
 static void
@@ -2219,8 +2562,7 @@ modest_mail_operation_refresh_folder  (ModestMailOperation *self,
  * callback).
  */
 static void
-modest_mail_operation_notify_end (ModestMailOperation *self,
-				  gboolean need_lock)
+modest_mail_operation_notify_end (ModestMailOperation *self)
 {
 	ModestMailOperationState *state;
 	ModestMailOperationPrivate *priv = NULL;
@@ -2229,11 +2571,6 @@ modest_mail_operation_notify_end (ModestMailOperation *self,
 
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-	if (!priv) {
-		g_warning ("BUG: %s: priv == NULL", __FUNCTION__);
-		return;
-	}
-	
 	/* Set the account back to not busy */
 	if (priv->account_name) {
 		modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr(), 
@@ -2244,10 +2581,6 @@ modest_mail_operation_notify_end (ModestMailOperation *self,
 	
 	/* Notify the observers about the mail opertation end */
 	state = modest_mail_operation_clone_state (self);
-	if (need_lock)
-		gdk_threads_enter ();
 	g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
-	if (need_lock)
-		gdk_threads_leave ();
 	g_slice_free (ModestMailOperationState, state);
 }