* src/modest-mail-operation.c:
[modest] / src / modest-mail-operation.c
index feffc54..55d5c86 100644 (file)
@@ -57,6 +57,9 @@
 #include "modest-marshal.h"
 #include "modest-error.h"
 #include "modest-mail-operation.h"
+#include <modest-count-stream.h>
+#include <libgnomevfs/gnome-vfs.h>
+#include "modest-utils.h"
 
 #define KB 1024
 
@@ -71,11 +74,11 @@ 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 *rr, 
-                           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,  
@@ -84,6 +87,20 @@ static void     get_msg_status_cb (GObject *obj,
 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,
@@ -114,12 +131,18 @@ struct _ModestMailOperationPrivate {
                                                    priv->status = new_status;\
                                                }
 
-typedef struct _GetMsgAsyncHelper {    
-       ModestMailOperation *mail_op;
+
+typedef struct {
+       GetMsgAsyncUserCallback user_callback;
        TnyHeader *header;
-       GetMsgAsyncUserCallback user_callback;  
+       TnyIterator *more_msgs;
        gpointer user_data;
-} GetMsgAsyncHelper;
+       ModestMailOperation *mail_op;
+       GDestroyNotify destroy_notify;
+       gint last_total_bytes;
+       gint sum_total_bytes;
+       gint total_bytes;
+} GetMsgInfo;
 
 typedef struct _RefreshAsyncHelper {   
        ModestMailOperation *mail_op;
@@ -127,18 +150,26 @@ typedef struct _RefreshAsyncHelper {
        gpointer user_data;
 } RefreshAsyncHelper;
 
-typedef struct _XFerMsgAsyncHelper
+typedef struct _XFerMsgsAsyncHelper
 {
        ModestMailOperation *mail_op;
        TnyList *headers;
+       TnyIterator *more_msgs;
        TnyFolder *dest_folder;
-       XferAsyncUserCallback user_callback;    
+       XferMsgsAsyncUserCallback user_callback;        
        gboolean delete;
        gpointer user_data;
        gint last_total_bytes;
        gint sum_total_bytes;
        gint total_bytes;
-} XFerMsgAsyncHelper;
+} XFerMsgsAsyncHelper;
+
+typedef struct _XFerFolderAsyncHelper
+{
+       ModestMailOperation *mail_op;
+       XferFolderAsyncUserCallback user_callback;      
+       gpointer user_data;
+} XFerFolderAsyncHelper;
 
 typedef void (*ModestMailOperationCreateMsgCallback) (ModestMailOperation *mail_op,
                                                      TnyMsg *msg,
@@ -355,6 +386,8 @@ void
 modest_mail_operation_execute_error_handler (ModestMailOperation *self)
 {
        ModestMailOperationPrivate *priv;
+
+       g_return_if_fail (self && MODEST_IS_MAIL_OPERATION(self));
        
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
        g_return_if_fail(priv->status != MODEST_MAIL_OPERATION_STATUS_SUCCESS);     
@@ -370,6 +403,9 @@ modest_mail_operation_get_type_operation (ModestMailOperation *self)
 {
        ModestMailOperationPrivate *priv;
 
+       g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION(self),
+                             MODEST_MAIL_OPERATION_TYPE_UNKNOWN);
+       
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
        
        return priv->op_type;
@@ -381,6 +417,9 @@ modest_mail_operation_is_mine (ModestMailOperation *self,
 {
        ModestMailOperationPrivate *priv;
 
+       g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION(self),
+                             FALSE);
+       
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
        if (priv->source == NULL) return FALSE;
 
@@ -392,7 +431,8 @@ modest_mail_operation_get_source (ModestMailOperation *self)
 {
        ModestMailOperationPrivate *priv;
 
-       g_return_val_if_fail (self, NULL);
+       g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION(self),
+                             NULL);
        
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
        if (!priv) {
@@ -444,25 +484,26 @@ modest_mail_operation_cancel (ModestMailOperation *self)
 {
        ModestMailOperationPrivate *priv;
        gboolean canceled = FALSE;
-
-       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE);
+       
+       g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION (self), FALSE);
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
-       /* Note that if we call cancel with an already canceled mail
-          operation the progress changed signal won't be emitted */
-       if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
-               return FALSE;
-
        /* Set new status */
        priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
        
-       /* Cancel the mail operation. We need to wrap it between this
-          start/stop operations to allow following calls to the
-          account */
+       /* Cancel the mail operation */
        g_return_val_if_fail (priv->account, FALSE);
        tny_account_cancel (priv->account);
 
+       if (priv->op_type == MODEST_MAIL_OPERATION_TYPE_SEND) {
+               ModestTnySendQueue *queue;
+               queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (priv->account));
+
+               /* Cancel the sending of the following next messages */
+               tny_send_queue_cancel (TNY_SEND_QUEUE (queue), TNY_SEND_QUEUE_CANCEL_ACTION_SUSPEND, NULL);
+       }
+       
        return canceled;
 }
 
@@ -471,8 +512,9 @@ modest_mail_operation_get_task_done (ModestMailOperation *self)
 {
        ModestMailOperationPrivate *priv;
 
-       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0);
-
+       g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION(self),
+                             0);
+       
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
        return priv->done;
 }
@@ -482,7 +524,8 @@ modest_mail_operation_get_task_total (ModestMailOperation *self)
 {
        ModestMailOperationPrivate *priv;
 
-       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0);
+       g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION(self),
+                             0);
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
        return priv->total;
@@ -494,11 +537,9 @@ modest_mail_operation_is_finished (ModestMailOperation *self)
        ModestMailOperationPrivate *priv;
        gboolean retval = FALSE;
 
-       if (!MODEST_IS_MAIL_OPERATION (self)) {
-               g_warning ("%s: invalid parametter", G_GNUC_FUNCTION);
-               return retval;
-       }
-
+       g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION(self),
+                             FALSE);
+       
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
        if (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS   ||
@@ -560,14 +601,15 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
        TnySendQueue *send_queue = NULL;
        ModestMailOperationPrivate *priv;
        
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
-       g_return_if_fail (TNY_IS_MSG (msg));
+       g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (transport_account && TNY_IS_TRANSPORT_ACCOUNT (transport_account));
+       g_return_if_fail (msg && TNY_IS_MSG (msg));
        
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(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;
 
@@ -577,27 +619,21 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
                             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 {
                /* 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));
 
-               /* TODO: we're setting always success, do the check in
-                  the handler */
+               tny_send_queue_add_async (send_queue, msg, NULL, NULL, NULL);
+
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+               modest_mail_operation_notify_end (self);
        }
 
-       if (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS)
-               modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent"));
-
-       /* TODO: do this in the handler of the "msg-sent"
-          signal.Notify about operation end */
-       modest_mail_operation_notify_end (self);
 }
 
+
 static gboolean
 idle_create_msg_cb (gpointer idle_data)
 {
@@ -639,18 +675,15 @@ create_msg_thread (gpointer thread_data)
 
        if (new_msg) {
                TnyHeader *header;
-               TnyHeaderFlags flags = 0;
 
                /* Set priority flags in message */
                header = tny_msg_get_header (new_msg);
-               if (info->priority_flags != 0)
-                       flags |= info->priority_flags;
+               tny_header_set_flag (header, info->priority_flags);
 
                /* Set attachment flags in message */
                if (info->attachments_list != NULL)
-                       flags |= TNY_HEADER_FLAG_ATTACHMENTS;
+                       tny_header_set_flag (header, TNY_HEADER_FLAG_ATTACHMENTS);
 
-               tny_header_set_flags (header, flags);
                g_object_unref (G_OBJECT(header));
        } else {
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
@@ -686,9 +719,11 @@ create_msg_thread (gpointer thread_data)
 
        g_object_unref (info->mail_op);
        g_slice_free (CreateMsgInfo, info);
+       if (new_msg) g_object_unref(new_msg);
        return NULL;
 }
 
+
 void
 modest_mail_operation_create_msg (ModestMailOperation *self,
                                  const gchar *from, const gchar *to,
@@ -736,29 +771,66 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self,
                                        TnyMsg *msg,
                                        gpointer userdata)
 {
+       ModestMailOperationPrivate *priv = NULL;
        SendNewMailInfo *info = (SendNewMailInfo *) userdata;
        TnyFolder *draft_folder = NULL;
        TnyFolder *outbox_folder = NULL;
-       TnyHeader *header;
+       TnyHeader *header = NULL;
        GError *err = NULL;
 
        if (!msg) {
                goto end;
        }
 
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       if (priv->error) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               modest_mail_operation_notify_end (self);
+               goto end;
+       }
+
        /* Call mail operation */
        modest_mail_operation_send_mail (self, info->transport_account, msg);
 
-       /* 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;              
+               TnyTransportAccount *transport_account = NULL;
+
+               /* To remove the old mail from its source folder, we need to get the
+                * transport account of the original draft message (the transport account
+                * might have been changed by the user) */
+               header = tny_msg_get_header (info->draft_msg);
+               transport_account = modest_tny_account_store_get_transport_account_from_outbox_header(
+                       modest_runtime_get_account_store(), header);
+               if (transport_account == NULL)
+                       transport_account = g_object_ref(info->transport_account);
+               draft_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account),
+                                                                     TNY_FOLDER_TYPE_DRAFTS);
+               outbox_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account),
+                                                                      TNY_FOLDER_TYPE_OUTBOX);
+               g_object_unref(transport_account);
+
+               if (!draft_folder) {
+                       g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL drafts folder",
+                                  __FUNCTION__);
+                       goto end;
+               }
+               if (!outbox_folder) {
+                       g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL outbox folder",
+                                  __FUNCTION__);
+                       goto end;
+               }
+
                folder = tny_msg_get_folder (info->draft_msg);          
                if (folder == NULL) goto end;
                folder_type = modest_tny_folder_guess_folder_type (folder);
