* src/modest-ui-actions.c:
[modest] / src / modest-mail-operation.c
index b60cb7e..26c8c94 100644 (file)
@@ -1,4 +1,3 @@
-
 /* Copyright (c) 2006, Nokia Corporation
  * All rights reserved.
  *
@@ -36,6 +35,9 @@
 #include <tny-folder-store-query.h>
 #include <tny-camel-stream.h>
 #include <tny-camel-pop-store-account.h>
+#include <tny-camel-pop-folder.h>
+#include <tny-camel-imap-folder.h>
+#include <tny-camel-mem-stream.h>
 #include <tny-simple-list.h>
 #include <tny-send-queue.h>
 #include <tny-status.h>
@@ -55,6 +57,7 @@
 #include "modest-mail-operation.h"
 
 #define KB 1024
+#define GET_SIZE_BUFFER_SIZE 128
 
 /* 'private'/'protected' functions */
 static void modest_mail_operation_class_init (ModestMailOperationClass *klass);
@@ -85,6 +88,7 @@ enum _ModestMailOperationSignals
 typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate;
 struct _ModestMailOperationPrivate {
        TnyAccount                 *account;
+       gchar                                                                            *account_name;
        guint                      done;
        guint                      total;
        GObject                   *source;
@@ -105,8 +109,8 @@ struct _ModestMailOperationPrivate {
 
 typedef struct _GetMsgAsyncHelper {    
        ModestMailOperation *mail_op;
+       TnyHeader *header;
        GetMsgAsyncUserCallback user_callback;  
-       guint pending_ops;
        gpointer user_data;
 } GetMsgAsyncHelper;
 
@@ -125,6 +129,44 @@ typedef struct _XFerMsgAsyncHelper
        gpointer user_data;
 } XFerMsgAsyncHelper;
 
+typedef void (*ModestMailOperationCreateMsgCallback) (ModestMailOperation *mail_op,
+                                                     TnyMsg *msg,
+                                                     gpointer userdata);
+
+static void          modest_mail_operation_create_msg (ModestMailOperation *self,
+                                                      const gchar *from, const gchar *to,
+                                                      const gchar *cc, const gchar *bcc,
+                                                      const gchar *subject, const gchar *plain_body,
+                                                      const gchar *html_body, const GList *attachments_list,
+                                                      TnyHeaderFlags priority_flags,
+                                                      ModestMailOperationCreateMsgCallback callback,
+                                                      gpointer userdata);
+
+static gboolean      idle_notify_queue (gpointer data);
+typedef struct
+{
+       ModestMailOperation *mail_op;
+       gchar *from;
+       gchar *to;
+       gchar *cc;
+       gchar *bcc;
+       gchar *subject;
+       gchar *plain_body;
+       gchar *html_body;
+       GList *attachments_list;
+       TnyHeaderFlags priority_flags;
+       ModestMailOperationCreateMsgCallback callback;
+       gpointer userdata;
+} CreateMsgInfo;
+
+typedef struct
+{
+       ModestMailOperation *mail_op;
+       TnyMsg *msg;
+       ModestMailOperationCreateMsgCallback callback;
+       gpointer userdata;
+} CreateMsgIdleInfo;
+
 /* globals */
 static GObjectClass *parent_class = NULL;
 
@@ -208,6 +250,8 @@ modest_mail_operation_finalize (GObject *obj)
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
 
+       
+       
        if (priv->error) {
                g_error_free (priv->error);
                priv->error = NULL;
@@ -300,8 +344,14 @@ modest_mail_operation_get_source (ModestMailOperation *self)
 {
        ModestMailOperationPrivate *priv;
 
+       g_return_val_if_fail (self, NULL);
+       
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-
+       if (!priv) {
+               g_warning ("BUG: %s: priv == NULL", __FUNCTION__);
+               return NULL;
+       }
+       
        return g_object_ref (priv->source);
 }
 
@@ -315,6 +365,11 @@ modest_mail_operation_get_status (ModestMailOperation *self)
                              MODEST_MAIL_OPERATION_STATUS_INVALID);
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       if (!priv) {
+               g_warning ("BUG: %s: priv == NULL", __FUNCTION__);
+               return MODEST_MAIL_OPERATION_STATUS_INVALID;
+       }
+       
        return priv->status;
 }
 
@@ -327,6 +382,12 @@ modest_mail_operation_get_error (ModestMailOperation *self)
        g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), NULL);
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       if (!priv) {
+               g_warning ("BUG: %s: priv == NULL", __FUNCTION__);
+               return NULL;
+       }
+
        return priv->error;
 }
 
@@ -341,18 +402,21 @@ modest_mail_operation_cancel (ModestMailOperation *self)
        }
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
-
-       /* cancel current operation in account */
-       //tny_account_cancel (priv->account);
+       if (!priv) {
+               g_warning ("BUG: %s: priv == NULL", __FUNCTION__);
+               return FALSE;
+       }
 
        did_a_cancel = TRUE;
 
        /* Set new status */
        priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
 
-       /* Notify about operation end */
+       /* This emits progress-changed on which the mail operation queue is
+        * listening, so the mail operation is correctly removed from the
+        * queue without further explicit calls. */
        modest_mail_operation_notify_end (self);
-
+       
        return TRUE;
 }
 
@@ -436,7 +500,17 @@ modest_mail_operation_clone_state (ModestMailOperation *self)
        ModestMailOperationState *state;
        ModestMailOperationPrivate *priv;
 
+       /* FIXME: this should be fixed properly
+        * 
+        * in some cases, priv was NULL, so checking here to
+        * make sure.
+        */
+       g_return_val_if_fail (self, NULL);
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       g_return_val_if_fail (priv, NULL);
+
+       if (!priv)
+               return NULL;
 
        state = g_slice_new (ModestMailOperationState);
 
@@ -445,6 +519,8 @@ modest_mail_operation_clone_state (ModestMailOperation *self)
        state->done = priv->done;
        state->total = priv->total;
        state->finished = modest_mail_operation_is_finished (self);
+       state->bytes_done = 0;
+       state->bytes_total = 0;
 
        return state;
 }
@@ -469,6 +545,8 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
 
        /* Get account and set it into mail_operation */
        priv->account = g_object_ref (transport_account);
+       priv->done = 1;
+       priv->total = 1;
 
        send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account));
        if (!TNY_IS_SEND_QUEUE(send_queue)) {
@@ -476,10 +554,175 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
                             MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
                             "modest: could not find send queue for account\n");
        } else {
+               /* TODO: connect to the msg-sent in order to know when
+                  the mail operation is finished */
                tny_send_queue_add (send_queue, msg, &(priv->error));
+               /* TODO: we're setting always success, do the check in
+                  the handler */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
        }
 
