Fixed crash in send_mail handlers
[modest] / src / modest-mail-operation.c
index 0d8447e..0b68327 100644 (file)
@@ -45,6 +45,7 @@
 #include <camel/camel-stream-mem.h>
 #include <glib/gi18n.h>
 #include "modest-platform.h"
+#include "modest-account-mgr-helpers.h"
 #include <modest-tny-account.h>
 #include <modest-tny-send-queue.h>
 #include <modest-runtime.h>
@@ -58,7 +59,6 @@
 #include "modest-mail-operation.h"
 
 #define KB 1024
-#define GET_SIZE_BUFFER_SIZE 128
 
 /* 
  * Remove all these #ifdef stuff when the tinymail's idle calls become
@@ -71,35 +71,51 @@ static void modest_mail_operation_class_init (ModestMailOperationClass *klass);
 static void modest_mail_operation_init       (ModestMailOperation *obj);
 static void modest_mail_operation_finalize   (GObject *obj);
 
-static void     get_msg_cb (TnyFolder *folder, 
-                           gboolean cancelled, 
-                           TnyMsg *msg, 
-                           GError **err, 
-                           gpointer user_data);
+static void     get_msg_async_cb (TnyFolder *folder, 
+                                 gboolean cancelled, 
+                                 TnyMsg *msg, 
+                                 GError *rr, 
+                                 gpointer user_data);
 
 static void     get_msg_status_cb (GObject *obj,
                                   TnyStatus *status,  
                                   gpointer user_data);
 
+static void     modest_mail_operation_notify_start (ModestMailOperation *self);
 static void     modest_mail_operation_notify_end (ModestMailOperation *self);
 
+static void     notify_progress_of_multiple_messages (ModestMailOperation *self,
+                                                     TnyStatus *status,
+                                                     gint *last_total_bytes,
+                                                     gint *sum_total_bytes,
+                                                     gint total_bytes,
+                                                     gboolean increment_done);
+
+static guint    compute_message_list_size (TnyList *headers);
+
+static guint    compute_message_array_size (GPtrArray *headers);
+
+static int      compare_headers_by_date   (gconstpointer a,
+                                          gconstpointer b);
+
 enum _ModestMailOperationSignals 
 {
        PROGRESS_CHANGED_SIGNAL,
-
+       OPERATION_STARTED_SIGNAL,
+       OPERATION_FINISHED_SIGNAL,
        NUM_SIGNALS
 };
 
 typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate;
 struct _ModestMailOperationPrivate {
-       TnyAccount                 *account;
-       gchar                                                                            *account_name;
+       TnyAccount                *account;
        guint                      done;
        guint                      total;
        GObject                   *source;
        GError                    *error;
        ErrorCheckingUserCallback  error_checking;
        gpointer                   error_checking_user_data;
+       ErrorCheckingUserDataDestroyer error_checking_user_data_destroyer;
        ModestMailOperationStatus  status;      
        ModestMailOperationTypeOperation op_type;
 };
@@ -112,12 +128,31 @@ struct _ModestMailOperationPrivate {
                                                    priv->status = new_status;\
                                                }
 
-typedef struct _GetMsgAsyncHelper {    
-       ModestMailOperation *mail_op;
+
+typedef struct {
+       GetMsgAsyncUserCallback user_callback;
        TnyHeader *header;
-       GetMsgAsyncUserCallback user_callback;  
        gpointer user_data;
-} GetMsgAsyncHelper;
+       ModestMailOperation *mail_op;
+       GDestroyNotify destroy_notify;
+       gint last_total_bytes;
+       gint sum_total_bytes;
+       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;
@@ -130,8 +165,12 @@ typedef struct _XFerMsgAsyncHelper
        ModestMailOperation *mail_op;
        TnyList *headers;
        TnyFolder *dest_folder;
-       XferMsgsAsynUserCallback user_callback; 
+       XferAsyncUserCallback user_callback;    
+       gboolean delete;
        gpointer user_data;
+       gint last_total_bytes;
+       gint sum_total_bytes;
+       gint total_bytes;
 } XFerMsgAsyncHelper;
 
 typedef void (*ModestMailOperationCreateMsgCallback) (ModestMailOperation *mail_op,
@@ -143,6 +182,7 @@ static void          modest_mail_operation_create_msg (ModestMailOperation *self
                                                       const gchar *cc, const gchar *bcc,
                                                       const gchar *subject, const gchar *plain_body,
                                                       const gchar *html_body, const GList *attachments_list,
+                                                      const GList *images_list,
                                                       TnyHeaderFlags priority_flags,
                                                       ModestMailOperationCreateMsgCallback callback,
                                                       gpointer userdata);
@@ -159,6 +199,7 @@ typedef struct
        gchar *plain_body;
        gchar *html_body;
        GList *attachments_list;
+       GList *images_list;
        TnyHeaderFlags priority_flags;
        ModestMailOperationCreateMsgCallback callback;
        gpointer userdata;
@@ -227,7 +268,41 @@ modest_mail_operation_class_init (ModestMailOperationClass *klass)
                              NULL, NULL,
                              g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
-
+       /**
+        * operation-started
+        *
+        * This signal is issued whenever a mail operation starts, and
+        * starts mean when the tinymail operation is issued. This
+        * means that it could happen that something wrong happens and
+        * the tinymail function is never called. In this situation a
+        * operation-finished will be issued without any
+        * operation-started
+        */
+       signals[OPERATION_STARTED_SIGNAL] =
+               g_signal_new ("operation-started",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestMailOperationClass, operation_started),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__VOID,
+                             G_TYPE_NONE, 0);
+       /**
+        * operation-started
+        *
+        * This signal is issued whenever a mail operation
+        * finishes. Note that this signal could be issued without any
+        * previous "operation-started" signal, because this last one
+        * is only issued when the tinymail operation is successfully
+        * started
+        */
+       signals[OPERATION_FINISHED_SIGNAL] =
+               g_signal_new ("operation-finished",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestMailOperationClass, operation_finished),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__VOID,
+                             G_TYPE_NONE, 0);
 }
 
 static void
@@ -275,8 +350,7 @@ modest_mail_operation_finalize (GObject *obj)
 }
 
 ModestMailOperation*
-modest_mail_operation_new (ModestMailOperationTypeOperation op_type, 
-                          GObject *source)
+modest_mail_operation_new (GObject *source)
 {
        ModestMailOperation *obj;
        ModestMailOperationPrivate *priv;
@@ -284,7 +358,6 @@ modest_mail_operation_new (ModestMailOperationTypeOperation op_type,
        obj = MODEST_MAIL_OPERATION(g_object_new(MODEST_TYPE_MAIL_OPERATION, NULL));
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
 
-       priv->op_type = op_type;
        if (source != NULL)
                priv->source = g_object_ref(source);
 
@@ -292,19 +365,21 @@ modest_mail_operation_new (ModestMailOperationTypeOperation op_type,
 }
 
 ModestMailOperation*
-modest_mail_operation_new_with_error_handling (ModestMailOperationTypeOperation op_type,
-                                              GObject *source,
+modest_mail_operation_new_with_error_handling (GObject *source,
                                               ErrorCheckingUserCallback error_handler,
-                                              gpointer user_data)
+                                              gpointer user_data,
+                                              ErrorCheckingUserDataDestroyer error_handler_destroyer)
 {
        ModestMailOperation *obj;
        ModestMailOperationPrivate *priv;
                
-       obj = modest_mail_operation_new (op_type, source);
+       obj = modest_mail_operation_new (source);
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
        
        g_return_val_if_fail (error_handler != NULL, obj);
        priv->error_checking = error_handler;
+       priv->error_checking_user_data = user_data;
+       priv->error_checking_user_data_destroyer = error_handler_destroyer;
 
        return obj;
 }
@@ -317,6 +392,7 @@ modest_mail_operation_execute_error_handler (ModestMailOperation *self)
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
        g_return_if_fail(priv->status != MODEST_MAIL_OPERATION_STATUS_SUCCESS);     
 
+       /* Call the user callback */
        if (priv->error_checking != NULL)
                priv->error_checking (self, priv->error_checking_user_data);
 }
@@ -357,7 +433,7 @@ modest_mail_operation_get_source (ModestMailOperation *self)
                return NULL;
        }
        
-       return g_object_ref (priv->source);
+       return (priv->source) ? g_object_ref (priv->source) : NULL;
 }
 
 ModestMailOperationStatus
@@ -417,8 +493,17 @@ modest_mail_operation_cancel (ModestMailOperation *self)
        /* Cancel the mail operation. We need to wrap it between this
           start/stop operations to allow following calls to the
           account */
-       if (priv->account)
+       g_return_val_if_fail (priv->account, FALSE);
+
+       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);
+       }
 
        return canceled;
 }
@@ -470,29 +555,6 @@ modest_mail_operation_is_finished (ModestMailOperation *self)
        return retval;
 }
 
-guint
-modest_mail_operation_get_id (ModestMailOperation *self)
-{
-       ModestMailOperationPrivate *priv;
-
-       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0);
-
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
-       return priv->done;
-}
-
-guint 
-modest_mail_operation_set_id (ModestMailOperation *self,
-                             guint id)
-{
-       ModestMailOperationPrivate *priv;
-
-       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0);
-
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
-       return priv->done;
-}
-
 /*
  * Creates an image of the current state of a mail operation, the
  * caller must free it
@@ -539,6 +601,7 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
 {
        TnySendQueue *send_queue = NULL;
        ModestMailOperationPrivate *priv;
+       SendMsgInfo *info;
        
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
@@ -548,6 +611,7 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
 
        /* Get account and set it into mail_operation */
        priv->account = g_object_ref (transport_account);
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND;
        priv->done = 1;
        priv->total = 1;
 
@@ -556,32 +620,94 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
                             "modest: could not find send queue for account\n");
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               modest_mail_operation_notify_end (self);
+
        } else {
-               /* TODO: connect to the msg-sent in order to know when
-                  the mail operation is finished */
-               tny_send_queue_add (send_queue, msg, &(priv->error));
-               /* TODO: we're setting always success, do the check in
-                  the handler */
+               /* Add the msg to the queue */
+               modest_mail_operation_notify_start (self);
+               modest_tny_send_queue_add (MODEST_TNY_SEND_QUEUE(send_queue), 
+                                          msg, 
+                                          &(priv->error));
+
+               priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+
+               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);
+       }
+
+}
+
+static void
+common_send_mail_operation_end (TnySendQueue *queue, TnyMsg *msg,
+                               SendMsgInfo *info)
+{
+       if (msg == info->msg) {
+               g_signal_handler_disconnect (queue, info->msg_sent_handler);
+               info->msg_sent_handler = 0;
+               g_signal_handler_disconnect (queue, info->error_happened_handler);
+               info->error_happened_handler = 0;
+               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;
+
+       if (msg == info->msg) {
+               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);
+}
 
-       /* TODO: do this in the handler of the "msg-sent"
-          signal.Notify about operation end */
-       modest_mail_operation_notify_end (self);
+static void     
+send_mail_error_happened_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg,
+                                 GError *error, gpointer userdata)
+{
+       SendMsgInfo *info = (SendMsgInfo *) userdata;
+
+       if (msg == info->msg) {
+               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);
 }
 