+
+               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 
@@ -766,17 +838,17 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self,
 
                /* Note: This can fail (with a warning) if the message is not really already in a folder,
                 * because this function requires it to have a UID. */          
-               header = tny_msg_get_header (info->draft_msg);
                tny_folder_remove_msg (src_folder, header, NULL);
 
                tny_folder_sync (folder, TRUE, &err); /* FALSE --> don't expunge */
 /*             tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL);  /\* expunge *\/ */
                
-               g_object_unref (header);
                g_object_unref (folder);
        }
 
 end:
+       if (header)
+               g_object_unref (header);
        if (err != NULL)
                g_error_free(err);      
        if (info->draft_msg)
@@ -788,7 +860,6 @@ end:
        if (info->transport_account)
                g_object_unref (info->transport_account);
        g_slice_free (SendNewMailInfo, info);
-       modest_mail_operation_notify_end (self);
 }
 
 void
@@ -812,7 +883,8 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
        priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND;
        priv->account = TNY_ACCOUNT (g_object_ref (transport_account));
-
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+       
        /* Check parametters */
        if (to == NULL) {
                /* Set status failed and set an error */
@@ -844,77 +916,128 @@ typedef struct
        TnyMsg *draft_msg;
        SaveToDraftstCallback callback;
        gpointer user_data;
-} SaveToDraftsInfo;
+       TnyFolder *drafts;
+       TnyMsg *msg;
+       ModestMailOperation *mailop;
+} SaveToDraftsAddMsgInfo;
 
 static void
-modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self,
-                                        TnyMsg *msg,
-                                        gpointer userdata)
+modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self,
+                                               gboolean canceled,
+                                               GError *err,
+                                               gpointer userdata)
 {
-       TnyFolder *src_folder = NULL;
-       TnyFolder *drafts = NULL;
-       TnyHeader *header = NULL;
        ModestMailOperationPrivate *priv = NULL;
-       SaveToDraftsInfo *info = (SaveToDraftsInfo *) userdata;
-
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       SaveToDraftsAddMsgInfo *info = (SaveToDraftsAddMsgInfo *) userdata;
 
-       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;
-       }
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mailop);
 
-       drafts = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), 
-                                                       TNY_FOLDER_TYPE_DRAFTS);
-       if (!drafts) {
-               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 (priv->error) {
+               g_warning ("%s: priv->error != NULL", __FUNCTION__);
+               g_error_free(priv->error);
        }
 
-       if (!priv->error)
-               tny_folder_add_msg (drafts, msg, &(priv->error));
+       priv->error = (err == NULL) ? NULL : g_error_copy(err);
 
        if ((!priv->error) && (info->draft_msg != NULL)) {
-               header = tny_msg_get_header (info->draft_msg);
-               src_folder = tny_header_get_folder (header); 
+               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 (drafts, TRUE, NULL, NULL, NULL);
+               tny_folder_sync_async (info->drafts, TRUE, NULL, NULL, NULL);
                tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL);
 
-               g_object_unref (header);
+               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;
 
-end:
        /* Call the user callback */
        if (info->callback)
-               info->callback (self, msg, info->user_data);
+               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));
+
+       modest_mail_operation_notify_end (info->mailop);
+       g_object_unref(info->mailop);
+       g_slice_free (SaveToDraftsAddMsgInfo, info);
+}
+
+typedef struct
+{
+       TnyTransportAccount *transport_account;
+       TnyMsg *draft_msg;
+       SaveToDraftstCallback callback;
+       gpointer user_data;
+} SaveToDraftsInfo;
+
+static void
+modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self,
+                                        TnyMsg *msg,
+                                        gpointer userdata)
+{
+       TnyFolder *drafts = NULL;
+       ModestMailOperationPrivate *priv = NULL;
+       SaveToDraftsInfo *info = (SaveToDraftsInfo *) userdata;
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       if (!msg) {
+               if (!(priv->error)) {
+                       g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                                    MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
+                                    "modest: failed to create a new msg\n");
+               }
+       } else {
+               drafts = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account),
+                                                               TNY_FOLDER_TYPE_DRAFTS);
+               if (!drafts && !(priv->error)) {
+                       g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                                    MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                                    "modest: failed to create a new msg\n");
+               }
+       }
+
+       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;
+               if (info->callback)
+                       info->callback (self, msg, info->user_data);
+               modest_mail_operation_notify_end (self);
+       }
 
        if (drafts)
                g_object_unref (G_OBJECT(drafts));
-       if (src_folder)
-               g_object_unref (G_OBJECT(src_folder));
        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
@@ -955,20 +1078,6 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self,
                                          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;
-       TnyList *new_headers;
-} UpdateAccountInfo;
-
 typedef struct
 {
        ModestMailOperation *mail_op;
@@ -1048,7 +1157,7 @@ internal_folder_observer_finalize (GObject *object)
 static void
 tny_folder_observer_init (TnyFolderObserverIface *iface) 
 {
-       iface->update_func = internal_folder_observer_update;
+       iface->update = internal_folder_observer_update;
 }
 static void
 internal_folder_observer_class_init (InternalFolderObserverClass *klass) 
@@ -1060,538 +1169,476 @@ internal_folder_observer_class_init (InternalFolderObserverClass *klass)
        object_class->finalize = internal_folder_observer_finalize;
 }
 
-/*****************/
+typedef struct 
+{
+       ModestMailOperation *mail_op;
+       gchar *account_name;
+       UpdateAccountCallback callback;
+       gpointer user_data;
+       TnyList *folders;
+       gint pending_calls;
+       gboolean poke_all;
+       TnyFolderObserver *inbox_observer;
+       RetrieveAllCallback retrieve_all_cb;
+} UpdateAccountInfo;
+
 
 static void
-recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all_folders)
+destroy_update_account_info (UpdateAccountInfo *info)
 {
-       TnyIterator *iter;
-       TnyList *folders = tny_simple_list_new ();
+       g_free (info->account_name);
+       g_object_unref (info->folders);
+       g_object_unref (info->mail_op);
+       g_slice_free (UpdateAccountInfo, info);
+}
 
-       tny_folder_store_get_folders (store, folders, query, NULL);
-       iter = tny_list_create_iterator (folders);
+static void
+update_account_get_msg_async_cb (TnyFolder *folder, 
+                                gboolean canceled, 
+                                TnyMsg *msg, 
+                                GError *err, 
+                                gpointer user_data)
+{
+       GetMsgInfo *msg_info = (GetMsgInfo *) user_data;
 
-       while (!tny_iterator_is_done (iter)) {
+       /* 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);
+}
 
-               TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter);
-               if (folder) {
-                       tny_list_prepend (all_folders, G_OBJECT (folder));
-                       recurse_folders (folder, query, all_folders);    
-                       g_object_unref (G_OBJECT (folder));
-               }
+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;
+       ModestAccountRetrieveType retrieve_type;
+       TnyList *new_headers = NULL;
+       gboolean headers_only, ignore_limit;
+       TnyTransportAccount *transport_account = NULL;
 
-               tny_iterator_next (iter);
+       info = (UpdateAccountInfo *) user_data;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
+       mgr = modest_runtime_get_account_mgr ();
+
+       if (canceled || err || !inbox) {
+               /* Try to send anyway */
+               goto send_mail;
        }
-        g_object_unref (G_OBJECT (iter));
-        g_object_unref (G_OBJECT (folders));
-}
 