-       /* Notify about operation end */
+       /* 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)
+{
+       CreateMsgIdleInfo *info = (CreateMsgIdleInfo *) idle_data;
+
+       gdk_threads_enter ();
+       info->callback (info->mail_op, info->msg, info->userdata);
+       gdk_threads_leave ();
+       g_object_unref (info->mail_op);
+       if (info->msg)
+               g_object_unref (info->msg);
+       g_slice_free (CreateMsgIdleInfo, info);
+
+       return FALSE;
+}
+
+static gpointer 
+create_msg_thread (gpointer thread_data)
+{
+       CreateMsgInfo *info = (CreateMsgInfo *) thread_data;
+       TnyMsg *new_msg = NULL;
+       ModestMailOperationPrivate *priv;
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op);
+       if (info->html_body == NULL) {
+               new_msg = modest_tny_msg_new (info->to, info->from, info->cc, 
+                                             info->bcc, info->subject, info->plain_body, 
+                                             info->attachments_list); /* FIXME: attachments */
+       } else {
+               new_msg = modest_tny_msg_new_html_plain (info->to, info->from, info->cc,
+                                                        info->bcc, info->subject, info->html_body,
+                                                        info->plain_body, info->attachments_list);
+       }
+
+       if (new_msg) {
+               TnyHeader *header;
+               /* Set priority flags in message */
+               header = tny_msg_get_header (new_msg);
+               if (info->priority_flags != 0)
+                       tny_header_set_flags (header, info->priority_flags);
+               if (info->attachments_list != NULL) {
+                       tny_header_set_flags (header, TNY_HEADER_FLAG_ATTACHMENTS);
+               }
+               g_object_unref (G_OBJECT(header));
+       } else {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
+                            "modest: failed to create a new msg\n");
+       }
+
+
+       g_free (info->to);
+       g_free (info->from);
+       g_free (info->cc);
+       g_free (info->bcc);
+       g_free (info->plain_body);
+       g_free (info->html_body);
+       g_free (info->subject);
+       g_list_foreach (info->attachments_list, (GFunc) g_object_unref, NULL);
+       g_list_free (info->attachments_list);
+
+       if (info->callback) {
+               CreateMsgIdleInfo *idle_info;
+               idle_info = g_slice_new0 (CreateMsgIdleInfo);
+               idle_info->mail_op = info->mail_op;
+               g_object_ref (info->mail_op);
+               idle_info->msg = new_msg;
+               if (new_msg)
+                       g_object_ref (new_msg);
+               idle_info->callback = info->callback;
+               idle_info->userdata = info->userdata;
+               g_idle_add (idle_create_msg_cb, idle_info);
+       } else {
+               g_idle_add (idle_notify_queue, g_object_ref (info->mail_op));
+       }
+
+       g_object_unref (info->mail_op);
+       g_slice_free (CreateMsgInfo, info);
+       return NULL;
+}
+
+void
+modest_mail_operation_create_msg (ModestMailOperation *self,
+                                 const gchar *from, const gchar *to,
+                                 const gchar *cc, const gchar *bcc,
+                                 const gchar *subject, const gchar *plain_body,
+                                 const gchar *html_body,
+                                 const GList *attachments_list,
+                                 TnyHeaderFlags priority_flags,
+                                 ModestMailOperationCreateMsgCallback callback,
+                                 gpointer userdata)
+{
+       CreateMsgInfo *info = NULL;
+
+       info = g_slice_new0 (CreateMsgInfo);
+       info->mail_op = self;
+       g_object_ref (self);
+
+       info->from = g_strdup (from);
+       info->to = g_strdup (to);
+       info->cc = g_strdup (cc);
+       info->subject = g_strdup (subject);
+       info->plain_body = g_strdup (plain_body);
+       info->html_body = g_strdup (html_body);
+       info->attachments_list = g_list_copy ((GList *) attachments_list);
+       g_list_foreach (info->attachments_list, (GFunc) g_object_ref, NULL);
+       info->priority_flags = priority_flags;
+
+       info->callback = callback;
+       info->userdata = userdata;
+
+       g_thread_create (create_msg_thread, info, FALSE, NULL);
+}
+
+typedef struct
+{
+       TnyTransportAccount *transport_account;
+       TnyMsg *draft_msg;
+} SendNewMailInfo;
+
+static void
+modest_mail_operation_send_new_mail_cb (ModestMailOperation *self,
+                                       TnyMsg *msg,
+                                       gpointer userdata)
+{
+       SendNewMailInfo *info = (SendNewMailInfo *) userdata;
+       TnyFolder *folder;
+       TnyHeader *header;
+
+       if (!msg) {
+               goto end;
+       }
+
+       /* Call mail operation */
+       modest_mail_operation_send_mail (self, info->transport_account, msg);
+
+       folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_DRAFTS);
+       if (folder) {
+               if (info->draft_msg != NULL) {
+                       header = tny_msg_get_header (info->draft_msg);
+                       /* Note: This can fail (with a warning) if the message is not really already in a folder,
+                        * because this function requires it to have a UID. */
+                       tny_folder_remove_msg (folder, header, NULL);
+                       tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
+                       tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+                       g_object_unref (header);
+               }
+       }
+
+end:
+       if (info->draft_msg)
+               g_object_unref (info->draft_msg);
+       if (info->transport_account)
+               g_object_unref (info->transport_account);
+       g_slice_free (SendNewMailInfo, info);
        modest_mail_operation_notify_end (self);
 }
 
@@ -494,19 +737,14 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
                                     const GList *attachments_list,
                                     TnyHeaderFlags priority_flags)
 {
-       TnyMsg *new_msg = NULL;
-       TnyFolder *folder = NULL;
-       TnyHeader *header = NULL;
        ModestMailOperationPrivate *priv = NULL;
+       SendNewMailInfo *info;
 
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       /* Get account and set it into mail_operation */
-       priv->account = g_object_ref (transport_account);
-
        /* Check parametters */
        if (to == NULL) {
                /* Set status failed and set an error */
@@ -516,107 +754,128 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
                             _("Error trying to send a mail. You need to set at least one recipient"));
                return;
        }
+       info = g_slice_new0 (SendNewMailInfo);
+       info->transport_account = transport_account;
+       if (transport_account)
+               g_object_ref (transport_account);
+       info->draft_msg = draft_msg;
+       if (draft_msg)
+               g_object_ref (draft_msg);
+       modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body,
+                                         attachments_list, priority_flags,
+                                         modest_mail_operation_send_new_mail_cb, info);
 