+
 static gboolean
 idle_create_msg_cb (gpointer idle_data)
 {
        CreateMsgIdleInfo *info = (CreateMsgIdleInfo *) idle_data;
 
-       gdk_threads_enter ();
+       /* This is a GDK lock because we are an idle callback and
+        * info->callback can contain Gtk+ code */
+
+       gdk_threads_enter (); /* CHECKED */
        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);
+       gdk_threads_leave (); /* CHECKED */
 
        return FALSE;
 }
@@ -597,22 +723,25 @@ create_msg_thread (gpointer thread_data)
        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 */
+                                             info->attachments_list);
        } 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);
+                                                        info->plain_body, info->attachments_list,
+                                                        info->images_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);
-               }
+               tny_header_set_flag (header, info->priority_flags);
+
+               /* Set attachment flags in message */
+               if (info->attachments_list != NULL)
+                       tny_header_set_flag (header, TNY_HEADER_FLAG_ATTACHMENTS);
+
                g_object_unref (G_OBJECT(header));
        } else {
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
@@ -631,15 +760,14 @@ create_msg_thread (gpointer thread_data)
        g_free (info->subject);
        g_list_foreach (info->attachments_list, (GFunc) g_object_unref, NULL);
        g_list_free (info->attachments_list);
+       g_list_foreach (info->images_list, (GFunc) g_object_unref, NULL);
+       g_list_free (info->images_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->mail_op = g_object_ref (info->mail_op);
+               idle_info->msg = (new_msg) ? g_object_ref (new_msg) : NULL;
                idle_info->callback = info->callback;
                idle_info->userdata = info->userdata;
                g_idle_add (idle_create_msg_cb, idle_info);
@@ -659,6 +787,7 @@ modest_mail_operation_create_msg (ModestMailOperation *self,
                                  const gchar *subject, const gchar *plain_body,
                                  const gchar *html_body,
                                  const GList *attachments_list,
+                                 const GList *images_list,
                                  TnyHeaderFlags priority_flags,
                                  ModestMailOperationCreateMsgCallback callback,
                                  gpointer userdata)
@@ -666,17 +795,19 @@ modest_mail_operation_create_msg (ModestMailOperation *self,
        CreateMsgInfo *info = NULL;
 
        info = g_slice_new0 (CreateMsgInfo);
-       info->mail_op = self;
-       g_object_ref (self);
+       info->mail_op = g_object_ref (self);
 
        info->from = g_strdup (from);
        info->to = g_strdup (to);
        info->cc = g_strdup (cc);
+       info->bcc  = g_strdup (bcc);
        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->images_list = g_list_copy ((GList *) images_list);
+       g_list_foreach (info->images_list, (GFunc) g_object_ref, NULL);
        info->priority_flags = priority_flags;
 
        info->callback = callback;
@@ -697,8 +828,10 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self,
                                        gpointer userdata)
 {
        SendNewMailInfo *info = (SendNewMailInfo *) userdata;
-       TnyFolder *folder;
+       TnyFolder *draft_folder = NULL;
+       TnyFolder *outbox_folder = NULL;
        TnyHeader *header;
+       GError *err = NULL;
 
        if (!msg) {
                goto end;
@@ -707,27 +840,51 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self,
        /* 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);
-                       g_object_unref (folder);
-               }
+       /* Remove old mail from its source folder */
+       draft_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account),
+                                                             TNY_FOLDER_TYPE_DRAFTS);
+       outbox_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account),
+                                                              TNY_FOLDER_TYPE_OUTBOX);
+       if (info->draft_msg != NULL) {
+               TnyFolder *folder = NULL;
+               TnyFolder *src_folder = NULL;
+               TnyFolderType folder_type;              
+               folder = tny_msg_get_folder (info->draft_msg);          
+               if (folder == NULL) goto end;
+               folder_type = modest_tny_folder_guess_folder_type (folder);
+
+               if (folder_type == TNY_FOLDER_TYPE_INVALID)
+                       g_warning ("%s: BUG: folder of type TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+               
+               if (folder_type == TNY_FOLDER_TYPE_OUTBOX) 
+                       src_folder = outbox_folder;
+               else 
+                       src_folder = draft_folder;
+
+               /* 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 (err != NULL)
+               g_error_free(err);      
        if (info->draft_msg)
                g_object_unref (info->draft_msg);
+       if (draft_folder)
+               g_object_unref (draft_folder);
+       if (outbox_folder)
+               g_object_unref (outbox_folder);
        if (info->transport_account)
                g_object_unref (info->transport_account);
        g_slice_free (SendNewMailInfo, info);
-       modest_mail_operation_notify_end (self);
 }
 
 void
@@ -739,6 +896,7 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
                                     const gchar *subject, const gchar *plain_body,
                                     const gchar *html_body,
                                     const GList *attachments_list,
+                                    const GList *images_list,
                                     TnyHeaderFlags priority_flags)
 {
        ModestMailOperationPrivate *priv = NULL;
@@ -748,6 +906,8 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
        g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND;
+       priv->account = TNY_ACCOUNT (g_object_ref (transport_account));
 
        /* Check parametters */
        if (to == NULL) {
@@ -765,8 +925,11 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
        info->draft_msg = draft_msg;
        if (draft_msg)
                g_object_ref (draft_msg);
+
+
+       modest_mail_operation_notify_start (self);
        modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body,
-                                         attachments_list, priority_flags,
+                                         attachments_list, images_list, priority_flags,
                                          modest_mail_operation_send_new_mail_cb, info);
 
 }
@@ -775,7 +938,75 @@ typedef struct
 {
        TnyTransportAccount *transport_account;
        TnyMsg *draft_msg;
-       ModestMsgEditWindow *edit_window;
+       SaveToDraftstCallback callback;
+       gpointer user_data;
+       TnyFolder *drafts;
+       TnyMsg *msg;
+       ModestMailOperation *mailop;
+} SaveToDraftsAddMsgInfo;
+
+static void
+modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self,
+                                               gboolean canceled,
+                                               GError *err,
+                                               gpointer userdata)
+{
+       ModestMailOperationPrivate *priv = NULL;
+       SaveToDraftsAddMsgInfo *info = (SaveToDraftsAddMsgInfo *) userdata;
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mailop);
+
+       if (priv->error) {
+               g_warning ("%s: priv->error != NULL", __FUNCTION__);
+               g_error_free(priv->error);
+       }
+
+       priv->error = (err == NULL) ? NULL : g_error_copy(err);
+
+       if ((!priv->error) && (info->draft_msg != NULL)) {
+               TnyHeader *header = tny_msg_get_header (info->draft_msg);
+               TnyFolder *src_folder = tny_header_get_folder (header);
+
+               /* Remove the old draft */
+               tny_folder_remove_msg (src_folder, header, NULL);
+
+               /* Synchronize to expunge and to update the msg counts */
+               tny_folder_sync_async (info->drafts, TRUE, NULL, NULL, NULL);
+               tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL);
+
+               g_object_unref (G_OBJECT(header));
+               g_object_unref (G_OBJECT(src_folder));
+       }
+
+       if (!priv->error)
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       else
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+
+       /* Call the user callback */
+       if (info->callback)
+               info->callback (info->mailop, info->msg, info->user_data);
+
+       if (info->transport_account)
+               g_object_unref (G_OBJECT(info->transport_account));
+       if (info->draft_msg)
+               g_object_unref (G_OBJECT (info->draft_msg));
+       if (info->drafts)
+               g_object_unref (G_OBJECT(info->drafts));
+       if (info->msg)
+               g_object_unref (G_OBJECT (info->msg));
+       g_slice_free (SaveToDraftsAddMsgInfo, info);
+
+       modest_mail_operation_notify_end (info->mailop);
+       g_object_unref(info->mailop);
+}
+
+typedef struct
+{
+       TnyTransportAccount *transport_account;
+       TnyMsg *draft_msg;
+       SaveToDraftstCallback callback;
+       gpointer user_data;
 } SaveToDraftsInfo;
 
 static void
@@ -783,76 +1014,67 @@ modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self,
                                         TnyMsg *msg,
                                         gpointer userdata)
 {
-       TnyFolder *folder = NULL;
-       TnyHeader *header = NULL;
+       TnyFolder *drafts = NULL;
        ModestMailOperationPrivate *priv = NULL;
        SaveToDraftsInfo *info = (SaveToDraftsInfo *) userdata;
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
        if (!msg) {
-               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");
-               goto end;
+       } else {
+               drafts = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account),
+                                                               TNY_FOLDER_TYPE_DRAFTS);
+               if (!drafts) {
+                       g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                                    MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                                    "modest: failed to create a new msg\n");
+               }
        }
 
-       folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_DRAFTS);
-       if (!folder) {
+       if (!priv->error) {
+               SaveToDraftsAddMsgInfo *cb_info = g_slice_new(SaveToDraftsAddMsgInfo);
+               cb_info->transport_account = g_object_ref(info->transport_account);
+               cb_info->draft_msg = info->draft_msg ? g_object_ref(info->draft_msg) : NULL;
+               cb_info->callback = info->callback;
+               cb_info->user_data = info->user_data;
+               cb_info->drafts = g_object_ref(drafts);
+               cb_info->msg = g_object_ref(msg);
+               cb_info->mailop = g_object_ref(self);
+               tny_folder_add_msg_async(drafts, msg, modest_mail_operation_save_to_drafts_add_msg_cb,
+                                        NULL, cb_info);
+       } else {
+               /* Call the user callback */
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
-                            "modest: failed to create a new msg\n");
-               goto end;
-       }
-
-       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_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);
+               if (info->callback)
+                       info->callback (self, msg, info->user_data);
+               modest_mail_operation_notify_end (self);
        }
-       
-       if (!priv->error)
-               tny_folder_add_msg (folder, msg, &(priv->error));
-
-       if (!priv->error)
-               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-       else
-               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-
-       if (info->edit_window)
-               modest_msg_edit_window_set_draft (info->edit_window, msg);
-
 
-end:
-       if (folder)
-               g_object_unref (G_OBJECT(folder));
-       if (info->edit_window)
-               g_object_unref (G_OBJECT(info->edit_window));
+       if (drafts)
+               g_object_unref (G_OBJECT(drafts));
        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)
+                                     const GList *images_list,
+                                     TnyHeaderFlags priority_flags,
+                                     SaveToDraftstCallback callback,
+                                     gpointer user_data)
 {
        ModestMailOperationPrivate *priv = NULL;
        SaveToDraftsInfo *info = NULL;
@@ -864,36 +1086,20 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self,
 
        /* Get account and set it into mail_operation */
        priv->account = g_object_ref (transport_account);
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_INFO;
 
        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);
+       info->draft_msg = (draft_msg) ? g_object_ref (draft_msg) : NULL;
+       info->callback = callback;
+       info->user_data = user_data;
 
+       modest_mail_operation_notify_start (self);
        modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body,
-                                         attachments_list, priority_flags,
+                                         attachments_list, images_list, priority_flags,
                                          modest_mail_operation_save_to_drafts_cb, info);
-
 }
 