-/* 
- * 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)
-{
-       ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
-       ModestMailOperationState *state;
+       /* 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;
 
-       state = modest_mail_operation_clone_state (mail_op);
+       /* 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;
 
-       /* This is a GDK lock because we are an idle callback and
-        * the handlers of this signal can contain Gtk+ code */
+       /* Update the last updated key, even if we don't have to get new headers */
+       modest_account_mgr_set_last_updated (mgr, tny_account_get_id (priv->account), time (NULL));
+       
+       if (new_headers_array->len == 0)
+               goto send_mail;
 
-       gdk_threads_enter (); /* CHECKED */
-       g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
-       gdk_threads_leave (); /* CHECKED */
+       /* 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 = (retrieve_type == MODEST_ACCOUNT_RETRIEVE_HEADERS_ONLY);
 
-       g_slice_free (ModestMailOperationState, state);
+       /* Order by date */
+       g_ptr_array_sort (new_headers_array, (GCompareFunc) compare_headers_by_date);
        
-       return TRUE;
-}
+       /* Ask the users if they want to retrieve all the messages
+          even though the limit was exceeded */
+       ignore_limit = FALSE;
+       if (new_headers_array->len > retrieve_limit) {
+               /* Ask the user if a callback has been specified and
+                  if the mail operation has a source (this means that
+                  was invoked by the user and not automatically by a
+                  D-Bus method) */
+               if (info->retrieve_all_cb && priv->source)
+                       ignore_limit = info->retrieve_all_cb (priv->source,
+                                                             new_headers_array->len,
+                                                             retrieve_limit);
+       }
+       
+       if (!headers_only) {
+               gint msg_num = 0;
+               const gint msg_list_size = compute_message_array_size (new_headers_array);
 
-/* 
- * 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;
+               priv->done = 0;
+               if (ignore_limit)
+                       priv->total = new_headers_array->len;
+               else
+                       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;
+
+                       /* 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;
+
+                       /* 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);
 
-       pair = (ModestPair *) data;
+                       g_object_unref (folder);
+                       
+                       msg_num++;
+               }
+       }
 
-       /* This is a GDK lock because we are an idle callback and
-        * the handlers of this signal can contain Gtk+ code */
+       /* 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_enter (); /* CHECKED */
-       g_signal_emit (G_OBJECT (pair->first), signals[PROGRESS_CHANGED_SIGNAL], 0, pair->second, NULL);
-       gdk_threads_leave (); /* CHECKED */
+ send_mail:
+       /* 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);
 
-       /* Free the state and the reference to the mail operation */
-       g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second);
-       g_object_unref (pair->first);
+       if (transport_account) {
+               ModestTnySendQueue *send_queue;
+               TnyFolder *outbox;
+               guint num_messages;
 
-       return FALSE;
-}
+               send_queue = modest_runtime_get_send_queue (transport_account);
+               g_object_unref (transport_account);
 
-/* 
- * 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);
+               /* Get outbox folder */
+               outbox = tny_send_queue_get_outbox (TNY_SEND_QUEUE (send_queue));
+               if (outbox) { /* this could fail in some cases */
+                       num_messages = tny_folder_get_all_count (outbox);
+                       g_object_unref (outbox);
+               } else {
+                       g_warning ("%s: could not get outbox", __FUNCTION__);
+                       num_messages = 0;
+               }
+               
+               if (num_messages != 0) {
+                       /* Send mails */
+                       g_object_unref (priv->account);
 
-       /* 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);
+                       /* Reenable suspended items */
+                       modest_tny_send_queue_wakeup (MODEST_TNY_SEND_QUEUE (send_queue));
 
-       return FALSE;
-}
+                       /* Try to send */
+                       tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE (send_queue));
+               }
+       }
 
-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;
-}
-
-static gboolean 
-set_last_updated_idle (gpointer data)
-{
-
-       /* This is a GDK lock because we are an idle callback and
-        * modest_account_mgr_set_last_updated can issue Gtk+ code */
-
-       gdk_threads_enter (); /* CHECKED - please recheck */
-
-       /* 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_last_updated (modest_runtime_get_account_mgr (), 
-                                            (gchar *) data, 
-                                            time (NULL));
-
-       gdk_threads_leave (); /* CHECKED - please recheck */
-
-       return FALSE;
-}
-
-static gboolean
-idle_update_account_cb (gpointer data)
-{
-       UpdateAccountInfo *idle_info;
+       /* Check if the operation was a success */
+       if (!priv->error)
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 
-       idle_info = (UpdateAccountInfo *) data;
+       /* Set the account back to not busy */
+       modest_account_mgr_set_account_busy (mgr, info->account_name, FALSE);
 
-       /* This is a GDK lock because we are an idle callback and
-        * idle_info->callback can contain Gtk+ code */
+       /* Call the user callback */
+       if (info->callback)
+               info->callback (info->mail_op, new_headers, info->user_data);
 
-       gdk_threads_enter (); /* CHECKED */
-       idle_info->callback (idle_info->mail_op,
-                            idle_info->new_headers,
-                            idle_info->user_data);
-       gdk_threads_leave (); /* CHECKED */
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (info->mail_op);
 
        /* Frees */
-       g_object_unref (idle_info->mail_op);
-       if (idle_info->new_headers)
-               g_object_unref (idle_info->new_headers);
-       g_free (idle_info);
-
-       return FALSE;
+       if (new_headers)
+               g_object_unref (new_headers);
+       destroy_update_account_info (info);
 }
 
-static TnyList *
-get_all_folders_from_account (TnyStoreAccount *account,
-                             GError **error)
+static void 
+recurse_folders_async_cb (TnyFolderStore *folder_store, 
+                         gboolean canceled,
+                         TnyList *list, 
+                         GError *err, 
+                         gpointer user_data)
 {
-       TnyList *all_folders = NULL;
-       TnyIterator *iter = NULL;
-       TnyFolderStoreQuery *query = NULL;
-
-       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 (account),
-                                     all_folders,
-                                     query,
-                                     error);
-
-       if (*error) {
-               if (all_folders)
-                       g_object_unref (all_folders);
-               return NULL;
-       }
+       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 (folder) {
-                       recurse_folders (folder, query, all_folders);
-                       g_object_unref (folder);
+       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 ();
+
+                       /* 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, NULL,
+                                                           recurse_folders_async_cb, 
+                                                           NULL, info);
+                       
+                       g_object_unref (G_OBJECT (folder));
+                       
+                       tny_iterator_next (iter);           
                }
-               tny_iterator_next (iter);
+               g_object_unref (G_OBJECT (iter));
+               g_object_unref (G_OBJECT (list));
        }
-       g_object_unref (G_OBJECT (iter));
 
-       return all_folders;
-}
-
-
-static gpointer
-update_account_thread (gpointer thr_user_data)
-{
-       static gboolean first_time = TRUE;
-       UpdateAccountInfo *info = NULL;
-       TnyList *all_folders = NULL, *new_headers = NULL;
-       GPtrArray *new_headers_array = NULL;
-       TnyIterator *iter = NULL;
-       ModestMailOperationPrivate *priv = NULL;
-       ModestTnySendQueue *send_queue = NULL;
-       gint i = 0, timeout = 0;
+       /* Remove my own pending call */
+       info->pending_calls--;
 
-       info = (UpdateAccountInfo *) thr_user_data;
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op);
+       /* This means that we have all the folders */
+       if (info->pending_calls == 0) {
+               TnyIterator *iter_all_folders;
+               TnyFolder *inbox = NULL;
 
-       /* Get account and set it into mail_operation */
-       priv->account = g_object_ref (info->account);
+               iter_all_folders = tny_list_create_iterator (info->folders);
 
-       /* Get all the folders. We can do it synchronously because
-          we're already running in a different thread than the UI */
-       all_folders = get_all_folders_from_account (info->account, &(priv->error));
-       if (!all_folders) {
-               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-               goto out;
-       }
-
-       /* 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 */
-       timeout = g_timeout_add (100, idle_notify_progress, info->mail_op);
+               /* 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;
 
-       new_headers_array = g_ptr_array_new ();
-       iter = tny_list_create_iterator (all_folders);
+                       folder = TNY_FOLDER (tny_iterator_get_current (iter_all_folders));
 
-       while (!tny_iterator_is_done (iter) && !priv->error && 
-              priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
-
-               TnyFolderType folder_type;
-               TnyFolder *folder = NULL;
-
-               folder = TNY_FOLDER (tny_iterator_get_current (iter));
-               folder_type = tny_folder_get_folder_type (folder);
+                       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);
+                       }
 
-               /* Refresh it only if it's the INBOX */
-               if (folder_type == TNY_FOLDER_TYPE_INBOX) {
-                       InternalFolderObserver *observer = NULL;
-                       TnyIterator *new_headers_iter = NULL;
+                       /* Free and go to next */
+                       g_object_unref (folder);
+                       tny_iterator_next (iter_all_folders);
+               }
+               g_object_unref (iter_all_folders);
 
+               /* Refresh the INBOX */
+               if (inbox) {
                        /* Refresh the folder. Our observer receives
                         * the 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));
-               
-                       tny_folder_refresh (TNY_FOLDER (folder), &(priv->error));
+                       info->inbox_observer = g_object_new (internal_folder_observer_get_type (), NULL);
+                       tny_folder_add_observer (inbox, info->inbox_observer);
 
-                       new_headers_iter = tny_list_create_iterator (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) < info->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 (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer));
-                       g_object_unref (observer);
+                       /* Refresh the INBOX */
+                       tny_folder_refresh_async (inbox, inbox_refreshed_cb, NULL, info);
+                       g_object_unref (inbox);
                } else {
-                       /* We no not need to do it the first time,
-                          because it's automatically done by the tree
-                          model */
-                       if (G_LIKELY (!first_time))
-                               tny_folder_poke_status (folder);
-               }
-               g_object_unref (folder);
-
-               tny_iterator_next (iter);
-       }
-       g_object_unref (G_OBJECT (iter));
-       g_source_remove (timeout);
-
-       if (priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED && 
-           priv->status != MODEST_MAIL_OPERATION_STATUS_FAILED &&
-           new_headers_array->len > 0) {
-               gint msg_num = 0;
-
-               /* 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 > info->retrieve_limit) {
-                       /* TODO */
-               }
-
-               /* Should be get only the headers or the message as well? */
-               if (g_ascii_strcasecmp (info->retrieve_type, 
-                                       MODEST_ACCOUNT_RETRIEVE_VALUE_HEADERS_ONLY) != 0) {     
-                       priv->done = 0;
-                       priv->total = MIN (new_headers_array->len, info->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);
-                               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);
-                               g_object_unref (folder);
-
-                               msg_num++;
-                       }
+                       /* We could not perform the inbox refresh but
+                          we'll try to send mails anyway */
+                       inbox_refreshed_cb (inbox, FALSE, NULL, info);
                }
        }