-       if (html_body == NULL) {
-               new_msg = modest_tny_msg_new (to, from, cc, bcc, subject, plain_body, (GSList *) attachments_list); /* FIXME: attachments */
-       } else {
-               new_msg = modest_tny_msg_new_html_plain (to, from, cc, bcc, subject, html_body, plain_body, (GSList *) attachments_list);
-       }
-       if (!new_msg) {
-               g_printerr ("modest: failed to create a new msg\n");
-               return;
-       }
-
-       /* Set priority flags in message */
-       header = tny_msg_get_header (new_msg);
-       if (priority_flags != 0)
-               tny_header_set_flags (header, priority_flags);
-
-       /* Call mail operation */
-       modest_mail_operation_send_mail (self, transport_account, new_msg);
-
-       folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS);
-       if (folder) {
-               if (draft_msg != NULL) {
-                       header = tny_msg_get_header (draft_msg);
-                       /* Note: This can fail (with a warning) if the message is not really already in a folder,
-                        * because this function requires it to have a UID. */
-                       tny_folder_remove_msg (folder, header, NULL);
-                       g_object_unref (header);
-               }
-       }
-
-       /* Free */
-       g_object_unref (G_OBJECT (new_msg));
 }
 
-void
-modest_mail_operation_save_to_drafts (ModestMailOperation *self,
-                                     TnyTransportAccount *transport_account,
-                                     TnyMsg *draft_msg,
-                                     const gchar *from,  const gchar *to,
-                                     const gchar *cc,  const gchar *bcc,
-                                     const gchar *subject, const gchar *plain_body,
-                                     const gchar *html_body,
-                                     const GList *attachments_list,
-                                     TnyHeaderFlags priority_flags)
+typedef struct
+{
+       TnyTransportAccount *transport_account;
+       TnyMsg *draft_msg;
+       ModestMsgEditWindow *edit_window;
+} SaveToDraftsInfo;
+
+static void
+modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self,
+                                        TnyMsg *msg,
+                                        gpointer userdata)
 {
-       TnyMsg *msg = NULL;
        TnyFolder *folder = NULL;
        TnyHeader *header = NULL;
        ModestMailOperationPrivate *priv = NULL;
-
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
+       SaveToDraftsInfo *info = (SaveToDraftsInfo *) userdata;
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-
-       /* Get account and set it into mail_operation */
-       priv->account = g_object_ref (transport_account);
-
-       if (html_body == NULL) {
-               msg = modest_tny_msg_new (to, from, cc, bcc, subject, plain_body, (GSList *) attachments_list); /* FIXME: attachments */
-       } else {
-               msg = modest_tny_msg_new_html_plain (to, from, cc, bcc, subject, html_body, plain_body, (GSList *) attachments_list);
-       }
        if (!msg) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
                             "modest: failed to create a new msg\n");
                goto end;
        }
 
-       /* add priority flags */
-       header = tny_msg_get_header (msg);
-       tny_header_set_flags (header, priority_flags);
-
-       folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS);
+       folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_DRAFTS);
        if (!folder) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
                             "modest: failed to create a new msg\n");
                goto end;
        }
 
-       if (draft_msg != NULL) {
-               header = tny_msg_get_header (draft_msg);
+       if (info->draft_msg != NULL) {
+               header = tny_msg_get_header (info->draft_msg);
+               /* Remove the old draft expunging it */
                tny_folder_remove_msg (folder, header, NULL);
+               tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
+               tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+               tny_folder_sync (folder, FALSE, &(priv->error));  /* FALSE --> don't expunge */
                g_object_unref (header);
        }
        
-       tny_folder_add_msg (folder, msg, &(priv->error));
-       if (priv->error)
-               goto end;
+       if (!priv->error)
+               tny_folder_add_msg (folder, msg, &(priv->error));
+
+       if (!priv->error)
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       else
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+
+       if (info->edit_window)
+               modest_msg_edit_window_set_draft (info->edit_window, msg);
+
 
 end:
-       if (msg)
-               g_object_unref (G_OBJECT(msg));
        if (folder)
                g_object_unref (G_OBJECT(folder));
+       if (info->edit_window)
+               g_object_unref (G_OBJECT(info->edit_window));
+       if (info->draft_msg)
+               g_object_unref (G_OBJECT (info->draft_msg));
+       if (info->transport_account)
+               g_object_unref (G_OBJECT(info->transport_account));
+       g_slice_free (SaveToDraftsInfo, info);
 
        modest_mail_operation_notify_end (self);
 }
 
+void
+modest_mail_operation_save_to_drafts (ModestMailOperation *self,
+                                     TnyTransportAccount *transport_account,
+                                     TnyMsg *draft_msg,
+                                     ModestMsgEditWindow *edit_window,
+                                     const gchar *from,  const gchar *to,
+                                     const gchar *cc,  const gchar *bcc,
+                                     const gchar *subject, const gchar *plain_body,
+                                     const gchar *html_body,
+                                     const GList *attachments_list,
+                                     TnyHeaderFlags priority_flags)
+{
+       ModestMailOperationPrivate *priv = NULL;
+       SaveToDraftsInfo *info = NULL;
+
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       /* Get account and set it into mail_operation */
+       priv->account = g_object_ref (transport_account);
+
+       info = g_slice_new0 (SaveToDraftsInfo);
+       info->transport_account = g_object_ref (transport_account);
+       info->draft_msg = draft_msg;
+       if (draft_msg)
+               g_object_ref (draft_msg);
+       info->edit_window = edit_window;
+       if (edit_window)
+               g_object_ref (edit_window);
+
+       modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body,
+                                         attachments_list, priority_flags,
+                                         modest_mail_operation_save_to_drafts_cb, info);
+
+}
+
 typedef struct 
 {
        ModestMailOperation *mail_op;
@@ -625,8 +884,21 @@ typedef struct
        gint max_size;
        gint retrieve_limit;
        gchar *retrieve_type;
+       gchar *account_name;
+       UpdateAccountCallback callback;
+       gpointer user_data;
+       gint new_headers;
 } UpdateAccountInfo;
 
+typedef struct
+{
+       ModestMailOperation *mail_op;
+       TnyMimePart *mime_part;
+       gssize size;
+       GetMimePartSizeCallback callback;
+       gpointer userdata;
+} GetMimePartSizeInfo;
+
 /***** I N T E R N A L    F O L D E R    O B S E R V E R *****/
 /* We use this folder observer to track the headers that have been
  * added to a folder */