-typedef struct 
-{
-       ModestMailOperation *mail_op;
-       TnyStoreAccount *account;
-       TnyTransportAccount *transport_account;
-       gint max_size;
-       gint retrieve_limit;
-       gchar *retrieve_type;
-       gchar *account_name;
-       UpdateAccountCallback callback;
-       gpointer user_data;
-       gint new_headers;
-} UpdateAccountInfo;
-
 typedef struct
 {
        ModestMailOperation *mail_op;
@@ -985,503 +1191,409 @@ internal_folder_observer_class_init (InternalFolderObserverClass *klass)
        object_class->finalize = internal_folder_observer_finalize;
 }
 
-/*****************/
-
-static void
-recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all_folders)
+typedef struct 
 {
-       TnyIterator *iter;
-       TnyList *folders = tny_simple_list_new ();
-
-       tny_folder_store_get_folders (store, folders, query, NULL);
-       iter = tny_list_create_iterator (folders);
-
-       while (!tny_iterator_is_done (iter)) {
-
-               TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter);
+       ModestMailOperation *mail_op;
+       gchar *account_name;
+       UpdateAccountCallback callback;
+       gpointer user_data;
+       TnyList *folders;
+       gint pending_calls;
+       gboolean poke_all;
+       TnyFolderObserver *inbox_observer;
+       guint update_timeout;
+} UpdateAccountInfo;
 
-               tny_list_prepend (all_folders, G_OBJECT (folder));
-               recurse_folders (folder, query, all_folders);    
-               g_object_unref (G_OBJECT (folder));
 
-               tny_iterator_next (iter);
+static void
+destroy_update_account_info (UpdateAccountInfo *info)
+{
+       if (info->update_timeout) {
+               g_source_remove (info->update_timeout);
+               info->update_timeout = 0;
        }
-        g_object_unref (G_OBJECT (iter));
-        g_object_unref (G_OBJECT (folders));
+
+       g_free (info->account_name);
+       g_object_unref (info->folders);
+       g_object_unref (info->mail_op);
+       g_slice_free (UpdateAccountInfo, info);
 }
 
-/* 
- * Issues the "progress-changed" signal. The timer won't be removed,
- * so you must call g_source_remove to stop the signal emission
- */
-static gboolean
-idle_notify_progress (gpointer data)
+static void
+update_account_get_msg_async_cb (TnyFolder *folder, 
+                                gboolean canceled, 
+                                TnyMsg *msg, 
+                                GError *err, 
+                                gpointer user_data)
 {
-       ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
-       ModestMailOperationState *state;
+       GetMsgInfo *msg_info = (GetMsgInfo *) user_data;
 
-       state = modest_mail_operation_clone_state (mail_op);
-#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
-       gdk_threads_enter ();
-#endif
-       g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
-#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
-       gdk_threads_leave ();
-#endif
-       g_slice_free (ModestMailOperationState, state);
-       
-       return TRUE;
+       /* Just delete the helper. Don't do anything with the new
+          msg. There is also no need to check for errors */
+       g_object_unref (msg_info->mail_op);
+       g_object_unref (msg_info->header);
+       g_slice_free (GetMsgInfo, msg_info);
 }
 
-/* 
- * Issues the "progress-changed" signal and removes the timer. It uses
- * a lock to ensure that the progress information of the mail
- * operation is not modified while there are notifications pending
- */
-static gboolean
-idle_notify_progress_once (gpointer data)
-{
-       ModestPair *pair;
 
-       pair = (ModestPair *) data;
+static void
+inbox_refreshed_cb (TnyFolder *inbox, 
+                   gboolean canceled, 
+                   GError *err, 
+                   gpointer user_data)
+{      
+       UpdateAccountInfo *info;
+       ModestMailOperationPrivate *priv;
+       TnyIterator *new_headers_iter;
+       GPtrArray *new_headers_array = NULL;   
+       gint max_size, retrieve_limit, i;
+       ModestAccountMgr *mgr;
+       gchar *retrieve_type = NULL;
+       TnyList *new_headers = NULL;
+       gboolean headers_only;
+       TnyTransportAccount *transport_account;
+       ModestTnySendQueue *send_queue;
 
-#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
-       gdk_threads_enter ();
-#endif
-       g_signal_emit (G_OBJECT (pair->first), signals[PROGRESS_CHANGED_SIGNAL], 0, pair->second, NULL);
-#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
-       gdk_threads_leave ();
-#endif
+       info = (UpdateAccountInfo *) user_data;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
+       mgr = modest_runtime_get_account_mgr ();
 
-       /* Free the state and the reference to the mail operation */
-       g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second);
-       g_object_unref (pair->first);
+       if (canceled || err || !inbox) {
+               /* Try to send anyway */
+               goto send_mail;
+       }
 
-       return FALSE;
-}
+       /* Get the message max size */
+       max_size  = modest_conf_get_int (modest_runtime_get_conf (),
+                                        MODEST_CONF_MSG_SIZE_LIMIT, NULL);
+       if (max_size == 0)
+               max_size = G_MAXINT;
+       else
+               max_size = max_size * KB;
 
-/* 
- * Used to notify the queue from the main
- * loop. We call it inside an idle call to achieve that
- */
-static gboolean
-idle_notify_queue (gpointer data)
-{
-       ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
+       /* Create the new headers array. We need it to sort the
+          new headers by date */
+       new_headers_array = g_ptr_array_new ();
+       new_headers_iter = tny_list_create_iterator (((InternalFolderObserver *) info->inbox_observer)->new_headers);
+       while (!tny_iterator_is_done (new_headers_iter)) {
+               TnyHeader *header = NULL;
+
+               header = TNY_HEADER (tny_iterator_get_current (new_headers_iter));
+               /* Apply per-message size limits */
+               if (tny_header_get_message_size (header) < max_size)
+                       g_ptr_array_add (new_headers_array, g_object_ref (header));
+                               
+               g_object_unref (header);
+               tny_iterator_next (new_headers_iter);
+       }
+       g_object_unref (new_headers_iter);
+       tny_folder_remove_observer (inbox, info->inbox_observer);
+       g_object_unref (info->inbox_observer);
+       info->inbox_observer = NULL;
 
-       /* Do not need to block, the notify end will do it for us */    
-       modest_mail_operation_notify_end (mail_op);
-       g_object_unref (mail_op);
+       if (new_headers_array->len == 0)
+               goto send_mail;
 
-       return FALSE;
-}
+       /* Get per-account message amount retrieval limit */
+       retrieve_limit = modest_account_mgr_get_retrieve_limit (mgr, info->account_name);
+       if (retrieve_limit == 0)
+               retrieve_limit = G_MAXINT;
+       
+       /* Get per-account retrieval type */
+       retrieve_type = modest_account_mgr_get_retrieve_type (mgr, info->account_name); 
+       headers_only = !g_ascii_strcasecmp (retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_HEADERS_ONLY);
+       g_free (retrieve_type);
 
-static int
-compare_headers_by_date (gconstpointer a, 
-                        gconstpointer b)
-{
-       TnyHeader **header1, **header2;
-       time_t sent1, sent2;
+       /* Order by date */
+       g_ptr_array_sort (new_headers_array, (GCompareFunc) compare_headers_by_date);
+       
+       /* TODO: Ask the user, instead of just failing,
+        * showing mail_nc_msg_count_limit_exceeded, with 'Get
+        * all' and 'Newest only' buttons. */
+       if (new_headers_array->len > retrieve_limit) {
+               /* TODO */
+       }
+       
+       if (!headers_only) {
+               gint msg_num = 0;
+               const gint msg_list_size = compute_message_array_size (new_headers_array);
 
-       header1 = (TnyHeader **) a;
-       header2 = (TnyHeader **) b;
+               priv->done = 0;
+               priv->total = MIN (new_headers_array->len, retrieve_limit);
+               while (msg_num < priv->total) {         
+                       TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers_array, msg_num));
+                       TnyFolder *folder = tny_header_get_folder (header);
+                       GetMsgInfo *msg_info;
 
-       sent1 = tny_header_get_date_sent (*header1);
-       sent2 = tny_header_get_date_sent (*header2);
+                       /* Create the message info */
+                       msg_info = g_slice_new0 (GetMsgInfo);
+                       msg_info->mail_op = g_object_ref (info->mail_op);
+                       msg_info->header = g_object_ref (header);
+                       msg_info->total_bytes = msg_list_size;
 
-       /* We want the most recent ones (greater time_t) at the
-          beginning */
-       if (sent1 < sent2)
-               return 1;
-       else
-               return -1;
-}
+                       /* Get message in an async way */
+                       tny_folder_get_msg_async (folder, header, update_account_get_msg_async_cb, 
+                                                 get_msg_status_cb, msg_info);
 
-static gboolean 
-set_last_updated_idle (gpointer data)
-{
-       gdk_threads_enter ();
+                       g_object_unref (folder);
+                       
+                       msg_num++;
+               }
+       }
 
-       /* It does not matter if the time is not exactly the same than
-          the time when this idle was called, it's just an
-          approximation and it won't be very different */
-       modest_account_mgr_set_int (modest_runtime_get_account_mgr (), 
-                                   (gchar *) data, 
-                                   MODEST_ACCOUNT_LAST_UPDATED, 
-                                   time(NULL), 
-                                   TRUE);
+       /* Copy the headers to a list and free the array */
+       new_headers = tny_simple_list_new ();
+       for (i=0; i < new_headers_array->len; i++) {
+               TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers_array, i));
+               tny_list_append (new_headers, G_OBJECT (header));
+       }
+       g_ptr_array_foreach (new_headers_array, (GFunc) g_object_unref, NULL);
+       g_ptr_array_free (new_headers_array, FALSE);
 
-       gdk_threads_leave ();
+       /* Update the last updated key */
+       modest_account_mgr_set_last_updated (mgr, tny_account_get_id (priv->account), time (NULL));
 
-       return FALSE;
-}
+ send_mail:
+       /* Send mails */
+       priv->done = 0;
+       priv->total = 0;
 
-static gboolean
-idle_update_account_cb (gpointer data)
-{
-       UpdateAccountInfo *idle_info;
+       /* 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);
 
-       idle_info = (UpdateAccountInfo *) data;
+       /* Check if the operation was a success */
+       if (!priv->error)
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 
-       gdk_threads_enter ();
-       idle_info->callback (idle_info->mail_op,
-                            idle_info->new_headers,
-                            idle_info->user_data);
-       gdk_threads_leave ();
+       /* Set the account back to not busy */
+       modest_account_mgr_set_account_busy (mgr, info->account_name, FALSE);
 
-       /* Frees */
-       g_object_unref (idle_info->mail_op);
-       g_free (idle_info);
+       /* Call the user callback */
+       if (info->callback)
+               info->callback (info->mail_op, new_headers, info->user_data);
 
-       return FALSE;
-}
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (info->mail_op);
 
+       /* Frees */
+       if (new_headers)
+               g_object_unref (new_headers);
+       destroy_update_account_info (info);
+}
 