-
-       if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
-               goto out;
-
-       /* 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);
-       
-
-       /* Perform send (if operation was not cancelled) */
-       priv->done = 0;
-       priv->total = 0;
-       if (priv->account != NULL) 
-               g_object_unref (priv->account);
-
-       if (info->transport_account) {
-               priv->account = g_object_ref (info->transport_account);
-       
-               send_queue = modest_runtime_get_send_queue (info->transport_account);
-               if (send_queue) {
-                       modest_tny_send_queue_try_to_send (send_queue);
-               } 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:
-       /* Set the account back to not busy */
-       modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr(), 
-                                            info->account_name, FALSE);
-       
-       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 = (new_headers) ? g_object_ref (new_headers) : NULL;
-               idle_info->callback = info->callback;
-               idle_info->user_data = info->user_data;
-               g_idle_add (idle_update_account_cb, idle_info);
-       }
-
-       /* Notify about operation end. Note that the info could be
-          freed before this idle happens, but the mail operation will
-          be still alive */
-       g_idle_add (idle_notify_queue, g_object_ref (info->mail_op));
-
-       /* Frees */
-       if (new_headers)
-               g_object_unref (new_headers);
-       if (all_folders)
-               g_object_unref (all_folders);
-       g_object_unref (info->account);
-       if (info->transport_account)
-               g_object_unref (info->transport_account);
-       g_free (info->account_name);
-       g_free (info->retrieve_type);
-       g_slice_free (UpdateAccountInfo, info);
-
-       first_time = FALSE;
-
-       return NULL;
 }
 
-gboolean
+void
 modest_mail_operation_update_account (ModestMailOperation *self,
                                      const gchar *account_name,
+                                     gboolean poke_all,
+                                     RetrieveAllCallback retrieve_all_cb,
                                      UpdateAccountCallback callback,
                                      gpointer user_data)
 {
-       GThread *thread = NULL;
        UpdateAccountInfo *info = NULL;
        ModestMailOperationPrivate *priv = NULL;
-       ModestAccountMgr *mgr = NULL;
-       TnyStoreAccount *store_account = NULL;
-       TnyTransportAccount *transport_account = NULL;
-
-       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE);
-       g_return_val_if_fail (account_name, FALSE);
+       ModestTnyAccountStore *account_store = NULL;
+       TnyList *folders;
+       ModestMailOperationState *state;
 
-       /* 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;
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND_AND_RECEIVE;
 
        /* Get the store account */
-       store_account = (TnyStoreAccount *)
-               modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
-                                                                    account_name,
-                                                                    TNY_ACCOUNT_TYPE_STORE);
-                                                                    
-       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;
-       }
-
-       priv->account = g_object_ref (store_account);
-       
-       /* 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;
-       }
+       account_store = modest_runtime_get_account_store ();
+       priv->account =
+               modest_tny_account_store_get_server_account (account_store,
+                                                            account_name,
+                                                            TNY_ACCOUNT_TYPE_STORE);
 
        /* Create the helper object */
-       info = g_slice_new (UpdateAccountInfo);
-       info->mail_op = self;
-       info->account = store_account;
-       info->transport_account = transport_account;
-       info->callback = callback;
+       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->retrieve_all_cb = retrieve_all_cb;
 
-       /* 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_retrieve_type (mgr, account_name);
+       /* 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_retrieve_limit (mgr, account_name);
-       if (info->retrieve_limit == 0)
-               info->retrieve_limit = G_MAXINT;
-               
-       /* printf ("DEBUG: %s: info->retrieve_limit = %d\n", __FUNCTION__, info->retrieve_limit); */
+       /* notify about the start of the operation */ 
+       state = modest_mail_operation_clone_state (self);
+       state->done = 0;
+       state->total = 0;
 
-       /* Set account busy */
-       modest_account_mgr_set_account_busy(mgr, account_name, TRUE);
+       /* Start notifying progress */
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+       g_slice_free (ModestMailOperationState, state);
        
-       modest_mail_operation_notify_start (self);
-       thread = g_thread_create (update_account_thread, info, FALSE, NULL);
+       /* Get all folders and continue in the callback */ 
+       folders = tny_simple_list_new ();
+       tny_folder_store_get_folders_async (TNY_FOLDER_STORE (priv->account),
+                                           folders, NULL,
+                                           recurse_folders_async_cb, 
+                                           NULL, info);
+}
+
+/*
+ * 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:
-       if (store_account)
-               g_object_unref (store_account);
-       if (transport_account)
-               g_object_unref (transport_account);
-       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-       if (callback) {
-               callback (self, NULL, 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 ************************* */
 /* ******************************************************************* */
 
+typedef struct {
+       ModestMailOperation *mail_op;
+       CreateFolderUserCallback callback;
+       gpointer user_data;
+} CreateFolderInfo;
+
+
+static void
+create_folder_cb (TnyFolderStore *parent_folder, 
+                 gboolean canceled, 
+                 TnyFolder *new_folder, 
+                 GError *err, 
+                 gpointer user_data)
+{
+       ModestMailOperationPrivate *priv;
+       CreateFolderInfo *info;
+
+       info = (CreateFolderInfo *) user_data;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
+
+       if (canceled || err) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               if (err)
+                       priv->error = g_error_copy (err);
+               else
+                       g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                                    MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
+                                    "canceled");               
+       } else {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       }
 
-TnyFolder *
+       /* The user will unref the new_folder */
+       if (info->callback)
+               info->callback (info->mail_op, parent_folder, 
+                               new_folder, info->user_data);
+       
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (info->mail_op);
+
+       /* Frees */
+       g_object_unref (info->mail_op);
+       g_slice_free (CreateFolderInfo, info);
+}
+
+void
 modest_mail_operation_create_folder (ModestMailOperation *self,
                                     TnyFolderStore *parent,
-                                    const gchar *name)
+                                    const gchar *name,
+                                    CreateFolderUserCallback callback,
+                                    gpointer user_data)
 {
        ModestMailOperationPrivate *priv;
-       TnyFolder *new_folder = NULL;
 
-       g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
-       g_return_val_if_fail (name, NULL);
+       g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
+       g_return_if_fail (name);
        
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
        priv->op_type = MODEST_MAIL_OPERATION_TYPE_INFO;
@@ -1600,7 +1647,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
                modest_tny_folder_get_account (TNY_FOLDER (parent));
 
        /* Check for already existing folder */
-       if (modest_tny_folder_has_subfolder_with_name (parent, name)) {
+       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,
@@ -1628,18 +1675,25 @@ 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)
-                       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-       }
+               CreateFolderInfo *info;
 