@@ -650,9 +922,6 @@ G_DEFINE_TYPE_WITH_CODE (InternalFolderObserver,
 static void
 foreach_add_item (gpointer header, gpointer user_data)
 {
-       /* printf("DEBUG: %s: header subject=%s\n", 
-        * __FUNCTION__, tny_header_get_subject(TNY_HEADER(header)));
-        */
        tny_list_prepend (TNY_LIST (user_data), 
                          g_object_ref (G_OBJECT (header)));
 }
@@ -674,10 +943,6 @@ internal_folder_observer_update (TnyFolderObserver *self, TnyFolderChange *chang
                list = tny_simple_list_new ();
                tny_folder_change_get_added_headers (change, list);
 
-               /* printf ("DEBUG: %s: Calling foreach with a list of size=%d\n", 
-                *      __FUNCTION__, tny_list_get_length(list));
-                */
-                
                /* Add them to the folder observer */
                tny_list_foreach (list, foreach_add_item, 
                                  derived->new_headers);
@@ -754,7 +1019,7 @@ idle_notify_progress (gpointer data)
        state = modest_mail_operation_clone_state (mail_op);
        g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
        g_slice_free (ModestMailOperationState, state);
-
+       
        return TRUE;
 }
 
@@ -780,17 +1045,15 @@ idle_notify_progress_once (gpointer data)
 }
 
 /* 
- * Used by update_account_thread to notify the queue from the main
+ * Used to notify the queue from the main
  * loop. We call it inside an idle call to achieve that
  */
 static gboolean
-notify_update_account_queue (gpointer data)
+idle_notify_queue (gpointer data)
 {
        ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
-       ModestMailOperationPrivate *priv = NULL;
-
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op);
 
+       /* Do not need to block, the notify end will do it for us */    
        modest_mail_operation_notify_end (mail_op);
        g_object_unref (mail_op);
 
@@ -821,6 +1084,8 @@ compare_headers_by_date (gconstpointer a,
 static gboolean 
 set_last_updated_idle (gpointer data)
 {
+       gdk_threads_enter ();
+
        /* 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 */
@@ -830,19 +1095,43 @@ set_last_updated_idle (gpointer data)
                                    time(NULL), 
                                    TRUE);
 
+       gdk_threads_leave ();
+
+       return FALSE;
+}
+
+static gboolean
+idle_update_account_cb (gpointer data)
+{
+       UpdateAccountInfo *idle_info;
+
+       idle_info = (UpdateAccountInfo *) data;
+
+       gdk_threads_enter ();
+       idle_info->callback (idle_info->mail_op,
+                            idle_info->new_headers,
+                            idle_info->user_data);
+       gdk_threads_leave ();
+
+       /* Frees */
+       g_object_unref (idle_info->mail_op);
+       g_free (idle_info);
+
        return FALSE;
 }
 
+
 static gpointer
 update_account_thread (gpointer thr_user_data)
 {
+       static gboolean first_time = TRUE;
        UpdateAccountInfo *info;
        TnyList *all_folders = NULL;
-       GPtrArray *new_headers;
+       GPtrArray *new_headers = NULL;
        TnyIterator *iter = NULL;
        TnyFolderStoreQuery *query = NULL;
-       ModestMailOperationPrivate *priv;
-       ModestTnySendQueue *send_queue;
+       ModestMailOperationPrivate *priv = NULL;
+       ModestTnySendQueue *send_queue = NULL;
 
        info = (UpdateAccountInfo *) thr_user_data;
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op);
@@ -854,7 +1143,7 @@ update_account_thread (gpointer thr_user_data)
         * for POP3, we do a logout-login upon send/receive -- many POP-servers (like Gmail) do not
         * show any updates unless we do that
         */
-       if (TNY_IS_CAMEL_POP_STORE_ACCOUNT(priv->account)) 
+       if (!first_time && TNY_IS_CAMEL_POP_STORE_ACCOUNT(priv->account)) 
                tny_camel_pop_store_account_reconnect (TNY_CAMEL_POP_STORE_ACCOUNT(priv->account));
 
        /* Get all the folders. We can do it synchronously because
@@ -886,7 +1175,7 @@ update_account_thread (gpointer thr_user_data)
           Gtk+. We use a timeout in order to provide more status
           information, because the sync tinymail call does not
           provide it for the moment */
-       gint timeout = g_timeout_add (250, idle_notify_progress, info->mail_op);
+       gint timeout = g_timeout_add (100, idle_notify_progress, info->mail_op);
 
        /* Refresh folders */
        new_headers = g_ptr_array_new ();
@@ -900,8 +1189,6 @@ update_account_thread (gpointer thr_user_data)
                /* Refresh the folder */
                /* Our observer receives notification of new emails during folder refreshes,
                 * so we can use observer->new_headers.
-                * TODO: This does not seem to be providing accurate numbers.
-                * Possibly the observer is notified asynchronously.
                 */
                observer = g_object_new (internal_folder_observer_get_type (), NULL);
                tny_folder_add_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer));
@@ -921,10 +1208,6 @@ update_account_thread (gpointer thr_user_data)
                        iter = tny_list_create_iterator (observer->new_headers);
                        while (!tny_iterator_is_done (iter)) {
                                TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
-                               /* printf ("  DEBUG1.2 %s: checking size: account=%s, subject=%s\n", 
-                                *      __FUNCTION__, tny_account_get_id (priv->account), 
-                                * tny_header_get_subject (header));
-                                */
                                 
                                /* Apply per-message size limits */
                                if (tny_header_get_message_size (header) < info->max_size)
@@ -934,16 +1217,24 @@ update_account_thread (gpointer thr_user_data)
                                tny_iterator_next (iter);
                        }
                        g_object_unref (iter);
+               } else {
+                       /* We do not need to do it the first time
+                          because it's automatically done by the tree
+                          model */
+                       if (G_UNLIKELY (!first_time))
+                               tny_folder_poke_status (TNY_FOLDER (folder));
                }
-               
                tny_folder_remove_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer));
                g_object_unref (observer);
-               observer = NULL;
+               observer = NULL;                        
 
+               g_object_unref (G_OBJECT (folder));
                if (priv->error)
+               {
                        priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-
-               g_object_unref (G_OBJECT (folder));
+                       goto out;
+               }
+               
                tny_iterator_next (iter);
        }
 
@@ -963,11 +1254,11 @@ update_account_thread (gpointer thr_user_data)
                 * user to download them all,
                 * as per the UI spec "Retrieval Limits" section in 4.4: 
                 */