-static gpointer
-update_account_thread (gpointer thr_user_data)
+static void 
+recurse_folders_async_cb (TnyFolderStore *folder_store, 
+                         gboolean canceled,
+                         TnyList *list, 
+                         GError *err, 
+                         gpointer user_data)
 {
-       static gboolean first_time = TRUE;
-       UpdateAccountInfo *info = NULL;
-       TnyList *all_folders = NULL;
-       GPtrArray *new_headers = NULL;
-       TnyIterator *iter = NULL;
-       TnyFolderStoreQuery *query = NULL;
-       ModestMailOperationPrivate *priv = NULL;
-       ModestTnySendQueue *send_queue = NULL;
-       gint num_new_headers = 0;
-
-       info = (UpdateAccountInfo *) thr_user_data;
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op);
-
-       /* Get account and set it into mail_operation */
-       priv->account = g_object_ref (info->account);
-
-       /*
-        * for POP3, we do a logout-login upon send/receive -- many POP-servers (like Gmail) do not
-        * show any updates unless we do that
-        */
-       if (!first_time && TNY_IS_CAMEL_POP_STORE_ACCOUNT (priv->account)) 
-               tny_camel_pop_store_account_reconnect (TNY_CAMEL_POP_STORE_ACCOUNT(priv->account));
-
-       /* Get all the folders. We can do it synchronously because
-          we're already running in a different thread than the UI */
-       all_folders = tny_simple_list_new ();
-       query = tny_folder_store_query_new ();
-       tny_folder_store_query_add_item (query, NULL, TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED);
-       tny_folder_store_get_folders (TNY_FOLDER_STORE (info->account),
-                                     all_folders,
-                                     query,
-                                     &(priv->error));
-       if (priv->error) {
-               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-               goto out;
-       }
+       UpdateAccountInfo *info;
+       ModestMailOperationPrivate *priv;
+    
+       info = (UpdateAccountInfo *) user_data;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
 
-       iter = tny_list_create_iterator (all_folders);
-       while (!tny_iterator_is_done (iter)) {
-               TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter));
+       if (err || canceled) {
+               /* Try to continue anyway */
+       } else {
+               TnyIterator *iter = tny_list_create_iterator (list);
+               while (!tny_iterator_is_done (iter)) {
+                       TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter);
+                       TnyList *folders = tny_simple_list_new ();
 
-               recurse_folders (folder, query, all_folders);
-               tny_iterator_next (iter);
+                       /* Add to the list of all folders */
+                       tny_list_append (info->folders, (GObject *) folder);
+                       
+                       /* Add pending call */
+                       info->pending_calls++;
+                       
+                       tny_folder_store_get_folders_async (folder, folders, recurse_folders_async_cb, 
+                                                           NULL, NULL, info);
+                       
+                       g_object_unref (G_OBJECT (folder));
+                       
+                       tny_iterator_next (iter);           
+               }
+               g_object_unref (G_OBJECT (iter));
+               g_object_unref (G_OBJECT (list));
        }
-       g_object_unref (G_OBJECT (iter));
-
-       /* Update status and notify. We need to call the notification
-          with a source function in order to call it from the main
-          loop. We need that in order not to get into trouble with
-          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 (100, idle_notify_progress, info->mail_op);
-
-       /* Refresh folders */
-       num_new_headers = 0;
-       new_headers = g_ptr_array_new ();
-       iter = tny_list_create_iterator (all_folders);
-
-       while (!tny_iterator_is_done (iter) && !priv->error && 
-              priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
-
-               InternalFolderObserver *observer;
-               TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter));
-
-               /* Refresh the folder */
-               /* Our observer receives notification of new emails during folder refreshes,
-                * so we can use observer->new_headers.
-                */
-               observer = g_object_new (internal_folder_observer_get_type (), NULL);
-               tny_folder_add_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer));
-               
-               /* This gets the status information (headers) from the server.
-                * We use the blocking version, because we are already in a separate 
-                * thread.
-                */
-
-               if (!g_ascii_strcasecmp (info->retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES) || 
-                   !g_ascii_strcasecmp (info->retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES_AND_ATTACHMENTS)) {
-                       TnyIterator *iter;
-
-                       /* If the retrieve type is full messages, refresh and get the messages */
-                       tny_folder_refresh (TNY_FOLDER (folder), &(priv->error));
-
-                       iter = tny_list_create_iterator (observer->new_headers);
-                       while (!tny_iterator_is_done (iter)) {
-                               TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
-                                
-                               /* Apply per-message size limits */
-                               if (tny_header_get_message_size (header) < info->max_size)
-                                       g_ptr_array_add (new_headers, g_object_ref (header));
 
-                               g_object_unref (header);
-                               tny_iterator_next (iter);
-                       }
-                       g_object_unref (iter);
-               } else {
-                       /* We do not need to do it the first time
-                          because it's automatically done by the tree
-                          model */
-                       if (G_UNLIKELY (!first_time))
-                               tny_folder_poke_status (TNY_FOLDER (folder));
-               }
-               tny_folder_remove_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer));
-               g_object_unref (observer);
-               observer = NULL;                        
+       /* Remove my own pending call */
+       info->pending_calls--;
 
-               g_object_unref (G_OBJECT (folder));
-               if (priv->error)
-                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+       /* This means that we have all the folders */
+       if (info->pending_calls == 0) {
+               TnyIterator *iter_all_folders;
+               TnyFolder *inbox = NULL;
 
-               tny_iterator_next (iter);
-       }
+               iter_all_folders = tny_list_create_iterator (info->folders);
 
-       g_object_unref (G_OBJECT (iter));
-       g_source_remove (timeout);
+               /* Do a poke status over all folders */
+               while (!tny_iterator_is_done (iter_all_folders) &&
+                      priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) {
+                       TnyFolder *folder = NULL;
 
-       if (priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED && 
-           priv->status != MODEST_MAIL_OPERATION_STATUS_FAILED &&
-           new_headers->len > 0) {
-               gint msg_num = 0;
+                       folder = TNY_FOLDER (tny_iterator_get_current (iter_all_folders));
 
-               /* Order by date */
-               g_ptr_array_sort (new_headers, (GCompareFunc) compare_headers_by_date);
-
-               /* Apply message count limit */
-               /* If the number of messages exceeds the maximum, ask the
-                * user to download them all,
-                * as per the UI spec "Retrieval Limits" section in 4.4: 
-                */
-               if (new_headers->len > info->retrieve_limit) {
-                       /* TODO: Ask the user, instead of just
-                        * failing, showing
-                        * mail_nc_msg_count_limit_exceeded, with 'Get
-                        * all' and 'Newest only' buttons. */
-                       g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_RETRIEVAL_NUMBER_LIMIT,
-                            "The number of messages to retrieve exceeds the chosen limit for account %s\n", 
-                            tny_account_get_name (TNY_ACCOUNT (info->transport_account)));
-                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-                       goto out;
-               }
-               
-               priv->done = 0;
-               priv->total = MIN (new_headers->len, info->retrieve_limit);
-               while (msg_num < priv->total) {
+                       if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX) {
+                               /* Get a reference to the INBOX */
+                               inbox = g_object_ref (folder);
+                       } else {
+                               /* Issue a poke status over the folder */
+                               if (info->poke_all)
+                                       tny_folder_poke_status (folder);
+                       }
 
-                       TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers, msg_num));
-                       TnyFolder *folder = tny_header_get_folder (header);
-                       TnyMsg *msg       = tny_folder_get_msg (folder, header, NULL);
-                       ModestMailOperationState *state;
-                       ModestPair* pair;
-
-                       priv->done++;
-                       /* We can not just use the mail operation because the
-                          values of done and total could change before the
-                          idle is called */
-                       state = modest_mail_operation_clone_state (info->mail_op);
-                       pair = modest_pair_new (g_object_ref (info->mail_op), state, FALSE);
-                       g_idle_add_full (G_PRIORITY_HIGH_IDLE, idle_notify_progress_once,
-                                        pair, (GDestroyNotify) modest_pair_free);
-
-                       g_object_unref (msg);
+                       /* Free and go to next */
                        g_object_unref (folder);
-
-                       msg_num++;
+                       tny_iterator_next (iter_all_folders);
+               }
+               g_object_unref (iter_all_folders);
+
+               /* Stop the progress notification */
+               g_source_remove (info->update_timeout);
+               info->update_timeout = 0;
+
+               /* Refresh the INBOX */
+               if (inbox) {
+                       /* Refresh the folder. Our observer receives
+                        * the new emails during folder refreshes, so
+                        * we can use observer->new_headers
+                        */
+                       info->inbox_observer = g_object_new (internal_folder_observer_get_type (), NULL);
+                       tny_folder_add_observer (inbox, info->inbox_observer);
+
+                       /* Refresh the INBOX */
+                       tny_folder_refresh_async (inbox, inbox_refreshed_cb, NULL, info);
+                       g_object_unref (inbox);
+               } else {
+                       /* We could not perform the inbox refresh but
+                          we'll try to send mails anyway */
+                       inbox_refreshed_cb (inbox, FALSE, NULL, info);
                }
        }
+}
 
-       /* Get the number of new headers and free them */
-       num_new_headers = new_headers->len;
-       g_ptr_array_foreach (new_headers, (GFunc) g_object_unref, NULL);
-       g_ptr_array_free (new_headers, FALSE);
-       
-       if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
-               goto out;
-
-       /* Perform send (if operation was not cancelled) */
-/*     priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND; */
-       priv->done = 0;
-       priv->total = 0;
-       if (priv->account != NULL) 
-               g_object_unref (priv->account);
-       priv->account = g_object_ref (info->transport_account);
-       
-       send_queue = modest_runtime_get_send_queue (info->transport_account);
-       if (send_queue) {
-/*             timeout = g_timeout_add (250, idle_notify_progress, info->mail_op); */
-               modest_tny_send_queue_try_to_send (send_queue);
-/*             g_source_remove (timeout); */
-       } else {
-               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
-                            "cannot create a send queue for %s\n", 
-                            tny_account_get_name (TNY_ACCOUNT (info->transport_account)));
-               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-       }
-       
-       /* Check if the operation was a success */
-       if (!priv->error) {
-               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-
-               /* Update the last updated key */
-               g_idle_add_full (G_PRIORITY_HIGH_IDLE, 
-                                set_last_updated_idle, 
-                                g_strdup (tny_account_get_id (TNY_ACCOUNT (info->account))),
-                                (GDestroyNotify) g_free);
-       }
-
- out:
-
-       if (info->callback) {
-               UpdateAccountInfo *idle_info;
-
-               /* This thread is not in the main lock */
-               idle_info = g_malloc0 (sizeof (UpdateAccountInfo));
-               idle_info->mail_op = g_object_ref (info->mail_op);
-               idle_info->new_headers = num_new_headers;
-               idle_info->callback = info->callback;
-               g_idle_add (idle_update_account_cb, idle_info);
-       }
+/* 
+ * Issues the "progress-changed" signal. The timer won't be removed,
+ * so you must call g_source_remove to stop the signal emission
+ */
+static gboolean
+timeout_notify_progress (gpointer data)
+{
+       ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
+       ModestMailOperationState *state;
 
-       /* 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));
+       state = modest_mail_operation_clone_state (mail_op);
 
-       /* Frees */
-       g_object_unref (query);
-       g_object_unref (all_folders);
-       g_object_unref (info->account);
-       g_object_unref (info->transport_account);
-       g_free (info->retrieve_type);
-       g_slice_free (UpdateAccountInfo, info);
+       /* This is a GDK lock because we are an idle callback and
+        * the handlers of this signal can contain Gtk+ code */
 
-       first_time = FALSE;
+       gdk_threads_enter (); /* CHECKED */
+       g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+       gdk_threads_leave (); /* CHECKED */
 
-       return NULL;
+       g_slice_free (ModestMailOperationState, state);
+       
+       return TRUE;
 }
 