-       /* Notify about operation end */
-       modest_mail_operation_notify_end (self);
+               info = g_slice_new0 (CreateFolderInfo);
+               info->mail_op = g_object_ref (self);
+               info->callback = callback;
+               info->user_data = user_data;
+
+               modest_mail_operation_notify_start (self);
 
-       return new_folder;
+               /* Create the folder */
+               tny_folder_store_create_folder_async (parent, name, create_folder_cb, 
+                                                     NULL, info);
+       } else {
+               /* Call the user callback anyway */
+               if (callback)
+                       callback (self, parent, NULL, user_data);
+               /* Notify about operation end */
+               modest_mail_operation_notify_end (self);
+       }
 }
 
 void
@@ -1647,7 +1701,6 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
                                     TnyFolder           *folder,
                                     gboolean             remove_to_trash)
 {
-       TnyAccount *account;
        ModestMailOperationPrivate *priv;
        ModestTnyFolderRules rules;
 
@@ -1668,14 +1721,13 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
        }
 
        /* Get the account */
-       account = modest_tny_folder_get_account (folder);
-       priv->account = g_object_ref(account);
+       priv->account = modest_tny_folder_get_account (folder);
        priv->op_type = MODEST_MAIL_OPERATION_TYPE_DELETE;
 
        /* Delete folder or move to trash */
        if (remove_to_trash) {
                TnyFolder *trash_folder = NULL;
-               trash_folder = modest_tny_account_get_special_folder (account,
+               trash_folder = modest_tny_account_get_special_folder (priv->account,
                                                                      TNY_FOLDER_TYPE_TRASH);
                /* TODO: error_handling */
                if (trash_folder) {
@@ -1684,21 +1736,23 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
                                                    TNY_FOLDER_STORE (trash_folder), 
                                                    TRUE, NULL, NULL);
                        g_object_unref (trash_folder);
+               } else {
+                       g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL trash folder", __FUNCTION__);
                }
        } 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;
 
-               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;
-
-               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));
 
  end:
        /* Notify about operation end */
@@ -1713,12 +1767,12 @@ transfer_folder_status_cb (GObject *obj,
        ModestMailOperation *self;
        ModestMailOperationPrivate *priv;
        ModestMailOperationState *state;
-       XFerMsgAsyncHelper *helper;
+       XFerFolderAsyncHelper *helper;
 
        g_return_if_fail (status != NULL);
        g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_COPY_FOLDER);
 
-       helper = (XFerMsgAsyncHelper *) user_data;
+       helper = (XFerFolderAsyncHelper *) user_data;
        g_return_if_fail (helper != NULL);
 
        self = helper->mail_op;
@@ -1750,11 +1804,11 @@ transfer_folder_cb (TnyFolder *folder,
                    GError *err, 
                    gpointer user_data)
 {
-       XFerMsgAsyncHelper *helper;
+       XFerFolderAsyncHelper *helper;
        ModestMailOperation *self = NULL;
        ModestMailOperationPrivate *priv = NULL;
 
-       helper = (XFerMsgAsyncHelper *) user_data;
+       helper = (XFerFolderAsyncHelper *) user_data;
        g_return_if_fail (helper != NULL);       
 
        self = helper->mail_op;
@@ -1785,13 +1839,13 @@ transfer_folder_cb (TnyFolder *folder,
                 * which is already GDK locked by Tinymail */
 
                /* no gdk_threads_enter (), CHECKED */
-               helper->user_callback (self, helper->user_data);
+               helper->user_callback (self, new_folder, helper->user_data);
                /* no gdk_threads_leave () , CHECKED */
        }
 
        /* Free */
        g_object_unref (helper->mail_op);
-       g_slice_free   (XFerMsgAsyncHelper, helper);
+       g_slice_free   (XFerFolderAsyncHelper, helper);
 }
 
 /**
@@ -1829,7 +1883,7 @@ new_name_valid_if_local_account (ModestMailOperationPrivate *priv,
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
-                            _("ckdg_ib_folder_already_exists"));
+                            _CS("ckdg_ib_folder_already_exists"));
                return FALSE;
        } else
                return TRUE;
@@ -1840,12 +1894,12 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                                   TnyFolder *folder,
                                   TnyFolderStore *parent,
                                   gboolean delete_original,
-                                  XferAsyncUserCallback user_callback,
+                                  XferFolderAsyncUserCallback user_callback,
                                   gpointer user_data)
 {
        ModestMailOperationPrivate *priv = NULL;
        ModestTnyFolderRules parent_rules = 0, rules; 
-       XFerMsgAsyncHelper *helper = NULL;
+       XFerFolderAsyncHelper *helper = NULL;
        const gchar *folder_name = NULL;
        const gchar *error_msg;
 
@@ -1887,7 +1941,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                /* 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)) {
+                  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;     
@@ -1897,10 +1951,8 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                goto error;
        } else {
                /* Create the helper */
-               helper = g_slice_new0 (XFerMsgAsyncHelper);
+               helper = g_slice_new0 (XFerFolderAsyncHelper);
                helper->mail_op = g_object_ref (self);
-               helper->dest_folder = NULL;
-               helper->headers = NULL;
                helper->user_callback = user_callback;
                helper->user_data = user_data;
                
@@ -1925,7 +1977,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 
        /* Call the user callback if exists */
        if (user_callback)
-               user_callback (self, user_data);
+               user_callback (self, NULL, user_data);
 
        /* Notify the queue */
        modest_mail_operation_notify_end (self);
@@ -1934,11 +1986,13 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 void
 modest_mail_operation_rename_folder (ModestMailOperation *self,
                                     TnyFolder *folder,
-                                    const gchar *name)
+                                    const gchar *name,
+                                    XferFolderAsyncUserCallback user_callback,
+                                    gpointer user_data)
 {
        ModestMailOperationPrivate *priv;
        ModestTnyFolderRules rules;
-       XFerMsgAsyncHelper *helper;
+       XFerFolderAsyncHelper *helper;
 
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_FOLDER_STORE (folder));
@@ -1953,21 +2007,9 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
        /* Check folder rules */
        rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
        if (rules & MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE) {
-               /* 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: unable to rename"));
-
-               /* Notify about operation end */
-               modest_mail_operation_notify_end (self);
+               goto error;
        } else if (!strcmp (name, " ") || strchr (name, '/')) {
-               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
-                            _("FIXME: unable to rename"));
-               /* Notify about operation end */
-               modest_mail_operation_notify_end (self);
+               goto error;
        } else {
                TnyFolderStore *into;
 
@@ -1977,12 +2019,10 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
                   special local folder */
                if (new_name_valid_if_local_account (priv, into, name)) {
                        /* Create the helper */
-                       helper = g_slice_new0 (XFerMsgAsyncHelper);
+                       helper = g_slice_new0 (XFerFolderAsyncHelper);
                        helper->mail_op = g_object_ref(self);
-                       helper->dest_folder = NULL;
-                       helper->headers = NULL;
-                       helper->user_callback = NULL;
-                       helper->user_data = NULL;
+                       helper->user_callback = user_callback;
+                       helper->user_data = user_data;
                
                        /* Rename. Camel handles folder subscription/unsubscription */
                        modest_mail_operation_notify_start (self);
@@ -1991,10 +2031,24 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
                                               transfer_folder_status_cb,
                                               helper);
                } else {
-                       modest_mail_operation_notify_end (self);
+                       goto error;
                }
                g_object_unref (into);
+
+               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,
+                    _("FIXME: unable to rename"));
+       
+       if (user_callback)
+               user_callback (self, NULL, user_data);
+
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (self);
 }
 
 /* ******************************************************************* */
@@ -2007,7 +2061,7 @@ modest_mail_operation_get_msg (ModestMailOperation *self,
                               GetMsgAsyncUserCallback user_callback,
                               gpointer user_data)
 {
-       GetMsgAsyncHelper *helper = NULL;
+       GetMsgInfo *helper = NULL;
        TnyFolder *folder;
        ModestMailOperationPrivate *priv;
        
@@ -2018,7 +2072,8 @@ modest_mail_operation_get_msg (ModestMailOperation *self,
        folder = tny_header_get_folder (header);
 
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
-       priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
+       priv->total = 1;
+       priv->done = 0;
 
        /* Get account and set it into mail_operation */
        priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
@@ -2029,263 +2084,129 @@ modest_mail_operation_get_msg (ModestMailOperation *self,
        else 
                priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
        
-       helper = g_slice_new0 (GetMsgAsyncHelper);
-       helper->mail_op = self;
+       /* 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->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));
+       helper->destroy_notify = NULL;
+       helper->last_total_bytes = 0;
+       helper->sum_total_bytes = 0;
+       helper->total_bytes = tny_header_get_message_size (header);
 
        modest_mail_operation_notify_start (self);
-       tny_folder_get_msg_async (folder, header, get_msg_cb, get_msg_status_cb, helper);
+       
+       /* notify about the start of the operation */ 
+       ModestMailOperationState *state;
+       state = modest_mail_operation_clone_state (self);
+       state->done = 0;
+       state->total = 0;
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 
+                               0, state, NULL);
+       
+       tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, helper);
 
        g_object_unref (G_OBJECT (folder));
 }
 