-               printf ("DEBUG: %s: account=%s, len=%d, retrieve_limit = %d\n", __FUNCTION__, 
-                       tny_account_get_id (priv->account), new_headers->len, info->retrieve_limit);
                if (new_headers->len > info->retrieve_limit) {
-                       /* TODO: Ask the user, instead of just failing, showing mail_nc_msg_count_limit_exceeded, 
-                        * with 'Get all' and 'Newest only' buttons. */
+                       /* TODO: Ask the user, instead of just
+                        * failing, showing
+                        * mail_nc_msg_count_limit_exceeded, with 'Get
+                        * all' and 'Newest only' buttons. */
                        g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_RETRIEVAL_NUMBER_LIMIT,
                             "The number of messages to retrieve exceeds the chosen limit for account %s\n", 
@@ -1003,9 +1294,10 @@ update_account_thread (gpointer thr_user_data)
                g_ptr_array_foreach (new_headers, (GFunc) g_object_unref, NULL);
                g_ptr_array_free (new_headers, FALSE);
        }
-
-       /* Perform send */
-       priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND;
+       
+       /* Perform send (if operation was not cancelled) */
+       if (did_a_cancel) goto out;             
+/*     priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND; */
        priv->done = 0;
        priv->total = 0;
        if (priv->account != NULL) 
@@ -1014,9 +1306,9 @@ update_account_thread (gpointer thr_user_data)
        
        send_queue = modest_runtime_get_send_queue (info->transport_account);
        if (send_queue) {
-               timeout = g_timeout_add (250, idle_notify_progress, info->mail_op);
+/*             timeout = g_timeout_add (250, idle_notify_progress, info->mail_op); */
                modest_tny_send_queue_try_to_send (send_queue);
-               g_source_remove (timeout);
+/*             g_source_remove (timeout); */
        } else {
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
@@ -1037,10 +1329,22 @@ update_account_thread (gpointer thr_user_data)
        }
 
  out:
+
+       if (info->callback) {
+               UpdateAccountInfo *idle_info;
+
+               /* This thread is not in the main lock */
+               idle_info = g_malloc0 (sizeof (UpdateAccountInfo));
+               idle_info->mail_op = g_object_ref (info->mail_op);
+               idle_info->new_headers = (new_headers) ? new_headers->len : 0;
+               idle_info->callback = info->callback;
+               g_idle_add (idle_update_account_cb, idle_info);
+       }
+
        /* Notify about operation end. Note that the info could be
           freed before this idle happens, but the mail operation will
           be still alive */
-       g_idle_add (notify_update_account_queue, g_object_ref (info->mail_op));
+       g_idle_add (idle_notify_queue, g_object_ref (info->mail_op));
 
        /* Frees */
        g_object_unref (query);
@@ -1050,12 +1354,16 @@ update_account_thread (gpointer thr_user_data)
        g_free (info->retrieve_type);
        g_slice_free (UpdateAccountInfo, info);
 
+       first_time = FALSE;
+
        return NULL;
 }
 
 gboolean
 modest_mail_operation_update_account (ModestMailOperation *self,
-                                     const gchar *account_name)
+                                     const gchar *account_name,
+                                     UpdateAccountCallback callback,
+                                     gpointer user_data)
 {
        GThread *thread;
        UpdateAccountInfo *info;
@@ -1067,13 +1375,6 @@ modest_mail_operation_update_account (ModestMailOperation *self,
        g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE);
        g_return_val_if_fail (account_name, FALSE);
 
-       /* Make sure that we have a connection, and request one 
-        * if necessary:
-        * TODO: Is there some way to trigger this for every attempt to 
-        * use the network? */
-       if (!modest_platform_connect_and_wait(NULL))
-               return FALSE;
-       
        /* Init mail operation. Set total and done to 0, and do not
           update them, this way the progress objects will know that
           we have no clue about the number of the objects */
@@ -1081,7 +1382,14 @@ modest_mail_operation_update_account (ModestMailOperation *self,
        priv->total = 0;
        priv->done  = 0;
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
-       
+
+       /* Make sure that we have a connection, and request one 
+        * if necessary:
+        * TODO: Is there some way to trigger this for every attempt to 
+        * use the network? */
+       if (!modest_platform_connect_and_wait (NULL))
+               goto error;
+
        /* Get the Modest account */
        modest_account = (TnyStoreAccount *)
                modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
@@ -1089,13 +1397,10 @@ modest_mail_operation_update_account (ModestMailOperation *self,
                                                                     TNY_ACCOUNT_TYPE_STORE);
 
        if (!modest_account) {
-               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                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);
-               modest_mail_operation_notify_end (self);
-
-               return FALSE;
+               goto error;
        }
 
        
@@ -1105,13 +1410,10 @@ modest_mail_operation_update_account (ModestMailOperation *self,
                modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(),
                                                                                    account_name);
        if (!transport_account) {
-               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                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);
-               modest_mail_operation_notify_end (self);
-
-               return FALSE;
+               goto error;
        }
 
        /* Create the helper object */
@@ -1119,6 +1421,8 @@ modest_mail_operation_update_account (ModestMailOperation *self,
        info->mail_op = self;
        info->account = modest_account;
        info->transport_account = transport_account;
+       info->callback = callback;
+       info->user_data = user_data;
 
        /* Get the message size limit */
        info->max_size  = modest_conf_get_int (modest_runtime_get_conf (), 
@@ -1141,9 +1445,20 @@ modest_mail_operation_update_account (ModestMailOperation *self,
                
        /* printf ("DEBUG: %s: info->retrieve_limit = %d\n", __FUNCTION__, info->retrieve_limit); */
 
+       /* Set account busy */
+       modest_account_mgr_set_account_busy(mgr, account_name, TRUE);
+       priv->account_name = g_strdup(account_name);
+       
        thread = g_thread_create (update_account_thread, info, FALSE, NULL);
 
        return TRUE;
+
+ error:
+       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+       if (callback) 
+               callback (self, 0, user_data);
+       modest_mail_operation_notify_end (self);
+       return FALSE;
 }
 
 /* ******************************************************************* */
@@ -1177,6 +1492,13 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
                }
        }
 