-gboolean
+void
 modest_mail_operation_update_account (ModestMailOperation *self,
                                      const gchar *account_name,
+                                     gboolean poke_all,
                                      UpdateAccountCallback callback,
                                      gpointer user_data)
 {
-       GThread *thread = NULL;
        UpdateAccountInfo *info = NULL;
        ModestMailOperationPrivate *priv = NULL;
-       ModestAccountMgr *mgr = NULL;
+       ModestTnyAccountStore *account_store = NULL;
        TnyStoreAccount *store_account = NULL;
-       TnyTransportAccount *transport_account = NULL;
+       TnyList *folders;
 
-       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE);
-       g_return_val_if_fail (account_name, FALSE);
-
-       /* Init mail operation. Set total and done to 0, and do not
-          update them, this way the progress objects will know that
-          we have no clue about the number of the objects */
+       /* 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;
 
-       /* Get the Modest account */
+       /* Get the store account */
+       account_store = modest_runtime_get_account_store ();
        store_account = (TnyStoreAccount *)
-               modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
-                                                                    account_name,
-                                                                    TNY_ACCOUNT_TYPE_STORE);
-                                                                    
-       /* Make sure that we have a connection, and request one 
-        * if necessary:
-        * TODO: Is there some way to trigger this for every attempt to 
-        * use the network? */
-       if (!modest_platform_connect_and_wait (NULL, TNY_ACCOUNT (store_account)))
-               goto error;
-
-       if (!store_account) {
-               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
-                            "cannot get tny store account for %s\n", account_name);
-               goto error;
-       }
-
-       
-       /* Get the transport account, we can not do it in the thread
-          due to some problems with dbus */
-       transport_account = (TnyTransportAccount *)
-               modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(),
-                                                                                   account_name);
-       if (!transport_account) {
-               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
-                            "cannot get tny transport account for %s\n", account_name);
-               goto error;
-       }
+               modest_tny_account_store_get_server_account (account_store,
+                                                            account_name,
+                                                            TNY_ACCOUNT_TYPE_STORE);
+       priv->account = g_object_ref (store_account);
 
        /* Create the helper object */
-       info = g_slice_new (UpdateAccountInfo);
-       info->mail_op = self;
-       info->account = store_account;
-       info->transport_account = transport_account;
+       info = g_slice_new0 (UpdateAccountInfo);
+       info->pending_calls = 1;
+       info->folders = tny_simple_list_new ();
+       info->mail_op = g_object_ref (self);
+       info->poke_all = poke_all;
+       info->account_name = g_strdup (account_name);
        info->callback = callback;
        info->user_data = user_data;
+       info->update_timeout = g_timeout_add (250, timeout_notify_progress, self);
 
-       /* Get the message size limit */
-       info->max_size  = modest_conf_get_int (modest_runtime_get_conf (), 
-                                              MODEST_CONF_MSG_SIZE_LIMIT, NULL);
-       if (info->max_size == 0)
-               info->max_size = G_MAXINT;
-       else
-               info->max_size = info->max_size * KB;
-
-       /* Get per-account retrieval type */
-       mgr = modest_runtime_get_account_mgr ();
-       info->retrieve_type = modest_account_mgr_get_string (mgr, account_name, 
-                                                            MODEST_ACCOUNT_RETRIEVE, FALSE);
+       /* Set account busy */
+       modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr (), account_name, TRUE);
+       modest_mail_operation_notify_start (self);
 
-       /* Get per-account message amount retrieval limit */
-       info->retrieve_limit = modest_account_mgr_get_int (mgr, account_name, 
-                                                          MODEST_ACCOUNT_LIMIT_RETRIEVE, FALSE);
-       if (info->retrieve_limit == 0)
-               info->retrieve_limit = G_MAXINT;
-               
-       /* printf ("DEBUG: %s: info->retrieve_limit = %d\n", __FUNCTION__, info->retrieve_limit); */
+       /* 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, recurse_folders_async_cb, 
+                                           NULL, NULL, info);
+}
 
-       /* Set account busy */
-       modest_account_mgr_set_account_busy(mgr, account_name, TRUE);
-       priv->account_name = g_strdup(account_name);
-       
-       thread = g_thread_create (update_account_thread, info, FALSE, NULL);
+/*
+ * Used to notify the queue from the main
+ * loop. We call it inside an idle call to achieve that
+ */
+static gboolean
+idle_notify_queue (gpointer data)
+{
+       ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
 
-       return TRUE;
+       gdk_threads_enter ();
+       modest_mail_operation_notify_end (mail_op);
+       gdk_threads_leave ();
+       g_object_unref (mail_op);
 
- error:
-       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-       if (callback) 
-               callback (self, 0, user_data);
-       modest_mail_operation_notify_end (self);
        return FALSE;
 }
 
+static int
+compare_headers_by_date (gconstpointer a,
+                        gconstpointer b)
+{
+       TnyHeader **header1, **header2;
+       time_t sent1, sent2;
+
+       header1 = (TnyHeader **) a;
+       header2 = (TnyHeader **) b;
+
+       sent1 = tny_header_get_date_sent (*header1);
+       sent2 = tny_header_get_date_sent (*header2);
+
+       /* We want the most recent ones (greater time_t) at the
+          beginning */
+       if (sent1 < sent2)
+               return 1;
+       else
+               return -1;
+}
+
+
 /* ******************************************************************* */
 /* ************************** STORE  ACTIONS ************************* */
 /* ******************************************************************* */
@@ -1495,28 +1607,23 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
        ModestMailOperationPrivate *priv;
        TnyFolder *new_folder = NULL;
 
-       TnyList *list = tny_simple_list_new ();
-       TnyFolderStoreQuery *query = tny_folder_store_query_new ();
-
        g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
        g_return_val_if_fail (name, NULL);
        
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_INFO;
+       priv->account = (TNY_IS_ACCOUNT (parent)) ? 
+               g_object_ref (parent) : 
+               modest_tny_folder_get_account (TNY_FOLDER (parent));
 
        /* Check for already existing folder */
-       tny_folder_store_query_add_item (query, name, TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME);
-       tny_folder_store_get_folders (parent, list, query, NULL);
-       g_object_unref (G_OBJECT (query));
-
-       if (tny_list_get_length (list) > 0) {
+       if (modest_tny_folder_has_subfolder_with_name (parent, name, TRUE)) {
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
                             _CS("ckdg_ib_folder_already_exists"));
        }
 
-       g_object_unref (G_OBJECT (list));
-
        /* Check parent */
        if (TNY_IS_FOLDER (parent)) {
                /* Check folder rules */
@@ -1539,6 +1646,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
 
        if (!priv->error) {
                /* Create the folder */
+               modest_mail_operation_notify_start (self);
                new_folder = tny_folder_store_create_folder (parent, name, &(priv->error));
                CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED);
                if (!priv->error)
@@ -1579,6 +1687,7 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
        /* Get the account */
        account = modest_tny_folder_get_account (folder);
        priv->account = g_object_ref(account);
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_DELETE;
 
        /* Delete folder or move to trash */
        if (remove_to_trash) {
@@ -1587,6 +1696,7 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
                                                                      TNY_FOLDER_TYPE_TRASH);
                /* TODO: error_handling */
                if (trash_folder) {
+                       modest_mail_operation_notify_start (self);
                        modest_mail_operation_xfer_folder (self, folder,
                                                    TNY_FOLDER_STORE (trash_folder), 
                                                    TRUE, NULL, NULL);
@@ -1594,12 +1704,17 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
                }
        } else {
                TnyFolderStore *parent = tny_folder_get_folder_store (folder);
+               if (parent) {
+                       modest_mail_operation_notify_start (self);
+                       tny_folder_store_remove_folder (parent, folder, &(priv->error));
+                       CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED);
+                       
+                       if (!priv->error)
+                               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 
-               tny_folder_store_remove_folder (parent, folder, &(priv->error));
-               CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED);
-
-               if (parent)
-                       g_object_unref (G_OBJECT (parent));
+                       g_object_unref (parent);
+               } else
+                       g_warning ("%s: could not get parent folder", __FUNCTION__);
        }
        g_object_unref (G_OBJECT (account));
 