-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;
-       }
-
-       /* If user defined callback function was defined, call it even
-          if the operation failed*/
-       if (helper->user_callback) {
-               /* 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->header, msg, helper->user_data);
-               /* no gdk_threads_leave (), CHECKED */
-       }
-
-       /* 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);
-               
-}
-
 static void     
 get_msg_status_cb (GObject *obj,
                   TnyStatus *status,  
                   gpointer user_data)
 {
-       GetMsgAsyncHelper *helper = NULL;
-       ModestMailOperation *self;
-       ModestMailOperationPrivate *priv;
-       ModestMailOperationState *state;
+       GetMsgInfo *helper = NULL;
 
        g_return_if_fail (status != NULL);
        g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_GET_MSG);
 
-       helper = (GetMsgAsyncHelper *) user_data;
+       helper = (GetMsgInfo *) 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;
-
-       /* 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);
+       /* Notify progress */
+       notify_progress_of_multiple_messages (helper->mail_op, status, &(helper->last_total_bytes), 
+                                             &(helper->sum_total_bytes), helper->total_bytes, FALSE);
 }
 
-/****************************************************/
-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;      
-
-       /* This is a GDK lock because we are an idle callback and
-        * because info->user_callback can contain Gtk+ code */
-
-       gdk_threads_enter (); /* CHECKED */
-       info->user_callback (info->mail_op, info->header, info->msg, info->user_data);
-       gdk_threads_leave (); /* CHECKED */
-
-       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;
-
-       if (info->notify) {
-
-               /* This is a GDK lock because we are an idle callback and
-                * because info->notify can contain Gtk+ code */
-
-               gdk_threads_enter (); /* CHECKED */
-               info->notify (info->user_data);
-               gdk_threads_leave (); /* CHECKED */
-       }
-
-       /* free */
-       g_object_unref (info->headers);
-       g_slice_free (GetFullMsgsInfo, info);
-
-       return 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);
+       gboolean finished;
 
-       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);
-                               
-               /* 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;
-
-               /* 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));
+       info = (GetMsgInfo *) user_data;
 
-                       if (msg) {
-                               ModestMailOperationState *state;
-                               ModestPair *pair;
-
-                               priv->done++;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
+       priv->done++;
 
-                               /* 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;
+       if (info->more_msgs) {
+               tny_iterator_next (info->more_msgs);
+               finished = (tny_iterator_is_done (info->more_msgs));
+       } else {
+               finished = (priv->done == priv->total) ? TRUE : FALSE;
+       }
+
+       /* If canceled by the user, ignore the error given by Tinymail */
+       if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+               canceled = TRUE;
+               finished = TRUE;
+       } else if (canceled || err) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS;
+               if (err) {
+                       priv->error = g_error_copy ((const GError *) err);
+                       priv->error->domain = MODEST_MAIL_OPERATION_ERROR;
+               }
+               if (!priv->error) {
                        g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                                     MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
-                                    "Error trying to get a message. No folder found for header");
+                                    err->message);
                }
-
-               if (header)
-                       g_object_unref (header);
-               
-               tny_iterator_next (iter);
+       } else if (finished && priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) {
+               /* Set the success status before calling the user callback */
+               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 */
+               if (info->more_msgs)
+                       g_object_unref (info->more_msgs);
+               g_object_unref (info->header);
+               g_object_unref (info->mail_op);
+               g_slice_free (GetMsgInfo, info);
+       } else if (info->more_msgs) {
+               TnyHeader *header = TNY_HEADER (tny_iterator_get_current (info->more_msgs));
+               TnyFolder *folder = tny_header_get_folder (header);
+
+               g_object_unref (info->header);
+               info->header = g_object_ref (header);
+
+               /* Retrieve the next message */
+               tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, info);
+
+               g_object_unref (header);
+               g_object_unref (folder);
+       } else {
+               g_warning ("%s: finished != TRUE but no messages left", __FUNCTION__);
+       }
 }
 
 void 
@@ -2295,17 +2216,12 @@ 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;
+       gint msg_list_size;
        TnyIterator *iter = NULL;
        
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       
+
        /* Init mail operation */
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
@@ -2315,73 +2231,57 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 
        /* Get account and set it into mail_operation */
        if (tny_list_get_length (header_list) >= 1) {
-               iter = tny_list_create_iterator (header_list);
-               header = TNY_HEADER (tny_iterator_get_current (iter));
+               TnyIterator *iterator = tny_list_create_iterator (header_list);
+               TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iterator));
                if (header) {
-                       folder = tny_header_get_folder (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);
-                       iter = NULL;
-               }
-       }
-
-       /* Get msg size limit */
-       max_size  = modest_conf_get_int (modest_runtime_get_conf (), 
-                                        MODEST_CONF_MSG_SIZE_LIMIT, 
-                                        &(priv->error));
-       if (priv->error) {
-               g_clear_error (&(priv->error));
-               max_size = G_MAXINT;
-       } else {
-               max_size = max_size * KB;
+               g_object_unref (iterator);
        }
 
-       /* Check message size limits. If there is only one message
-          always retrieve it */
-       if (iter != NULL) {
-               while (!tny_iterator_is_done (iter) && size_ok) {
-                       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);
-       }
+       msg_list_size = compute_message_list_size (header_list);
 
-       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;
+       modest_mail_operation_notify_start (self);
+       iter = tny_list_create_iterator (header_list);
+       if (!tny_iterator_is_done (iter)) {
+               /* notify about the start of the operation */
+               ModestMailOperationState *state;
+               state = modest_mail_operation_clone_state (self);
+               state->done = 0;
+               state->total = 0;
+               g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL],
+                              0, state, NULL);
 
-               modest_mail_operation_notify_start (self);
-               thread = g_thread_create (get_msgs_full_thread, info, FALSE, NULL);
-       } else {
-               /* Set status failed and set an error */
-               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-               /* FIXME: the error msg is different for pop */
-               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT,
-                            _("emev_ni_ui_imap_msg_size_exceed_error"));
-               /* Remove from queue and free resources */
-               modest_mail_operation_notify_end (self);
-               if (notify)
-                       notify (user_data);
+               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->more_msgs = g_object_ref (iter);
+               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);
+               g_slice_free (ModestMailOperationState, state);
        }
+       g_object_unref (iter);
 }
 
 
@@ -2410,21 +2310,36 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
        /* 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);
+               gboolean expunge, leave_on_server;
+               const gchar *account_name;
+               TnyAccount *account;
+               ModestTransportStoreProtocol account_proto;
+
+               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_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* FALSE --> don't expunge *\/ */
-                       tny_folder_sync (folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */
-               else if (TNY_IS_CAMEL_POP_FOLDER (folder))
-/*                     tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* TRUE --> dont expunge *\/ */
-                       tny_folder_sync (folder, TRUE, &(priv->error)); /* TRUE --> expunge */
+               /* Get leave on server setting */
+               account = tny_folder_get_account (folder);
+               account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+               leave_on_server =
+                       modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
+                                                               account_name);
+
+               account_proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
+
+               if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) ||
+                   modest_tny_folder_is_remote_folder (folder) == FALSE)
+                       expunge = TRUE;
                else
-                       /* local folders */
-/*                     tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /\* TRUE --> expunge *\/ */
-                       tny_folder_sync (folder, TRUE, &(priv->error)); /* TRUE --> expunge */
+                       expunge = FALSE;
+
+               /* Sync folder */
+               tny_folder_sync_async(folder, expunge, NULL, NULL, NULL);
+
+               /* Unref */
+               g_object_unref (account);
        }
        
        
@@ -2446,10 +2361,12 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self,
                                   TnyList *headers,
                                  gboolean remove_to_trash /*ignored*/)
 {
-       TnyFolder *folder;
+       TnyFolder *folder = NULL;
        ModestMailOperationPrivate *priv;
        TnyIterator *iter = NULL;
        TnyHeader *header = NULL;
+       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));
@@ -2457,13 +2374,55 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self,
        if (remove_to_trash)
                g_warning ("remove to trash is not implemented");
 