+       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,
+                            _("mail_in_ui_folder_create_error"));
+       }
+
        if (!priv->error) {
                /* Create the folder */
                new_folder = tny_folder_store_create_folder (parent, name, &(priv->error));
@@ -1227,7 +1549,8 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
                                                                      TNY_FOLDER_TYPE_TRASH);
                /* TODO: error_handling */
                 modest_mail_operation_xfer_folder (self, folder,
-                                                   TNY_FOLDER_STORE (trash_folder), TRUE);
+                                                   TNY_FOLDER_STORE (trash_folder), 
+                                                   TRUE, NULL, NULL);
        } else {
                TnyFolderStore *parent = tny_folder_get_folder_store (folder);
 
@@ -1252,15 +1575,16 @@ transfer_folder_status_cb (GObject *obj,
        ModestMailOperation *self;
        ModestMailOperationPrivate *priv;
        ModestMailOperationState *state;
+       XFerMsgAsyncHelper *helper;
 
        g_return_if_fail (status != NULL);
        g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_COPY_FOLDER);
 
-       self = MODEST_MAIL_OPERATION (user_data);
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       helper = (XFerMsgAsyncHelper *) user_data;
+       g_return_if_fail (helper != NULL);
 
-       if ((status->position == 1) && (status->of_total == 100))
-               return;
+       self = helper->mail_op;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
        priv->done = status->position;
        priv->total = status->of_total;
@@ -1275,15 +1599,19 @@ static void
 transfer_folder_cb (TnyFolder *folder, 
                    TnyFolderStore *into, 
                    gboolean cancelled, 
-                   TnyFolder *new_folder, GError **err, 
+                   TnyFolder *new_folder, 
+                   GError **err, 
                    gpointer user_data)
 {
+       XFerMsgAsyncHelper *helper;
        ModestMailOperation *self = NULL;
        ModestMailOperationPrivate *priv = NULL;
 
-       self = MODEST_MAIL_OPERATION (user_data);
+       helper = (XFerMsgAsyncHelper *) user_data;
+       g_return_if_fail (helper != NULL);       
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       self = helper->mail_op;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
        if (*err) {
                priv->error = g_error_copy (*err);
@@ -1300,28 +1628,37 @@ transfer_folder_cb (TnyFolder *folder,
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
        }
                
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (self);
+
+       /* If user defined callback function was defined, call it */
+       if (helper->user_callback) {
+               gdk_threads_enter ();
+               helper->user_callback (priv->source, helper->user_data);
+               gdk_threads_leave ();
+       }
+
        /* Free */
+       g_object_unref (helper->mail_op);
+       g_slice_free   (XFerMsgAsyncHelper, helper);
        g_object_unref (folder);
        g_object_unref (into);
-       if (new_folder != NULL)
-               g_object_unref (new_folder);
-
-       /* Notify about operation end */
-       modest_mail_operation_notify_end (self);
 }
 
 void
 modest_mail_operation_xfer_folder (ModestMailOperation *self,
                                   TnyFolder *folder,
                                   TnyFolderStore *parent,
-                                  gboolean delete_original)
+                                  gboolean delete_original,
+                                  XferMsgsAsynUserCallback user_callback,
+                                  gpointer user_data)
 {
        ModestMailOperationPrivate *priv = NULL;
-       ModestTnyFolderRules parent_rules, rules;
+       ModestTnyFolderRules parent_rules = 0, rules; 
+       XFerMsgAsyncHelper *helper = NULL;
 
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_FOLDER (folder));
-       g_return_if_fail (TNY_IS_FOLDER (parent));
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
@@ -1331,14 +1668,12 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 
        /* Get folder rules */
        rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
-       parent_rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
-
-       if (!TNY_IS_FOLDER_STORE (parent)) {
-               
-       }
+       if (TNY_IS_FOLDER (parent))
+               parent_rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
        
        /* The moveable restriction is applied also to copy operation */
        if ((!TNY_IS_FOLDER_STORE (parent)) || (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE)) {
+               printf("DEBUG: %s: Not allowing the move.\n", __FUNCTION__);
                /* Set status failed and set an error */
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
@@ -1347,7 +1682,8 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 
                /* Notify the queue */
                modest_mail_operation_notify_end (self);
-       } else if (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
+       } else if (TNY_IS_FOLDER (parent) && 
+                  (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE)) {
                /* Set status failed and set an error */
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
@@ -1361,6 +1697,14 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                g_object_ref (folder);
                g_object_ref (parent);
 
+               /* Create the helper */
+               helper = g_slice_new0 (XFerMsgAsyncHelper);
+               helper->mail_op = g_object_ref(self);
+               helper->dest_folder = NULL;
+               helper->headers = NULL;
+               helper->user_callback = user_callback;
+               helper->user_data = user_data;
+               
                /* Move/Copy folder */          
                tny_folder_copy_async (folder,
                                       parent,
@@ -1368,7 +1712,8 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                                       delete_original,
                                       transfer_folder_cb,
                                       transfer_folder_status_cb,
-                                      self);
+                                      helper);
+/*                                    self); */
        }
 }
 
@@ -1379,6 +1724,7 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
 {
        ModestMailOperationPrivate *priv;
        ModestTnyFolderRules rules;
+       XFerMsgAsyncHelper *helper;
 
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_FOLDER_STORE (folder));
@@ -1400,18 +1746,33 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
 
                /* Notify about operation end */
                modest_mail_operation_notify_end (self);
+       } else if (!strcmp (name, " ") || strchr (name, '/')) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+                            _("FIXME: unable to rename"));
+               /* Notify about operation end */
+               modest_mail_operation_notify_end (self);
        } else {
-               /* Rename. Camel handles folder subscription/unsubscription */
                TnyFolderStore *into;
 
+               /* Create the helper */
+               helper = g_slice_new0 (XFerMsgAsyncHelper);
+               helper->mail_op = g_object_ref(self);
+               helper->dest_folder = NULL;
+               helper->headers = NULL;
+               helper->user_callback = NULL;
+               helper->user_data = NULL;
+
+               /* Rename. Camel handles folder subscription/unsubscription */
                into = tny_folder_get_folder_store (folder);
                tny_folder_copy_async (folder, into, name, TRUE,
                                 transfer_folder_cb,
                                 transfer_folder_status_cb,
-                                self);
+                                helper);
+/*                              self); */
                if (into)
-                       g_object_unref (into);
-               
+                       g_object_unref (into);          
        }
  }
 
@@ -1444,8 +1805,13 @@ void modest_mail_operation_get_msg (ModestMailOperation *self,
                helper = g_slice_new0 (GetMsgAsyncHelper);
                helper->mail_op = self;
                helper->user_callback = user_callback;
-               helper->pending_ops = 1;
                helper->user_data = user_data;
+               helper->header = g_object_ref (header);
+
+               // The callback's reference so that the mail op is not
+               // finalized until the async operation is completed even if
+               // the user canceled the request meanwhile.
+               g_object_ref (G_OBJECT (helper->mail_op));
 
                tny_folder_get_msg_async (folder, header, get_msg_cb, get_msg_status_cb, helper);
 
@@ -1462,6 +1828,99 @@ void modest_mail_operation_get_msg (ModestMailOperation *self,
        }
 }
 