@@ -1631,23 +1746,26 @@ transfer_folder_status_cb (GObject *obj,
        priv->total = status->of_total;
 
        state = modest_mail_operation_clone_state (self);
-#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
-       gdk_threads_enter ();
-#endif
-       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
-#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
-       gdk_threads_leave ();
-#endif
+
+       /* This is not a GDK lock because we are a Tinymail callback
+        * which is already GDK locked by Tinymail */
+
+       /* no gdk_threads_enter (), CHECKED */
+
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); 
+
+       /* no gdk_threads_leave (), CHECKED */
+
        g_slice_free (ModestMailOperationState, state);
 }
 
 
 static void
 transfer_folder_cb (TnyFolder *folder, 
-                   TnyFolderStore *into, 
                    gboolean cancelled, 
+                   TnyFolderStore *into, 
                    TnyFolder *new_folder, 
-                   GError **err, 
+                   GError *err, 
                    gpointer user_data)
 {
        XFerMsgAsyncHelper *helper;
@@ -1660,8 +1778,8 @@ transfer_folder_cb (TnyFolder *folder,
        self = helper->mail_op;
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       if (*err) {
-               priv->error = g_error_copy (*err);
+       if (err) {
+               priv->error = g_error_copy (err);
                priv->done = 0;
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
        } else if (cancelled) {
@@ -1680,9 +1798,13 @@ transfer_folder_cb (TnyFolder *folder,
 
        /* 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 ();
+
+               /* This is not a GDK lock because we are a Tinymail callback
+                * which is already GDK locked by Tinymail */
+
+               /* no gdk_threads_enter (), CHECKED */
+               helper->user_callback (self, helper->user_data);
+               /* no gdk_threads_leave () , CHECKED */
        }
 
        /* Free */
@@ -1720,12 +1842,12 @@ new_name_valid_if_local_account (ModestMailOperationPrivate *priv,
 {
        if (TNY_IS_ACCOUNT (into) && 
            modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (into)) &&
-           modest_tny_local_folders_account_extra_folder_exists (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (into),
-                                                                 new_name)) {
+           modest_tny_local_folders_account_folder_name_in_use (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (into),
+                                                                new_name)) {
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
-                            _("FIXME: folder name already in use"));
+                            MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
+                            _CS("ckdg_ib_folder_already_exists"));
                return FALSE;
        } else
                return TRUE;
@@ -1736,19 +1858,27 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                                   TnyFolder *folder,
                                   TnyFolderStore *parent,
                                   gboolean delete_original,
-                                  XferMsgsAsynUserCallback user_callback,
+                                  XferAsyncUserCallback user_callback,
                                   gpointer user_data)
 {
        ModestMailOperationPrivate *priv = NULL;
        ModestTnyFolderRules parent_rules = 0, rules; 
        XFerMsgAsyncHelper *helper = NULL;
+       const gchar *folder_name = NULL;
+       const gchar *error_msg;
 
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_FOLDER (folder));
+       g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       folder_name = tny_folder_get_name (folder);
+
+       /* Set the error msg */
+       error_msg = _("mail_in_ui_folder_move_target_error");
 
        /* Get account and set it into mail_operation */
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
        priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
@@ -1757,54 +1887,66 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
        if (TNY_IS_FOLDER (parent))
                parent_rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
        
-       /* 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,
-                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
-                            _("mail_in_ui_folder_move_target_error"));
-
-               /* Notify the queue */
-               modest_mail_operation_notify_end (self);
+       /* Apply operation constraints */
+       if ((gpointer) parent == (gpointer) folder ||
+           (!TNY_IS_FOLDER_STORE (parent)) || 
+           (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE)) {
+               /* Folder rules */
+               goto error;
        } else if (TNY_IS_FOLDER (parent) && 
                   (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE)) {
-               /* 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_FOLDER_RULES,
-                            _("FIXME: parent folder does not accept new folders"));
-
-               /* Notify the queue */
-               modest_mail_operation_notify_end (self);
-       } else {
-
+               /* Folder rules */
+               goto error;
 
+       } else if (TNY_IS_FOLDER (parent) &&
+                  TNY_IS_FOLDER_STORE (folder) &&
+                  modest_tny_folder_is_ancestor (TNY_FOLDER (parent), 
+                                                 TNY_FOLDER_STORE (folder))) {
+               /* Do not move a parent into a child */
+               goto error;
+       } else if (TNY_IS_FOLDER_STORE (parent) &&
+                  modest_tny_folder_has_subfolder_with_name (parent, folder_name, TRUE)) {
+               /* Check that the new folder name is not used by any
+                  parent subfolder */
+               goto error;     
+       } else if (!(new_name_valid_if_local_account (priv, parent, folder_name))) {
                /* Check that the new folder name is not used by any
                   special local folder */
-               if (new_name_valid_if_local_account (priv, parent, 
-                                                    tny_folder_get_name (folder))) {
-                       /* 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,
-                                              tny_folder_get_name (folder),
-                                              delete_original,
-                                              transfer_folder_cb,
-                                              transfer_folder_status_cb,
-                                              helper);
-               } else {
-                       modest_mail_operation_notify_end (self);
-               }
+               goto error;
+       } else {
+               /* 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 */
+               modest_mail_operation_notify_start (self);
+               tny_folder_copy_async (folder,
+                                      parent,
+                                      tny_folder_get_name (folder),
+                                      delete_original,
+                                      transfer_folder_cb,
+                                      transfer_folder_status_cb,
+                                      helper);
+               return;
        }
+
+ error:
+       /* 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_FOLDER_RULES,
+                    error_msg);
+
+       /* Call the user callback if exists */
+       if (user_callback)
+               user_callback (self, user_data);
+
+       /* Notify the queue */
+       modest_mail_operation_notify_end (self);
 }
 
 void
@@ -1824,6 +1966,7 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
 
        /* Get account and set it into mail_operation */
        priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_INFO;
 
        /* Check folder rules */
        rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
@@ -1860,6 +2003,7 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
                        helper->user_data = NULL;
                
                        /* Rename. Camel handles folder subscription/unsubscription */
+                       modest_mail_operation_notify_start (self);
                        tny_folder_copy_async (folder, into, name, TRUE,
                                               transfer_folder_cb,
                                               transfer_folder_status_cb,
@@ -1875,12 +2019,13 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
 /* **************************  MSG  ACTIONS  ************************* */
 /* ******************************************************************* */
 
-void modest_mail_operation_get_msg (ModestMailOperation *self,
-                                   TnyHeader *header,
-                                   GetMsgAsyncUserCallback user_callback,
-                                   gpointer user_data)
+void 
+modest_mail_operation_get_msg (ModestMailOperation *self,
+                              TnyHeader *header,
+                              GetMsgAsyncUserCallback user_callback,
+                              gpointer user_data)
 {
-       GetMsgAsyncHelper *helper = NULL;
+       GetMsgInfo *helper = NULL;
        TnyFolder *folder;
        ModestMailOperationPrivate *priv;
        
@@ -1891,179 +2036,33 @@ void modest_mail_operation_get_msg (ModestMailOperation *self,
        folder = tny_header_get_folder (header);
 
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+       priv->total = 1;
+       priv->done = 0;
 
-       /* Get message from folder */
-       if (folder) {
-               /* Get account and set it into mail_operation */
-               priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
-
-               helper = g_slice_new0 (GetMsgAsyncHelper);
-               helper->mail_op = self;
-               helper->user_callback = user_callback;
-               helper->user_data = user_data;
-               helper->header = g_object_ref (header);
-
-               // The callback's reference so that the mail op is not
-               // finalized until the async operation is completed even if
-               // the user canceled the request meanwhile.
-               g_object_ref (G_OBJECT (helper->mail_op));
-
-               tny_folder_get_msg_async (folder, header, get_msg_cb, get_msg_status_cb, helper);
-
-               g_object_unref (G_OBJECT (folder));
-       } else {
-               /* 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_ITEM_NOT_FOUND,
-                            _("Error trying to get a message. No folder found for header"));
-
-               /* Notify the queue */
-               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;
+       /* Get account and set it into mail_operation */
+       priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
        
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_MIME_PART (part));
+       /* Check for cached messages */
+       if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)
+               priv->op_type = MODEST_MAIL_OPERATION_TYPE_OPEN;
+       else 
+               priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
        
-       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
-get_msg_cb (TnyFolder *folder, 
-           gboolean cancelled, 
-           TnyMsg *msg, 
-           GError **error, 
-           gpointer user_data)
-{
-       GetMsgAsyncHelper *helper = NULL;
-       ModestMailOperation *self = NULL;
-       ModestMailOperationPrivate *priv = NULL;
-
-       helper = (GetMsgAsyncHelper *) user_data;
-       g_return_if_fail (helper != NULL);       
-       self = helper->mail_op;
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION(self));
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-
-       /* Check errors and cancel */
-       if (*error) {
-               priv->error = g_error_copy (*error);
-               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-       } 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));
-       } else {
-               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-       }
+       /* Create the helper */
+       helper = g_slice_new0 (GetMsgInfo);
+       helper->header = g_object_ref (header);
+       helper->mail_op = g_object_ref (self);
+       helper->user_callback = user_callback;
+       helper->user_data = user_data;
+       helper->destroy_notify = NULL;
+       helper->last_total_bytes = 0;
+       helper->sum_total_bytes = 0;
+       helper->total_bytes = tny_header_get_message_size (header);
 
-       /* 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 ();   
-       }
+       modest_mail_operation_notify_start (self);
+       tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, helper);
 
-       /* Notify about operation end */
-       modest_mail_operation_notify_end (self);
-       /* Free */
-       g_object_unref (helper->mail_op);
-       g_object_unref (helper->header);
-       g_slice_free (GetMsgAsyncHelper, helper);
-               
+       g_object_unref (G_OBJECT (folder));
 }
 
 static void     
@@ -2071,174 +2070,69 @@ get_msg_status_cb (GObject *obj,
                   TnyStatus *status,  
                   gpointer user_data)
 {
-       GetMsgAsyncHelper *helper = NULL;
-       ModestMailOperation *self;
-       ModestMailOperationPrivate *priv;
-       ModestMailOperationState *state;
-
-       g_return_if_fail (status != NULL);
-       g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_GET_MSG);
-
-       helper = (GetMsgAsyncHelper *) user_data;
-       g_return_if_fail (helper != NULL);       
-
-       self = helper->mail_op;
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-
-       priv->done = 1;
-       priv->total = 1;
-
-       state = modest_mail_operation_clone_state (self);
-       state->bytes_done = status->position;
-       state->bytes_total = status->of_total;
-#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
-       gdk_threads_enter ();
-#endif
-       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
-#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
-       gdk_threads_leave ();
-#endif
-       g_slice_free (ModestMailOperationState, state);
-}
-
-/****************************************************/
-typedef struct {
-       ModestMailOperation *mail_op;
-       TnyList *headers;
-       GetMsgAsyncUserCallback user_callback;
-       gpointer user_data;
-       GDestroyNotify notify;
-} GetFullMsgsInfo;
-
-typedef struct {
-       GetMsgAsyncUserCallback user_callback;
-       TnyHeader *header;
-       TnyMsg *msg;
-       gpointer user_data;
-       ModestMailOperation *mail_op;
-} NotifyGetMsgsInfo;
-
-
-/* 
- * Used by get_msgs_full_thread to call the user_callback for each
- * message that has been read
- */
-static gboolean
-notify_get_msgs_full (gpointer data)
-{
-       NotifyGetMsgsInfo *info;
-
-       info = (NotifyGetMsgsInfo *) data;      
-
-       /* Call the user callback. Idles are not in the main lock, so
-          lock it */
-       gdk_threads_enter ();
-       info->user_callback (info->mail_op, info->header, info->msg, info->user_data);
-       gdk_threads_leave ();
-
-       g_slice_free (NotifyGetMsgsInfo, info);
-
-       return FALSE;
-}
-
-/* 
- * Used by get_msgs_full_thread to free al the thread resources and to
- * call the destroy function for the passed user_data
- */
-static gboolean
-get_msgs_full_destroyer (gpointer data)
-{
-       GetFullMsgsInfo *info;
-
-       info = (GetFullMsgsInfo *) data;
+       GetMsgInfo *helper = NULL;
 
-       if (info->notify) {
-               gdk_threads_enter ();   
-               info->notify (info->user_data);
-               gdk_threads_leave ();
-       }
+       g_return_if_fail (status != NULL);
+       g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_GET_MSG);
 
-       /* free */
-       g_object_unref (info->headers);
-       g_slice_free (GetFullMsgsInfo, info);
+       helper = (GetMsgInfo *) user_data;
+       g_return_if_fail (helper != NULL);       
 
-       return FALSE;
+       /* Notify progress */
+       notify_progress_of_multiple_messages (helper->mail_op, status, &(helper->last_total_bytes), 
+                                             &(helper->sum_total_bytes), helper->total_bytes, FALSE);
 }
 