+       if (tny_list_get_length(headers) == 0) {
+               g_warning ("%s: list of headers is empty\n", __FUNCTION__);
+               goto cleanup; /* nothing to do */
+       }
+       
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       remove_headers = g_object_ref(headers);
 
        /* Get folder from first header and sync it */
-       iter = tny_list_create_iterator (headers);
+       iter = tny_list_create_iterator (headers);      
        header = TNY_HEADER (tny_iterator_get_current (iter));
-       folder = tny_header_get_folder (header);
-       
+
+       folder = tny_header_get_folder (header);        
+       if (!TNY_IS_FOLDER(folder)) {
+               g_warning ("%s: could not get folder for header\n", __FUNCTION__);
+               goto cleanup;
+       }
+
+       /* Don't remove messages that are being sent */
+       if (modest_tny_folder_is_local_folder (folder)) {
+               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;
@@ -2472,14 +2431,35 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self,
        /* remove message from folder */
        modest_mail_operation_notify_start (self);
 
-       tny_folder_remove_msgs (folder, headers, &(priv->error));
+       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 */ 
+               gboolean expunge, leave_on_server;
+               const gchar *account_name;
+               const gchar *proto;
+               TnyAccount *account;
+               ModestTransportStoreProtocol account_proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
+               
+               account = tny_folder_get_account (folder);
+               account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+               leave_on_server =
+                       modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
+                                                               account_name);
+               
+               proto = tny_account_get_proto (account);
+               if (proto) {
+                       account_proto = modest_protocol_info_get_transport_store_protocol (proto);
+               }
+               
+               if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) ||
+                   modest_tny_folder_is_remote_folder (folder) == FALSE)
+                       expunge = TRUE;
                else
-                       /* local folders */
-                       tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /* TRUE --> expunge */
+                       expunge = FALSE;
+
+               /* Sync folder */
+               tny_folder_sync_async(folder, expunge, NULL, NULL, NULL);
+               
+               g_object_unref (account);
        }
        
        
@@ -2490,38 +2470,42 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self,
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 
        /* Free */
-       g_object_unref (header);
-       g_object_unref (iter);
-       g_object_unref (G_OBJECT (folder));
+cleanup:
+       if (remove_headers)
+               g_object_unref (remove_headers);
+       if (header)
+               g_object_unref (header);
+       if (iter)
+               g_object_unref (iter);
+       if (folder)
+               g_object_unref (folder);
 
        /* Notify about operation end */
        modest_mail_operation_notify_end (self);
 }
 
-
 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;
-
-       g_return_if_fail (status != NULL);
-       g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_XFER_MSGS);
-
-       helper = (XFerMsgAsyncHelper *) user_data;
-       g_return_if_fail (helper != NULL);       
+       gboolean is_num_bytes = FALSE;
 
-       self = helper->mail_op;
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       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);
+        *  transferred bytes with this particular message
+        *  
+        *  (FIXME: this is very ugly, and no I (djcb) didn't write this code,
+        *  I just added the 'if' so we don't get runtime warning)
+        */
+       if (status->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))) {
@@ -2529,14 +2513,19 @@ transfer_msgs_status_cb (GObject *obj,
                   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 != helper->last_total_bytes) {
-                       priv->done++;
-                       helper->sum_total_bytes += helper->last_total_bytes;
-                       helper->last_total_bytes = status->of_total;
+               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 + helper->sum_total_bytes;
-               state->bytes_total = helper->total_bytes;
-
+               state->bytes_done += status->position + *sum_total_bytes;
+               state->bytes_total = total_bytes;
 
                /* Notify the status change. Only notify about changes
                   referred to bytes */
@@ -2547,17 +2536,34 @@ transfer_msgs_status_cb (GObject *obj,
        g_slice_free (ModestMailOperationState, state);
 }
 
+static void
+transfer_msgs_status_cb (GObject *obj,
+                        TnyStatus *status,  
+                        gpointer user_data)
+{
+       XFerMsgsAsyncHelper *helper;
+
+       g_return_if_fail (status != NULL);
+       g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_XFER_MSGS);
+
+       helper = (XFerMsgsAsyncHelper *) user_data;
+       g_return_if_fail (helper != NULL);       
+
+       /* 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)
 {
-       XFerMsgAsyncHelper *helper;
+       XFerMsgsAsyncHelper *helper;
        ModestMailOperation *self;
        ModestMailOperationPrivate *priv;
-       TnyIterator *iter = NULL;
-       TnyHeader *header = NULL;
+       gboolean finished = TRUE;
 
-       helper = (XFerMsgAsyncHelper *) user_data;
+       helper = (XFerMsgsAsyncHelper *) user_data;
        self = helper->mail_op;
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
@@ -2572,57 +2578,66 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u
                             MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
                             _("Error trying to refresh the contents of %s"),
                             tny_folder_get_name (folder));
-       } else {
-               priv->done = 1;
-               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       } else if (priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+               if (helper->more_msgs) {
+                       /* We'll transfer the next message in the list */
+                       tny_iterator_next (helper->more_msgs);
+                       if (!tny_iterator_is_done (helper->more_msgs)) {
+                               GObject *next_header;
+                               g_object_unref (helper->headers);
+                               helper->headers = tny_simple_list_new ();
+                               next_header = tny_iterator_get_current (helper->more_msgs);
+                               tny_list_append (helper->headers, next_header);
+                               g_object_unref (next_header);
+                               finished = FALSE;
+                       }
+               }
 
-               /* Update folder counts */
-               tny_folder_poke_status (folder);                
-               tny_folder_poke_status (helper->dest_folder);           
+               if (finished) {
+                       priv->done = 1;
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+               }
        }
 
-       
-       /* Mark headers as deleted and seen */
-       if ((helper->delete) && 
-           (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS)) {
-               iter = tny_list_create_iterator (helper->headers);
-               while (!tny_iterator_is_done (iter)) {
-                       header = TNY_HEADER (tny_iterator_get_current (iter));
-                       tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
-                       tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
-                       g_object_unref (header);
+       if (finished) {
 
-                       tny_iterator_next (iter);
-               }
+               /* Update folder counts */
+               tny_folder_poke_status (folder);
+               tny_folder_poke_status (helper->dest_folder);
 
-       }
-               
+               /* Notify about operation end */
+               modest_mail_operation_notify_end (self);
 
-       /* Notify about operation end */
-       modest_mail_operation_notify_end (self);
+               /* If user defined callback function was defined, call it */
+               if (helper->user_callback) {
+                       /* This is not a GDK lock because we are a Tinymail callback and
+                        * Tinymail already acquires the Gdk lock */
 
-       /* If user defined callback function was defined, call it */
-       if (helper->user_callback) {
-               /* This is not a GDK lock because we are a Tinymail callback and
-                * Tinymail already acquires the Gdk lock */
+                       /* no gdk_threads_enter (), CHECKED */
+                       helper->user_callback (self, helper->user_data);
+                       /* no gdk_threads_leave (), CHECKED */
+               }
 
-               /* no gdk_threads_enter (), CHECKED */
-               helper->user_callback (self, helper->user_data);
-               /* no gdk_threads_leave (), CHECKED */
+               /* Free */
+               if (helper->more_msgs)
+                       g_object_unref (helper->more_msgs);
+               if (helper->headers)
+                       g_object_unref (helper->headers);
+               if (helper->dest_folder)
+                       g_object_unref (helper->dest_folder);
+               if (helper->mail_op)
+                       g_object_unref (helper->mail_op);
+               g_slice_free (XFerMsgsAsyncHelper, helper);
+       } else {
+               /* Transfer more messages */
+               tny_folder_transfer_msgs_async (folder,
+                                               helper->headers,
+                                               helper->dest_folder,
+                                               helper->delete,
+                                               transfer_msgs_cb,
+                                               transfer_msgs_status_cb,
+                                               helper);
        }
-
-       /* Free */
-       if (helper->headers)
-               g_object_unref (helper->headers);
-       if (helper->dest_folder)
-               g_object_unref (helper->dest_folder);
-       if (helper->mail_op)
-               g_object_unref (helper->mail_op);
-       if (folder)
-               g_object_unref (folder);
-       if (iter)
-               g_object_unref (iter);
-       g_slice_free (XFerMsgAsyncHelper, helper);
 }
 
 static guint
@@ -2643,24 +2658,41 @@ compute_message_list_size (TnyList *headers)
        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,