+static gboolean
+idle_get_mime_part_size_cb (gpointer userdata)
+{
+       GetMimePartSizeInfo *idle_info;
+
+       idle_info = (GetMimePartSizeInfo *) userdata;
+
+       gdk_threads_enter ();
+       idle_info->callback (idle_info->mail_op,
+                            idle_info->size,
+                            idle_info->userdata);
+       gdk_threads_leave ();
+
+       g_object_unref (idle_info->mail_op);
+       g_slice_free (GetMimePartSizeInfo, idle_info);
+
+       return FALSE;
+}
+
+static gpointer
+get_mime_part_size_thread (gpointer thr_user_data)
+{
+       GetMimePartSizeInfo *info;
+       gchar read_buffer[GET_SIZE_BUFFER_SIZE];
+       TnyStream *stream;
+       gssize readed_size;
+       gssize total = 0;
+       ModestMailOperationPrivate *priv;
+
+       info = (GetMimePartSizeInfo *) thr_user_data;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
+
+       stream = tny_camel_mem_stream_new ();
+       tny_mime_part_decode_to_stream (info->mime_part, stream);
+       tny_stream_reset (stream);
+       if (tny_stream_is_eos (stream)) {
+               tny_stream_close (stream);
+               stream = tny_mime_part_get_stream (info->mime_part);
+       }
+       
+       while (!tny_stream_is_eos (stream)) {
+               readed_size = tny_stream_read (stream, read_buffer, GET_SIZE_BUFFER_SIZE);
+               total += readed_size;
+       }
+
+       if (info->callback) {
+               GetMimePartSizeInfo *idle_info;
+
+               idle_info = g_slice_new0 (GetMimePartSizeInfo);
+               idle_info->mail_op = g_object_ref (info->mail_op);
+               idle_info->size = total;
+               idle_info->callback = info->callback;
+               idle_info->userdata = info->userdata;
+               g_idle_add (idle_get_mime_part_size_cb, idle_info);
+       }
+
+       g_idle_add (idle_notify_queue, g_object_ref (info->mail_op));
+
+       g_object_unref (info->mail_op);
+       g_object_unref (stream);
+       g_object_unref (info->mime_part);
+       g_slice_free  (GetMimePartSizeInfo, info);
+
+       return NULL;
+}
+
+void          
+modest_mail_operation_get_mime_part_size (ModestMailOperation *self,
+                                         TnyMimePart *part,
+                                         GetMimePartSizeCallback user_callback,
+                                         gpointer user_data,
+                                         GDestroyNotify notify)
+{
+       GetMimePartSizeInfo *info;
+       ModestMailOperationPrivate *priv;
+       GThread *thread;
+       
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_MIME_PART (part));
+       
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+       info = g_slice_new0 (GetMimePartSizeInfo);
+       info->mail_op = g_object_ref (self);
+       info->mime_part = g_object_ref (part);
+       info->callback = user_callback;
+       info->userdata = user_data;
+
+       thread = g_thread_create (get_mime_part_size_thread, info, FALSE, NULL);
+
+}
+
 static void
 get_msg_cb (TnyFolder *folder, 
            gboolean cancelled, 
@@ -1478,39 +1937,38 @@ get_msg_cb (TnyFolder *folder,
        self = helper->mail_op;
        g_return_if_fail (MODEST_IS_MAIL_OPERATION(self));
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-       
-       helper->pending_ops--;
 
        /* Check errors and cancel */
        if (*error) {
                priv->error = g_error_copy (*error);
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-               goto out;
-       }
-       if (cancelled) {
+       } else if (cancelled) {
                priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
                             _("Error trying to refresh the contents of %s"),
                             tny_folder_get_name (folder));
-               goto out;
+       } else {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
        }
 
-       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-
-       /* If user defined callback function was defined, call it */
+       /* If user defined callback function was defined, call it even
+          if the operation failed*/
        if (helper->user_callback) {
-               helper->user_callback (self, NULL, msg, helper->user_data);
+               /* This callback is called into an iddle by tinymail,
+                  and idles are not in the main lock */
+               gdk_threads_enter ();
+               helper->user_callback (self, helper->header, msg, helper->user_data);
+               gdk_threads_leave ();   
        }
 
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (self);
        /* Free */
- out:
-       if (helper->pending_ops == 0) {
-               g_slice_free (GetMsgAsyncHelper, helper);
+       g_object_unref (helper->mail_op);
+       g_object_unref (helper->header);
+       g_slice_free (GetMsgAsyncHelper, helper);
                
-               /* Notify about operation end */
-               modest_mail_operation_notify_end (self);        
-       }
 }
 
 static void     
@@ -1532,13 +1990,27 @@ get_msg_status_cb (GObject *obj,
        self = helper->mail_op;
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       if ((status->position == 1) && (status->of_total == 100))
+       if(priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+               TnyFolder *folder = tny_header_get_folder (helper->header);
+               if (folder) {
+                       TnyAccount *account;
+                       account = tny_folder_get_account (folder);
+                       if (account) {
+                               tny_account_cancel (account);
+                               g_object_unref (account);
+                       }
+                       g_object_unref (folder);
+               }
+              
                return;
+       }
 
        priv->done = 1;
        priv->total = 1;
 
        state = modest_mail_operation_clone_state (self);
+       state->bytes_done = status->position;
+       state->bytes_total = status->of_total;
        g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
        g_slice_free (ModestMailOperationState, state);
 }
@@ -1572,8 +2044,11 @@ notify_get_msgs_full (gpointer data)
 
        info = (NotifyGetMsgsInfo *) data;      
 
-       /* Call the user callback */
+       /* Call the user callback. Idles are not in the main lock, so
+          lock it */
+       gdk_threads_enter ();
        info->user_callback (info->mail_op, info->header, info->msg, info->user_data);
+       gdk_threads_leave ();
 
        g_slice_free (NotifyGetMsgsInfo, info);
 
@@ -1591,8 +2066,11 @@ get_msgs_full_destroyer (gpointer data)
 
        info = (GetFullMsgsInfo *) data;
 
-       if (info->notify)
+       if (info->notify) {
+               gdk_threads_enter ();   
                info->notify (info->user_data);
+               gdk_threads_leave ();
+       }
 
        /* free */
        g_object_unref (info->headers);
@@ -1652,7 +2130,7 @@ get_msgs_full_thread (gpointer thr_user_data)
                                                         info_notify, NULL);
                                }
                                g_object_unref (msg);