-static gpointer
-get_msgs_full_thread (gpointer thr_user_data)
+static void
+get_msg_async_cb (TnyFolder *folder, 
+                 gboolean canceled, 
+                 TnyMsg *msg, 
+                 GError *err, 
+                 gpointer user_data)
 {
-       GetFullMsgsInfo *info;
+       GetMsgInfo *info = NULL;
        ModestMailOperationPrivate *priv = NULL;
-       TnyIterator *iter = NULL;
-       
-       info = (GetFullMsgsInfo *) thr_user_data;       
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
-
-       iter = tny_list_create_iterator (info->headers);
-       while (!tny_iterator_is_done (iter)) { 
-               TnyHeader *header;
-               TnyFolder *folder;
-               
-               header = TNY_HEADER (tny_iterator_get_current (iter));
-               folder = tny_header_get_folder (header);
-                               
-               /* Get message from folder */
-               if (folder) {
-                       TnyMsg *msg;
-                       /* The callback will call it per each header */
-                       msg = tny_folder_get_msg (folder, header, &(priv->error));
+       gboolean finished;
 
-                       if (msg) {
-                               ModestMailOperationState *state;
-                               ModestPair *pair;
+       info = (GetMsgInfo *) user_data;
 
-                               priv->done++;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
+       priv->done++;
+       finished = (priv->done == priv->total) ? TRUE : FALSE;
 
-                               /* notify progress */
-                               state = modest_mail_operation_clone_state (info->mail_op);
-                               pair = modest_pair_new (g_object_ref (info->mail_op), state, FALSE);
-                               g_idle_add_full (G_PRIORITY_HIGH_IDLE, idle_notify_progress_once,
-                                                pair, (GDestroyNotify) modest_pair_free);
-
-                               /* The callback is the responsible for
-                                  freeing the message */
-                               if (info->user_callback) {
-                                       NotifyGetMsgsInfo *info_notify;
-                                       info_notify = g_slice_new0 (NotifyGetMsgsInfo);
-                                       info_notify->user_callback = info->user_callback;
-                                       info_notify->mail_op = info->mail_op;
-                                       info_notify->header = g_object_ref (header);
-                                       info_notify->msg = g_object_ref (msg);
-                                       info_notify->user_data = info->user_data;
-                                       g_idle_add_full (G_PRIORITY_HIGH_IDLE,
-                                                        notify_get_msgs_full, 
-                                                        info_notify, NULL);
-                               }
-                               g_object_unref (msg);
-                       } 
-               } else {
-                       /* Set status failed and set an error */
-                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+       /* Check errors */
+       if (canceled || err) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS;
+               if (!priv->error)
                        g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                                     MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
-                                    "Error trying to get a message. No folder found for header");
-               }
-               g_object_unref (header);                
-               tny_iterator_next (iter);
+                                    err->message);
+       } else {
+               /* 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;
        }
 
-       /* Set operation status */
-       if (priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
-               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 
-       /* Notify about operation end */
-       g_idle_add (idle_notify_queue, g_object_ref (info->mail_op));
+       /* Call the user callback */
+       if (info->user_callback)
+               info->user_callback (info->mail_op, info->header, canceled, 
+                                    msg, err, info->user_data);
 
-       /* 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);
+       /* Notify about operation end if this is the last callback */
+       if (finished) {
+               /* Free user data */
+               if (info->destroy_notify)
+                       info->destroy_notify (info->user_data);
 
-       return NULL;
+               /* 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);
 }
 
 void 
@@ -2248,11 +2142,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
                                     gpointer user_data,
                                     GDestroyNotify notify)
 {
-       TnyHeader *header = NULL;
-       TnyFolder *folder = NULL;
-       GThread *thread;
        ModestMailOperationPrivate *priv = NULL;
-       GetFullMsgsInfo *info = NULL;
        gboolean size_ok = TRUE;
        gint max_size;
        TnyIterator *iter = NULL;
@@ -2262,17 +2152,22 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
        /* Init mail operation */
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
        priv->done = 0;
        priv->total = tny_list_get_length(header_list);
 
        /* Get account and set it into mail_operation */
        if (tny_list_get_length (header_list) >= 1) {
                iter = tny_list_create_iterator (header_list);
-               header = TNY_HEADER (tny_iterator_get_current (iter));
-               folder = tny_header_get_folder (header);                
-               priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
-               g_object_unref (header);
-               g_object_unref (folder);
+               TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+               if (header) {
+                       TnyFolder *folder = tny_header_get_folder (header);
+                       if (folder) {           
+                               priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
+                               g_object_unref (folder);
+                       }
+                       g_object_unref (header);
+               }
 
                if (tny_list_get_length (header_list) == 1) {
                        g_object_unref (iter);
@@ -2295,25 +2190,48 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
           always retrieve it */
        if (iter != NULL) {
                while (!tny_iterator_is_done (iter) && size_ok) {
-                       header = TNY_HEADER (tny_iterator_get_current (iter));
-                       if (tny_header_get_message_size (header) >= max_size)
-                               size_ok = FALSE;
-                       g_object_unref (header);
+                       TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+                       if (header) {
+                               if (tny_header_get_message_size (header) >= max_size)
+                                       size_ok = FALSE;
+                               g_object_unref (header);
+                       }
+
                        tny_iterator_next (iter);
                }
                g_object_unref (iter);
        }
 
        if (size_ok) {
-               /* Create the info */
-               info = g_slice_new0 (GetFullMsgsInfo);
-               info->mail_op = self;
-               info->user_callback = user_callback;
-               info->user_data = user_data;
-               info->headers = g_object_ref (header_list);
-               info->notify = notify;
-
-               thread = g_thread_create (get_msgs_full_thread, info, FALSE, NULL);
+               const gint 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)) { 
+                       GetMsgInfo *msg_info = NULL;
+                       TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+                       TnyFolder *folder = tny_header_get_folder (header);
+                       
+                       /* Create the message info */
+                       msg_info = g_slice_new0 (GetMsgInfo);
+                       msg_info->mail_op = g_object_ref (self);
+                       msg_info->header = g_object_ref (header);
+                       msg_info->user_callback = user_callback;
+                       msg_info->user_data = user_data;
+                       msg_info->destroy_notify = notify;
+                       msg_info->last_total_bytes = 0;
+                       msg_info->sum_total_bytes = 0;
+                       msg_info->total_bytes = msg_list_size;
+                       
+                       /* The callback will call it per each header */
+                       tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, msg_info);
+                       
+                       /* Free and go on */
+                       g_object_unref (header);
+                       g_object_unref (folder);
+                       tny_iterator_next (iter);
+               }
+               g_object_unref (iter);
        } else {
                /* Set status failed and set an error */
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
@@ -2330,7 +2248,8 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 
 
 void 
-modest_mail_operation_remove_msg (ModestMailOperation *self,  TnyHeader *header,
+modest_mail_operation_remove_msg (ModestMailOperation *self,  
+                                 TnyHeader *header,
                                  gboolean remove_to_trash /*ignored*/)
 {
        TnyFolder *folder;
@@ -2347,22 +2266,112 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,  TnyHeader *header,
 
        /* Get account and set it into mail_operation */
        priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
-
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_DELETE;
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
-
+       /* remove message from folder */
        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);
+               tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED);
+               tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
+
+               modest_mail_operation_notify_start (self);
+
+               if (TNY_IS_CAMEL_IMAP_FOLDER (folder) ||
+                   TNY_IS_CAMEL_POP_FOLDER (folder))
+                       tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /* FALSE --> dont expunge */
+               else
+                       tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /* TRUE --> expunge */
+       }
+       
+       
+       /* Set status */
+       if (!priv->error)
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       else
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+
+       /* Free */
+       g_object_unref (G_OBJECT (folder));
+
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (self);
+}
+
+void 
+modest_mail_operation_remove_msgs (ModestMailOperation *self,  
+                                  TnyList *headers,
+                                 gboolean remove_to_trash /*ignored*/)
+{
+       TnyFolder *folder;
+       ModestMailOperationPrivate *priv;
+       TnyIterator *iter = NULL;
+       TnyHeader *header = NULL;
+       TnyList *remove_headers = NULL;
+       TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN;
+
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_LIST (headers));
+
+       if (remove_to_trash)
+               g_warning ("remove to trash is not implemented");
+
+       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);
+       header = TNY_HEADER (tny_iterator_get_current (iter));
+       folder = tny_header_get_folder (header);
+
+       /* Don't remove messages that are being sent */
+       if (modest_tny_folder_is_local_folder (folder)) {
+               folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
+       }
+       if (folder_type == TNY_FOLDER_TYPE_OUTBOX) {
+               TnyTransportAccount *traccount = NULL;
+               ModestTnyAccountStore *accstore = modest_runtime_get_account_store();
+               traccount = modest_tny_account_store_get_transport_account_from_outbox_header(accstore, header);
+               if (traccount) {
+                       ModestTnySendQueueStatus status;
+                       ModestTnySendQueue *send_queue = modest_runtime_get_send_queue(traccount);
+                       TnyIterator *iter = tny_list_create_iterator(headers);
+                       g_object_unref(remove_headers);
+                       remove_headers = TNY_LIST(tny_simple_list_new());
+                       while (!tny_iterator_is_done(iter)) {
+                               char *msg_id;
+                               TnyHeader *hdr = TNY_HEADER(tny_iterator_get_current(iter));
+                               msg_id = modest_tny_send_queue_get_msg_id (hdr);
+                               status = modest_tny_send_queue_get_msg_status(send_queue, msg_id);
+                               if (status != MODEST_TNY_SEND_QUEUE_SENDING) {
+                                       tny_list_append(remove_headers, G_OBJECT(hdr));
+                               }
+                               g_object_unref(hdr);
+                               g_free(msg_id);
+                               tny_iterator_next(iter);
+                       }
+                       g_object_unref(iter);
+                       g_object_unref(traccount);
+               }
+       }
+
+       /* Get account and set it into mail_operation */
+       priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_DELETE;
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+
+       /* remove message from folder */
+       modest_mail_operation_notify_start (self);
 
-               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 */
+       tny_folder_remove_msgs (folder, remove_headers, &(priv->error));
+       if (!priv->error) {
+               if (TNY_IS_CAMEL_IMAP_FOLDER (folder) || 
+                   TNY_IS_CAMEL_POP_FOLDER (folder))
+                       tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /* FALSE --> don't expunge */ 
                else
-                       /* lcoal folders */
-                       tny_folder_sync(folder, TRUE, &(priv->error)); /* TRUE --> expunge */
+                       /* local folders */
+                       tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /* TRUE --> expunge */
        }
        
        
@@ -2373,6 +2382,9 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,  TnyHeader *header,
                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));
 
        /* Notify about operation end */
@@ -2380,15 +2392,58 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,  TnyHeader *header,
 }
 
 static void
-transfer_msgs_status_cb (GObject *obj,
-                        TnyStatus *status,  
-                        gpointer user_data)
+notify_progress_of_multiple_messages (ModestMailOperation *self,
+                                     TnyStatus *status,
+                                     gint *last_total_bytes,
+                                     gint *sum_total_bytes,
+                                     gint total_bytes, 
+                                     gboolean increment_done)
 {
-       XFerMsgAsyncHelper *helper = NULL;
-       ModestMailOperation *self;
        ModestMailOperationPrivate *priv;
        ModestMailOperationState *state;
+       gboolean is_num_bytes;
+
+       priv =  MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       /* We know that tinymail sends us information about
+          transferred bytes with this particular message */
+       is_num_bytes = (g_ascii_strcasecmp (status->message, "Retrieving message") == 0);
+
+       state = modest_mail_operation_clone_state (self);
+       if (is_num_bytes && !((status->position == 1) && (status->of_total == 100))) {
+               /* We know that we're in a different message when the
+                  total number of bytes to transfer is different. Of
+                  course it could fail if we're transferring messages
+                  of the same size, but this is a workarround */
+               if (status->of_total != *last_total_bytes) {
+                       /* We need to increment the done when there is
+                          no information about each individual
+                          message, we need to do this in message
+                          transfers, and we don't do it for getting
+                          messages */
+                       if (increment_done)
+                               priv->done++;
+                       *sum_total_bytes += *last_total_bytes;
+                       *last_total_bytes = status->of_total;
+               }
+               state->bytes_done += status->position + *sum_total_bytes;
+               state->bytes_total = total_bytes;
+
+               /* Notify the status change. Only notify about changes
+                  referred to bytes */
+               g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 
+                              0, state, NULL);
+       }
 