-                                XferAsyncUserCallback user_callback,
+                                XferMsgsAsyncUserCallback user_callback,
                                 gpointer user_data)
 {
        ModestMailOperationPrivate *priv = NULL;
        TnyIterator *iter = NULL;
        TnyFolder *src_folder = NULL;
-       XFerMsgAsyncHelper *helper = NULL;
+       XFerMsgsAsyncHelper *helper = NULL;
        TnyHeader *header = NULL;
        ModestTnyFolderRules rules = 0;
+       TnyAccount *dst_account = NULL;
+       gboolean leave_on_server;
 
-       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 = tny_list_get_length (headers);
@@ -2688,16 +2720,24 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
                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 */
        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);
@@ -2708,10 +2748,9 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
        }
 
        /* Create the helper */
-       helper = g_slice_new0 (XFerMsgAsyncHelper);
+       helper = g_slice_new0 (XFerMsgsAsyncHelper);
        helper->mail_op = g_object_ref(self);
        helper->dest_folder = g_object_ref(folder);
-       helper->headers = g_object_ref(headers);
        helper->user_callback = user_callback;
        helper->user_data = user_data;
        helper->delete = delete_original;
@@ -2721,16 +2760,53 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 
        /* Get account and set it into mail_operation */
        priv->account = modest_tny_folder_get_account (src_folder);
+       dst_account = modest_tny_folder_get_account (folder);
+
+       if (priv->account == dst_account) {
+               /* Transfer all messages at once using the fast
+                * method. Note that depending on the server this
+                * might not be that fast, and might not be
+                * user-cancellable either */
+               helper->headers = g_object_ref (headers);
+               helper->more_msgs = NULL;
+       } else {
+               /* Transfer messages one by one so the user can cancel
+                * the operation */
+               GObject *hdr;
+               helper->headers = tny_simple_list_new ();
+               helper->more_msgs = tny_list_create_iterator (headers);
+               hdr = tny_iterator_get_current (helper->more_msgs);
+               tny_list_append (helper->headers, hdr);
+               g_object_unref (hdr);
+       }
+
+       /* If leave_on_server is set to TRUE then don't use
+          delete_original, we always pass FALSE. This is because
+          otherwise tinymail will try to sync the source folder and
+          this could cause an error if we're offline while
+          transferring an already downloaded message from a POP
+          account */
+        if (modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (priv->account)) == 
+           MODEST_PROTOCOL_STORE_POP) {
+               const gchar *account_name;
+
+               account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (priv->account);
+               leave_on_server = modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
+                                                                         account_name);
+       } else {
+               leave_on_server = FALSE;
+       }
 
-       /* Transfer messages */
        modest_mail_operation_notify_start (self);
        tny_folder_transfer_msgs_async (src_folder, 
-                                       headers, 
+                                       helper->headers, 
                                        folder, 
-                                       delete_original, 
+                                       (leave_on_server) ? FALSE : delete_original, 
                                        transfer_msgs_cb, 
                                        transfer_msgs_status_cb,
                                        helper);
+       g_object_unref (src_folder);
+       g_object_unref (dst_account);
 }
 
 
@@ -2777,7 +2853,7 @@ on_refresh_folder (TnyFolder   *folder,
        }
 
        /* Free */
-       g_slice_free   (RefreshAsyncHelper, helper);
+       g_slice_free (RefreshAsyncHelper, helper);
 
        /* Notify about operation end */
        modest_mail_operation_notify_end (self);
@@ -2843,12 +2919,94 @@ modest_mail_operation_refresh_folder  (ModestMailOperation *self,
           updates before the callback call then this could happen. We
           must review the design */
        modest_mail_operation_notify_start (self);
+       
+       /* notify that the operation was started */
+       ModestMailOperationState *state;
+       state = modest_mail_operation_clone_state (self);
+       state->done = 0;
+       state->total = 0;
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 
+                       0, state, NULL);
+
+       /* FIXME: we're leaking the state here, or? valgrind thinks so */
+       
        tny_folder_refresh_async (folder,
                                  on_refresh_folder,
                                  on_refresh_folder_status_update,
                                  helper);
 }
 
+static void
+run_queue_stop (ModestTnySendQueue *queue,
+               ModestMailOperation *self)
+{
+       ModestMailOperationPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (queue));
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+
+       modest_mail_operation_notify_end (self);
+       g_signal_handlers_disconnect_by_func (queue, run_queue_stop, self);
+       g_object_unref (self);
+}
+void
+modest_mail_operation_run_queue (ModestMailOperation *self,
+                                ModestTnySendQueue *queue)
+{
+       ModestMailOperationPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (queue));
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+       priv->account = TNY_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (queue)));
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_RUN_QUEUE;
+
+       modest_mail_operation_notify_start (self);
+       g_object_ref (self);
+       g_signal_connect ((gpointer) queue, "queue-stop", G_CALLBACK (run_queue_stop), (gpointer) self);
+}
+
+static void
+sync_folder_finish_callback (TnyFolder *self, gboolean cancelled, GError *err, ModestMailOperation *mail_op)
+{
+       ModestMailOperationPrivate *priv;
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op);
+       if (err != NULL) {
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
+                            err->message);
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+       } else {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       }
+       modest_mail_operation_notify_end (mail_op);
+       g_object_unref (mail_op);
+}
+
+void
+modest_mail_operation_sync_folder (ModestMailOperation *self,
+                                  TnyFolder *folder, gboolean expunge)
+{
+       ModestMailOperationPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_FOLDER (folder));
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+       priv->account = TNY_ACCOUNT (tny_folder_get_account (folder));
+       priv->op_type = MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER;
+
+       modest_mail_operation_notify_start (self);
+       g_object_ref (self);
+       tny_folder_sync_async (folder, expunge, (TnyFolderCallback) sync_folder_finish_callback, NULL, self);
+}
 
 static void
 modest_mail_operation_notify_start (ModestMailOperation *self)
@@ -2860,7 +3018,6 @@ modest_mail_operation_notify_start (ModestMailOperation *self)
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
        /* Ensure that all the fields are filled correctly */
-       g_return_if_fail (priv->account != NULL);
        g_return_if_fail (priv->op_type != MODEST_MAIL_OPERATION_TYPE_UNKNOWN);
 
        /* Notify the observers about the mail operation. We do not
@@ -2907,3 +3064,65 @@ modest_mail_operation_get_account (ModestMailOperation *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);
+}
+
+
+gchar*
+modest_mail_operation_to_string (ModestMailOperation *self)
+{
+       const gchar *type, *status, *account_id;
+       ModestMailOperationPrivate *priv = NULL;
+       
+       g_return_val_if_fail (self, NULL);
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       /* new operations don't have anything interesting */
+       if (priv->op_type == MODEST_MAIL_OPERATION_TYPE_UNKNOWN)
+               return g_strdup_printf ("%p <new operation>", self);
+       
+       switch (priv->op_type) {
+       case MODEST_MAIL_OPERATION_TYPE_SEND:    type= "SEND";    break;
+       case MODEST_MAIL_OPERATION_TYPE_RECEIVE: type= "RECEIVE"; break;
+       case MODEST_MAIL_OPERATION_TYPE_OPEN:    type= "OPEN";    break;
+       case MODEST_MAIL_OPERATION_TYPE_DELETE:  type= "DELETE";  break;
+       case MODEST_MAIL_OPERATION_TYPE_INFO:    type= "INFO";    break;
+       case MODEST_MAIL_OPERATION_TYPE_RUN_QUEUE: type= "RUN-QUEUE"; break;
+       case MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER: type= "SYNC-FOLDER"; break;
+       case MODEST_MAIL_OPERATION_TYPE_UNKNOWN: type= "UNKNOWN"; break;
+       default: type = "UNEXPECTED"; break;
+       }
+
+       switch (priv->status) {
+       case MODEST_MAIL_OPERATION_STATUS_INVALID:              status= "INVALID"; break;
+       case MODEST_MAIL_OPERATION_STATUS_SUCCESS:              status= "SUCCESS"; break;
+       case MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS: status= "FINISHED-WITH-ERRORS"; break;
+       case MODEST_MAIL_OPERATION_STATUS_FAILED:               status= "FAILED"; break;
+       case MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS:          status= "IN-PROGRESS"; break;
+       case MODEST_MAIL_OPERATION_STATUS_CANCELED:             status= "CANCELLED"; break;
+       default:                                                status= "UNEXPECTED"; break;
+       } 
+
+       account_id = priv->account ? tny_account_get_id (priv->account) : "";
+
+       return g_strdup_printf ("%p \"%s\" (%s) [%s] {%d/%d} '%s'", self, account_id,type, status,
+                               priv->done, priv->total,
+                               priv->error && priv->error->message ? priv->error->message : "");
+}