-                       }
+                       } 
                } else {
                        /* Set status failed and set an error */
                        priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
@@ -1669,7 +2147,7 @@ get_msgs_full_thread (gpointer thr_user_data)
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 
        /* Notify about operation end */
-       g_idle_add (notify_update_account_queue, g_object_ref (info->mail_op));
+       g_idle_add (idle_notify_queue, g_object_ref (info->mail_op));
 
        /* Free thread resources. Will be called after all previous idles */
        g_idle_add_full (G_PRIORITY_DEFAULT_IDLE + 1, get_msgs_full_destroyer, info, NULL);
@@ -1766,9 +2244,8 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 
 
 void 
-modest_mail_operation_remove_msg (ModestMailOperation *self,
-                                 TnyHeader *header,
-                                 gboolean remove_to_trash)
+modest_mail_operation_remove_msg (ModestMailOperation *self,  TnyHeader *header,
+                                 gboolean remove_to_trash /*ignored*/)
 {
        TnyFolder *folder;
        ModestMailOperationPrivate *priv;
@@ -1776,6 +2253,9 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_HEADER (header));
 
+       if (remove_to_trash)
+               g_warning ("remove to trash is not implemented");
+
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
        folder = tny_header_get_folder (header);
 
@@ -1784,44 +2264,22 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
 
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
-       /* Delete or move to trash */
-       if (remove_to_trash) {
-               TnyFolder *trash_folder;
-               TnyStoreAccount *store_account;
-
-               store_account = TNY_STORE_ACCOUNT (modest_tny_folder_get_account (folder));
-               trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(store_account),
-                                                                     TNY_FOLDER_TYPE_TRASH);
-               if (trash_folder) {
-                       TnyList *headers;
 
-                       /* Create list */
-                       headers = tny_simple_list_new ();
-                       tny_list_append (headers, G_OBJECT (header));
-                       g_object_unref (header);
-
-                       /* Move to trash */
-                       modest_mail_operation_xfer_msgs (self, headers, trash_folder, TRUE, NULL, NULL);
-                       g_object_unref (headers);
-/*                     g_object_unref (trash_folder); */
-               } else {
-                       ModestMailOperationPrivate *priv;
-
-                       /* Set status failed and set an error */
-                       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-                       g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                                    MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
-                                    _("Error trying to delete a message. Trash folder not found"));
-               }
-
-               g_object_unref (G_OBJECT (store_account));
-       } else {
-               tny_folder_remove_msg (folder, header, &(priv->error));
-               if (!priv->error)
-                       tny_folder_sync(folder, TRUE, &(priv->error));
+       tny_folder_remove_msg (folder, header, &(priv->error));
+       if (!priv->error) {
+               tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
+               tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+
+               if (TNY_IS_CAMEL_IMAP_FOLDER (folder))
+                       tny_folder_sync(folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */
+               else if (TNY_IS_CAMEL_POP_FOLDER (folder))
+                       tny_folder_sync(folder, TRUE, &(priv->error)); /* TRUE --> expunge */
+               else
+                       /* lcoal folders */
+                       tny_folder_sync(folder, TRUE, &(priv->error)); /* TRUE --> expunge */
        }
-
+       
+       
        /* Set status */
        if (!priv->error)
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
@@ -1855,9 +2313,6 @@ transfer_msgs_status_cb (GObject *obj,
        self = helper->mail_op;
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       if ((status->position == 1) && (status->of_total == 100))
-               return;
-
        priv->done = status->position;
        priv->total = status->of_total;
 
@@ -1894,9 +2349,14 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
        }
 
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (self);
+
        /* If user defined callback function was defined, call it */
        if (helper->user_callback) {
+               gdk_threads_enter ();
                helper->user_callback (priv->source, helper->user_data);
+               gdk_threads_leave ();
        }
 
        /* Free */
@@ -1906,8 +2366,6 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer
        g_slice_free   (XFerMsgAsyncHelper, helper);
        g_object_unref (folder);
 
-       /* Notify about operation end */
-       modest_mail_operation_notify_end (self);
 }
 
 void
@@ -1924,6 +2382,9 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
        XFerMsgAsyncHelper *helper;
        TnyHeader *header;
        ModestTnyFolderRules rules;
+       const gchar *id1 = NULL;
+       const gchar *id2 = NULL;
+       gboolean same_folder = FALSE;
 
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_LIST (headers));
@@ -1936,15 +2397,40 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 
        /* Apply folder rules */
        rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
-
        if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
                /* Set status failed and set an error */
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
-                            _("FIXME: folder does not accept msgs"));
+                            _CS("ckct_ib_unable_to_paste_here"));
+               /* Notify the queue */
+               modest_mail_operation_notify_end (self);
+               return;
+       }
+               
+       /* Get source folder */
+       iter = tny_list_create_iterator (headers);
+       header = TNY_HEADER (tny_iterator_get_current (iter));
+       src_folder = tny_header_get_folder (header);
+       g_object_unref (header);
+       g_object_unref (iter);
+
+       /* Check folder source and destination */
+       id1 = tny_folder_get_id (src_folder);
+       id2 = tny_folder_get_id (TNY_FOLDER(folder));
+       same_folder = !g_ascii_strcasecmp (id1, id2);
+       if (same_folder) {
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER,
+                            _("mcen_ib_unable_to_copy_samefolder"));
+               
                /* Notify the queue */
                modest_mail_operation_notify_end (self);
+               
+               /* Free */
+               g_object_unref (src_folder);            
                return;
        }
 
@@ -1956,13 +2442,6 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
        helper->user_callback = user_callback;
        helper->user_data = user_data;
 
-       /* Get source folder */
-       iter = tny_list_create_iterator (headers);
-       header = TNY_HEADER (tny_iterator_get_current (iter));
-       src_folder = tny_header_get_folder (header);
-       g_object_unref (header);
-       g_object_unref (iter);
-
        /* Get account and set it into mail_operation */
        priv->account = modest_tny_folder_get_account (src_folder);
 
@@ -2007,11 +2486,13 @@ on_refresh_folder (TnyFolder   *folder,
        }
 
        priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-
  out:
        /* Call user defined callback, if it exists */
-       if (helper->user_callback)
-               helper->user_callback (priv->source, folder, helper->user_data);
+       if (helper->user_callback) {
+               gdk_threads_enter ();
+               helper->user_callback (self, folder, helper->user_data);
+               gdk_threads_leave ();
+       }
 
        /* Free */
        g_object_unref (helper->mail_op);
@@ -2096,7 +2577,20 @@ static void
 modest_mail_operation_notify_end (ModestMailOperation *self)
 {
        ModestMailOperationState *state;
+       ModestMailOperationPrivate *priv = NULL;
+
+       g_return_if_fail (self);
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
+       /* Set the account back to not busy */
+       if (priv->account_name) {
+               modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr(), 
+                                                    priv->account_name, FALSE);
+               g_free(priv->account_name);
+               priv->account_name = NULL;
+       }
+       
        /* Notify the observers about the mail opertation end */
        state = modest_mail_operation_clone_state (self);
        g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);