+       g_slice_free (ModestMailOperationState, state);
+}
+
+static void
+transfer_msgs_status_cb (GObject *obj,
+                        TnyStatus *status,  
+                        gpointer user_data)
+{
+       XFerMsgAsyncHelper *helper;
 
        g_return_if_fail (status != NULL);
        g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_XFER_MSGS);
@@ -2396,38 +2451,28 @@ transfer_msgs_status_cb (GObject *obj,
        helper = (XFerMsgAsyncHelper *) user_data;
        g_return_if_fail (helper != NULL);       
 
-       self = helper->mail_op;
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-
-       priv->done = status->position;
-       priv->total = status->of_total;
-
-       state = modest_mail_operation_clone_state (self);
-#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
-       gdk_threads_enter ();
-#endif
-       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
-#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
-       gdk_threads_leave ();
-#endif
-       g_slice_free (ModestMailOperationState, state);
+       /* Notify progress */
+       notify_progress_of_multiple_messages (helper->mail_op, status, &(helper->last_total_bytes), 
+                                             &(helper->sum_total_bytes), helper->total_bytes, TRUE);
 }
 
 
 static void
-transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer user_data)
+transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer user_data)
 {
        XFerMsgAsyncHelper *helper;
        ModestMailOperation *self;
        ModestMailOperationPrivate *priv;
+       TnyIterator *iter = NULL;
+       TnyHeader *header = NULL;
 
        helper = (XFerMsgAsyncHelper *) user_data;
        self = helper->mail_op;
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
-       if (*err) {
-               priv->error = g_error_copy (*err);
+       if (err) {
+               priv->error = g_error_copy (err);
                priv->done = 0;
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;     
        } else if (cancelled) {
@@ -2439,53 +2484,113 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer
        } else {
                priv->done = 1;
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+
+               /* Update folder counts */
+               tny_folder_poke_status (folder);                
+               tny_folder_poke_status (helper->dest_folder);           
+       }
+
+       
+       /* 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);
+
+                       tny_iterator_next (iter);
+               }
+
        }
+               
 
        /* 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 ();
+               /* 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 */
        }
 
        /* Free */
-       g_object_unref (helper->headers);
-       g_object_unref (helper->dest_folder);
-       g_object_unref (helper->mail_op);
-       g_slice_free   (XFerMsgAsyncHelper, helper);
-       g_object_unref (folder);
+       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 (XFerMsgAsyncHelper, helper);
+}
+
+static guint
+compute_message_list_size (TnyList *headers)
+{
+       TnyIterator *iter;
+       guint size = 0;
+
+       iter = tny_list_create_iterator (headers);
+       while (!tny_iterator_is_done (iter)) {
+               TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+               size += tny_header_get_message_size (header);
+               g_object_unref (header);
+               tny_iterator_next (iter);
+       }
+       g_object_unref (iter);
+
+       return size;
+}
 
+static guint
+compute_message_array_size (GPtrArray *headers)
+{
+       guint size = 0;
+       gint i;
+
+       for (i = 0; i < headers->len; i++) {
+               TnyHeader *header = TNY_HEADER (g_ptr_array_index (headers, i));
+               size += tny_header_get_message_size (header);
+       }
+
+       return size;
 }
 
+
 void
 modest_mail_operation_xfer_msgs (ModestMailOperation *self,
                                 TnyList *headers, 
                                 TnyFolder *folder, 
                                 gboolean delete_original,
-                                XferMsgsAsynUserCallback user_callback,
+                                XferAsyncUserCallback user_callback,
                                 gpointer user_data)
 {
-       ModestMailOperationPrivate *priv;
-       TnyIterator *iter;
-       TnyFolder *src_folder;
-       XFerMsgAsyncHelper *helper;
-       TnyHeader *header;
-       ModestTnyFolderRules rules;
-       const gchar *id1 = NULL;
-       const gchar *id2 = NULL;
-       gboolean same_folder = FALSE;
+       ModestMailOperationPrivate *priv = NULL;
+       TnyIterator *iter = NULL;
+       TnyFolder *src_folder = NULL;
+       XFerMsgAsyncHelper *helper = NULL;
+       TnyHeader *header = NULL;
+       ModestTnyFolderRules rules = 0;
 
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_LIST (headers));
-       g_return_if_fail (TNY_IS_FOLDER (folder));
+       g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (headers && TNY_IS_LIST (headers));
+       g_return_if_fail (folder && TNY_IS_FOLDER (folder));
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-       priv->total = 1;
+       priv->total = tny_list_get_length (headers);
        priv->done = 0;
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
 
        /* Apply folder rules */
        rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
@@ -2503,20 +2608,28 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
        /* 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);
+       if (header) {
+               src_folder = tny_header_get_folder (header);
+               g_object_unref (header);
+       }
        g_object_unref (iter);
 
+       if (src_folder == NULL) {
+               /* Notify the queue */
+               modest_mail_operation_notify_end (self);
+
+               g_warning ("%s: cannot find folder from header", __FUNCTION__);
+               return;
+       }
+
+       
        /* 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) {
+       if (src_folder == 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"));
+                            _("mail_in_ui_folder_copy_target_error"));
                
                /* Notify the queue */
                modest_mail_operation_notify_end (self);
@@ -2533,11 +2646,16 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
        helper->headers = g_object_ref(headers);
        helper->user_callback = user_callback;
        helper->user_data = user_data;
+       helper->delete = delete_original;
+       helper->last_total_bytes = 0;
+       helper->sum_total_bytes = 0;
+       helper->total_bytes = compute_message_list_size (headers);
 
        /* Get account and set it into mail_operation */
        priv->account = modest_tny_folder_get_account (src_folder);
 
        /* Transfer messages */
+       modest_mail_operation_notify_start (self);
        tny_folder_transfer_msgs_async (src_folder, 
                                        headers, 
                                        folder, 
@@ -2551,7 +2669,7 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 static void
 on_refresh_folder (TnyFolder   *folder, 
                   gboolean     cancelled, 
-                  GError     **error,
+                  GError     *error,
                   gpointer     user_data)
 {
        RefreshAsyncHelper *helper = NULL;
@@ -2562,8 +2680,10 @@ on_refresh_folder (TnyFolder   *folder,
        self = helper->mail_op;
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       if (*error) {
-               priv->error = g_error_copy (*error);
+       g_return_if_fail(priv!=NULL);
+
+       if (error) {
+               priv->error = g_error_copy (error);
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                goto out;
        }
@@ -2579,19 +2699,21 @@ 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 ();
+
+               /* This is not a GDK lock because we are a Tinymail callback and
+                * Tinymail already acquires the Gdk lock */
                helper->user_callback (self, folder, helper->user_data);
-               gdk_threads_leave ();
        }
 
        /* Free */
-/*     g_object_unref (helper->mail_op); */
-       g_slice_free   (RefreshAsyncHelper, helper);
+       g_slice_free (RefreshAsyncHelper, helper);
 
        /* Notify about operation end */
        modest_mail_operation_notify_end (self);
+       g_object_unref(self);
 }
 
 static void
@@ -2618,13 +2740,11 @@ on_refresh_folder_status_update (GObject *obj,
        priv->total = status->of_total;
 
        state = modest_mail_operation_clone_state (self);
-#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
-       gdk_threads_enter ();
-#endif
+
+       /* This is not a GDK lock because we are a Tinymail callback and
+        * Tinymail already acquires the Gdk lock */
        g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
-#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
-       gdk_threads_leave ();
-#endif
+
        g_slice_free (ModestMailOperationState, state);
 }
 
@@ -2643,22 +2763,43 @@ modest_mail_operation_refresh_folder  (ModestMailOperation *self,
 
        /* Get account and set it into mail_operation */
        priv->account = modest_tny_folder_get_account  (folder);
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
 
        /* Create the helper */
        helper = g_slice_new0 (RefreshAsyncHelper);
-       helper->mail_op = g_object_ref (self);
+       helper->mail_op = g_object_ref(self);
        helper->user_callback = user_callback;
        helper->user_data = user_data;
 
        /* Refresh the folder. TODO: tinymail could issue a status
           updates before the callback call then this could happen. We
           must review the design */
+       modest_mail_operation_notify_start (self);
        tny_folder_refresh_async (folder,
                                  on_refresh_folder,
                                  on_refresh_folder_status_update,
                                  helper);
 }
 
+
+static void
+modest_mail_operation_notify_start (ModestMailOperation *self)
+{
+       ModestMailOperationPrivate *priv = NULL;
+
+       g_return_if_fail (self);
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       /* Ensure that all the fields are filled correctly */
+       g_return_if_fail (priv->op_type != MODEST_MAIL_OPERATION_TYPE_UNKNOWN);
+
+       /* Notify the observers about the mail operation. We do not
+          wrapp this emission because we assume that this function is
+          always called from within the main lock */
+       g_signal_emit (G_OBJECT (self), signals[OPERATION_STARTED_SIGNAL], 0, NULL);
+}
+
 /**
  *
  * It's used by the mail operation queue to notify the observers
@@ -2670,25 +2811,48 @@ modest_mail_operation_refresh_folder  (ModestMailOperation *self,
 static void
 modest_mail_operation_notify_end (ModestMailOperation *self)
 {
-       ModestMailOperationState *state;
        ModestMailOperationPrivate *priv = NULL;
 
        g_return_if_fail (self);
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       /* Set the account back to not busy */
-       if (priv->account_name) {
-               modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr(), 
-                                                    priv->account_name, FALSE);
-               g_free(priv->account_name);
-               priv->account_name = NULL;
-       }
-       
-       /* Notify the observers about the mail operation end */
-       /* We do not wrapp this emission because we assume that this
+       /* Notify the observers about the mail operation end. We do
+          not wrapp this emission because we assume that this
           function is always called from within the main lock */
-       state = modest_mail_operation_clone_state (self);
-       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
-       g_slice_free (ModestMailOperationState, state);
+       g_signal_emit (G_OBJECT (self), signals[OPERATION_FINISHED_SIGNAL], 0, NULL);
+
+       /* Remove the error user data */
+       if (priv->error_checking_user_data && priv->error_checking_user_data_destroyer)
+               priv->error_checking_user_data_destroyer (priv->error_checking_user_data);
+}
+
+TnyAccount *
+modest_mail_operation_get_account (ModestMailOperation *self)
+{
+       ModestMailOperationPrivate *priv = NULL;
+
+       g_return_val_if_fail (self, NULL);
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       return (priv->account) ? g_object_ref (priv->account) : NULL;
+}
+
+void
+modest_mail_operation_noop (ModestMailOperation *self)
+{
+       ModestMailOperationPrivate *priv = NULL;
+
+       g_return_if_fail (self);
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_INFO;
+       priv->done = 0;
+       priv->total = 0;
+
+       /* This mail operation does nothing actually */
+       modest_mail_operation_notify_start (self);
+       modest_mail_operation_notify_end (self);
 }