* Renamed a function
[modest] / src / modest-mail-operation.c
index f57bd80..4f0f942 100644 (file)
@@ -27,8 +27,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "modest-mail-operation.h"
-/* include other impl specific header files */
 #include <string.h>
 #include <stdarg.h>
 #include <tny-mime-part.h>
 #include <tny-folder-store.h>
 #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>
+#include <tny-folder-observer.h>
 #include <camel/camel-stream-mem.h>
 #include <glib/gi18n.h>
+#include "modest-platform.h"
 #include <modest-tny-account.h>
 #include <modest-tny-send-queue.h>
 #include <modest-runtime.h>
 #include "modest-text-utils.h"
 #include "modest-tny-msg.h"
+#include "modest-tny-folder.h"
+#include "modest-tny-account-store.h"
 #include "modest-tny-platform-factory.h"
 #include "modest-marshal.h"
 #include "modest-error.h"
+#include "modest-mail-operation.h"
+
+#define KB 1024
+
+/* 
+ * Remove all these #ifdef stuff when the tinymail's idle calls become
+ * locked
+ */
+#define TINYMAIL_IDLES_NOT_LOCKED_YET 1
 
 /* 'private'/'protected' functions */
 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     update_folders_cb    (TnyFolderStore *self, 
-                                     TnyList *list, 
-                                     GError **err, 
-                                     gpointer user_data);
+static void     get_msg_cb (TnyFolder *folder, 
+                           gboolean cancelled, 
+                           TnyMsg *msg, 
+                           GError *rr, 
+                           gpointer user_data);
+
+static void     get_msg_status_cb (GObject *obj,
+                                  TnyStatus *status,  
+                                  gpointer user_data);
+
+static void     modest_mail_operation_notify_end (ModestMailOperation *self);
 
 enum _ModestMailOperationSignals 
 {
@@ -68,38 +91,86 @@ enum _ModestMailOperationSignals
 
 typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate;
 struct _ModestMailOperationPrivate {
+       TnyAccount                 *account;
+       gchar                                                                            *account_name;
        guint                      done;
        guint                      total;
-       ModestMailOperationStatus  status;
+       GObject                   *source;
        GError                    *error;
+       ErrorCheckingUserCallback  error_checking;
+       gpointer                   error_checking_user_data;
+       ModestMailOperationStatus  status;      
+       ModestMailOperationTypeOperation op_type;
 };
 
 #define MODEST_MAIL_OPERATION_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                    MODEST_TYPE_MAIL_OPERATION, \
                                                    ModestMailOperationPrivate))
 
-#define CHECK_EXCEPTION(priv, new_status, op)  if (priv->error) {\
+#define CHECK_EXCEPTION(priv, new_status)  if (priv->error) {\
                                                    priv->status = new_status;\
-                                                   op;\
                                                }
 
-typedef struct _RefreshFolderAsyncHelper
-{
+typedef struct _GetMsgAsyncHelper {    
        ModestMailOperation *mail_op;
-       TnyIterator *iter;
-       guint failed;
-       guint canceled;
+       TnyHeader *header;
+       GetMsgAsyncUserCallback user_callback;  
+       gpointer user_data;
+} GetMsgAsyncHelper;
 
-} RefreshFolderAsyncHelper;
+typedef struct _RefreshAsyncHelper {   
+       ModestMailOperation *mail_op;
+       RefreshAsyncUserCallback user_callback; 
+       gpointer user_data;
+} RefreshAsyncHelper;
 
 typedef struct _XFerMsgAsyncHelper
 {
        ModestMailOperation *mail_op;
        TnyList *headers;
        TnyFolder *dest_folder;
-
+       XferMsgsAsynUserCallback user_callback; 
+       gboolean delete;
+       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;
@@ -154,8 +225,9 @@ modest_mail_operation_class_init (ModestMailOperationClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ModestMailOperationClass, progress_changed),
                              NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID,
-                             G_TYPE_NONE, 0);
+                             g_cclosure_marshal_VOID__POINTER,
+                             G_TYPE_NONE, 1, G_TYPE_POINTER);
+
 }
 
 static void
@@ -165,10 +237,15 @@ modest_mail_operation_init (ModestMailOperation *obj)
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
 
-       priv->status   = MODEST_MAIL_OPERATION_STATUS_INVALID;
-       priv->error    = NULL;
-       priv->done     = 0;
-       priv->total    = 0;
+       priv->account        = NULL;
+       priv->status         = MODEST_MAIL_OPERATION_STATUS_INVALID;
+       priv->op_type        = MODEST_MAIL_OPERATION_TYPE_UNKNOWN;
+       priv->error          = NULL;
+       priv->done           = 0;
+       priv->total          = 0;
+       priv->source         = NULL;
+       priv->error_checking = NULL;
+       priv->error_checking_user_data = NULL;
 }
 
 static void
@@ -178,212 +255,109 @@ modest_mail_operation_finalize (GObject *obj)
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
 
+       
+       
        if (priv->error) {
                g_error_free (priv->error);
                priv->error = NULL;
        }
+       if (priv->source) {
+               g_object_unref (priv->source);
+               priv->source = NULL;
+       }
+       if (priv->account) {
+               g_object_unref (priv->account);
+               priv->account = NULL;
+       }
+
 
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
 ModestMailOperation*
-modest_mail_operation_new (void)
+modest_mail_operation_new (ModestMailOperationTypeOperation op_type, 
+                          GObject *source)
 {
-       return MODEST_MAIL_OPERATION(g_object_new(MODEST_TYPE_MAIL_OPERATION, NULL));
-}
+       ModestMailOperation *obj;
+       ModestMailOperationPrivate *priv;
+               
+       obj = MODEST_MAIL_OPERATION(g_object_new(MODEST_TYPE_MAIL_OPERATION, NULL));
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
 
+       priv->op_type = op_type;
+       if (source != NULL)
+               priv->source = g_object_ref(source);
 
-void
-modest_mail_operation_send_mail (ModestMailOperation *self,
-                                TnyTransportAccount *transport_account,
-                                TnyMsg* msg)
+       return obj;
+}
+
+ModestMailOperation*
+modest_mail_operation_new_with_error_handling (ModestMailOperationTypeOperation op_type,
+                                              GObject *source,
+                                              ErrorCheckingUserCallback error_handler,
+                                              gpointer user_data)
 {
-       TnySendQueue *send_queue;
-       
-       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));
+       ModestMailOperation *obj;
+       ModestMailOperationPrivate *priv;
+               
+       obj = modest_mail_operation_new (op_type, source);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
        
-       send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account));
-       if (!TNY_IS_SEND_QUEUE(send_queue))
-               g_printerr ("modest: could not find send queue for account\n");
-       else {
-               GError *err = NULL;
-               tny_send_queue_add (send_queue, msg, &err);
-               if (err) {
-                       g_printerr ("modest: error adding msg to send queue: %s\n",
-                                   err->message);
-                       g_error_free (err);
-               } else
-                       g_message ("modest: message added to send queue");
-       }
+       g_return_val_if_fail (error_handler != NULL, obj);
+       priv->error_checking = error_handler;
 
-       /* Notify the queue */
-       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+       return obj;
 }
 
 void
-modest_mail_operation_send_new_mail (ModestMailOperation *self,
-                                    TnyTransportAccount *transport_account,
-                                    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)
+modest_mail_operation_execute_error_handler (ModestMailOperation *self)
 {
-       TnyMsg *new_msg;
-       ModestMailOperationPrivate *priv = NULL;
-       /* GList *node = NULL; */
-
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
-
+       ModestMailOperationPrivate *priv;
+       
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       g_return_if_fail(priv->status != MODEST_MAIL_OPERATION_STATUS_SUCCESS);     
 
-       /* Check parametters */
-       if (to == NULL) {
-               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_MISSING_PARAMETER,
-                            _("Error trying to send a mail. You need to set at least one recipient"));
-               return;
-       }
-
-       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;
-       }
-
-       /* Call mail operation */
-       modest_mail_operation_send_mail (self, transport_account, new_msg);
-
-       /* Free */
-       g_object_unref (G_OBJECT (new_msg));
+       if (priv->error_checking != NULL)
+               priv->error_checking (self, priv->error_checking_user_data);
 }
 
-static void
-recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all_folders)
-{
-       TnyIterator *iter;
-       TnyList *folders = tny_simple_list_new ();
-
-       tny_folder_store_get_folders (store, folders, query, NULL);
-       iter = tny_list_create_iterator (folders);
-
-       while (!tny_iterator_is_done (iter)) {
-
-               TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter);
-
-               tny_list_prepend (all_folders, G_OBJECT (folder));
 
-               recurse_folders (folder, query, all_folders);
-           
-               g_object_unref (G_OBJECT (folder));
+ModestMailOperationTypeOperation
+modest_mail_operation_get_type_operation (ModestMailOperation *self)
+{
+       ModestMailOperationPrivate *priv;
 
-               tny_iterator_next (iter);
-       }
-        g_object_unref (G_OBJECT (iter));
-        g_object_unref (G_OBJECT (folders));
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       
+       return priv->op_type;
 }
 
-static void
-update_folders_cb (TnyFolderStore *folder_store, TnyList *list, GError **err, gpointer user_data)
+gboolean 
+modest_mail_operation_is_mine (ModestMailOperation *self, 
+                              GObject *me)
 {
-       ModestMailOperation *self;
        ModestMailOperationPrivate *priv;
-       TnyIterator *iter;
-       TnyList *all_folders;
-       
-       self  = MODEST_MAIL_OPERATION (user_data);
-       priv  = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
-
-       if (*err) {
-               priv->error = g_error_copy (*err);
-               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-               goto out;
-       }
-
-       /* Get all the folders We can do it synchronously because
-          we're already running in a different thread than the UI */
-       all_folders = tny_list_copy (list);
-       iter = tny_list_create_iterator (all_folders);
-       while (!tny_iterator_is_done (iter)) {
-               TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter));
-
-               recurse_folders (folder, NULL, all_folders);
-               tny_iterator_next (iter);
-       }
-       g_object_unref (G_OBJECT (iter));
-
-       /* Refresh folders */
-       iter = tny_list_create_iterator (all_folders);
-       priv->total = tny_list_get_length (all_folders);
-
-       while (!tny_iterator_is_done (iter) && !priv->error) {
-
-               TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter));
-
-               /* Refresh the folder */
-               tny_folder_refresh (TNY_FOLDER (folder), &(priv->error));
-
-               if (priv->error) {
-                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-               } else {        
-                       /* Update status and notify */
-                       priv->done++;
-                       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
-               }
-    
-               g_object_unref (G_OBJECT (folder));
-           
-               tny_iterator_next (iter);
-       }
-
-       g_object_unref (G_OBJECT (iter));
- out:
-       g_object_unref (G_OBJECT (list));
-
-       /* Check if the operation was a success */
-       if (priv->done == priv->total && !priv->error)
-               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 
-       /* Free */
-       g_object_unref (G_OBJECT (folder_store));
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       if (priv->source == NULL) return FALSE;
 
-       /* Notify the queue */
-       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+       return priv->source == me;
 }
 
-gboolean
-modest_mail_operation_update_account (ModestMailOperation *self,
-                                     TnyStoreAccount *store_account)
+GObject *
+modest_mail_operation_get_source (ModestMailOperation *self)
 {
        ModestMailOperationPrivate *priv;
-       TnyList *folders;
-
-       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE);
-       g_return_val_if_fail (TNY_IS_STORE_ACCOUNT(store_account), FALSE);
-
-       /* Pick async call reference */
-       g_object_ref (store_account);
 
+       g_return_val_if_fail (self, NULL);
+       
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-
-       priv->total = 0;
-       priv->done  = 0;
-       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
-
-       /* Get subscribed folders & refresh them */
-       folders = TNY_LIST (tny_simple_list_new ());
-
-       tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account),
-                                           folders, update_folders_cb, NULL, self);
+       if (!priv) {
+               g_warning ("BUG: %s: priv == NULL", __FUNCTION__);
+               return NULL;
+       }
        
-       return TRUE;
+       return g_object_ref (priv->source);
 }
 
 ModestMailOperationStatus
@@ -396,6 +370,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;
 }
 
@@ -408,14 +387,40 @@ 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;
 }
 
 gboolean 
 modest_mail_operation_cancel (ModestMailOperation *self)
 {
-       /* TODO */
-       return TRUE;
+       ModestMailOperationPrivate *priv;
+       gboolean canceled = FALSE;
+
+       g_return_val_if_fail (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 */
+       g_return_val_if_fail (priv->account, FALSE);
+       tny_account_cancel (priv->account);
+
+       return canceled;
 }
 
 guint 
@@ -465,178 +470,1959 @@ modest_mail_operation_is_finished (ModestMailOperation *self)
        return retval;
 }
 
-/* ******************************************************************* */
-/* ************************** STORE  ACTIONS ************************* */
-/* ******************************************************************* */
-
-
-TnyFolder *
-modest_mail_operation_create_folder (ModestMailOperation *self,
-                                    TnyFolderStore *parent,
-                                    const gchar *name)
+guint
+modest_mail_operation_get_id (ModestMailOperation *self)
 {
        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_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0);
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       return priv->done;
+}
 
-       /* Create the folder */
-       new_folder = tny_folder_store_create_folder (parent, name, &(priv->error));
-       CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, return NULL);
+guint 
+modest_mail_operation_set_id (ModestMailOperation *self,
+                             guint id)
+{
+       ModestMailOperationPrivate *priv;
 
-       /* Notify the queue */
-       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0);
 
-       return new_folder;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       return priv->done;
 }
 
-void
-modest_mail_operation_remove_folder (ModestMailOperation *self,
-                                    TnyFolder           *folder,
-                                    gboolean             remove_to_trash)
+/*
+ * Creates an image of the current state of a mail operation, the
+ * caller must free it
+ */
+static ModestMailOperationState *
+modest_mail_operation_clone_state (ModestMailOperation *self)
 {
-       TnyFolderStore *parent;
-       TnyAccount *account;
+       ModestMailOperationState *state;
        ModestMailOperationPrivate *priv;
 
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_FOLDER (folder));
-
+       /* 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);
 
-       /* Get the account */
-       account = tny_folder_get_account (folder);
-
-       /* Delete folder or move to trash */
-       if (remove_to_trash) {
-               TnyFolder *trash_folder, *new_folder;
-               trash_folder = modest_tny_account_get_special_folder (account,
-                                                                     TNY_FOLDER_TYPE_TRASH);
-               /* TODO: error_handling */
-               new_folder = modest_mail_operation_xfer_folder (self, folder, 
-                                                               TNY_FOLDER_STORE (trash_folder), TRUE);
-               g_object_unref (G_OBJECT (new_folder));
-       } else {
-               parent = tny_folder_get_folder_store (folder);
+       if (!priv)
+               return NULL;
 
-               tny_folder_store_remove_folder (parent, folder, &(priv->error));
-               CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, );
+       state = g_slice_new (ModestMailOperationState);
 
-               if (parent)
-                       g_object_unref (G_OBJECT (parent));
-       }
-       g_object_unref (G_OBJECT (account));
+       state->status = priv->status;
+       state->op_type = priv->op_type;
+       state->done = priv->done;
+       state->total = priv->total;
+       state->finished = modest_mail_operation_is_finished (self);
+       state->bytes_done = 0;
+       state->bytes_total = 0;
 
-       /* Notify the queue */
-       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+       return state;
 }
 
+/* ******************************************************************* */
+/* ************************** SEND   ACTIONS ************************* */
+/* ******************************************************************* */
+
 void
-modest_mail_operation_rename_folder (ModestMailOperation *self,
-                                    TnyFolder *folder,
-                                    const gchar *name)
+modest_mail_operation_send_mail (ModestMailOperation *self,
+                                TnyTransportAccount *transport_account,
+                                TnyMsg* msg)
 {
+       TnySendQueue *send_queue = NULL;
        ModestMailOperationPrivate *priv;
-
+       
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_FOLDER_STORE (folder));
-       g_return_if_fail (name);
-
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
+       g_return_if_fail (TNY_IS_MSG (msg));
+       
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       /* FIXME: better error handling */
-       if (strrchr (name, '/') != NULL)
-               goto out;
+       /* Get account and set it into mail_operation */
+       priv->account = g_object_ref (transport_account);
+       priv->done = 1;
+       priv->total = 1;
 
-       /* Rename. Camel handles folder subscription/unsubscription */
-       tny_folder_set_name (folder, name, &(priv->error));
-       CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto out);
+       send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account));
+       if (!TNY_IS_SEND_QUEUE(send_queue)) {
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                            "modest: could not find send queue for account\n");
+       } 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;
+       }
 
- out:
-       /* Notify the queue */
-       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
- }
+       /* TODO: do this in the handler of the "msg-sent"
+          signal.Notify about operation end */
+       modest_mail_operation_notify_end (self);
+}
 
-TnyFolder *
-modest_mail_operation_xfer_folder (ModestMailOperation *self,
-                                  TnyFolder *folder,
-                                  TnyFolderStore *parent,
-                                  gboolean delete_original)
+static gboolean
+idle_create_msg_cb (gpointer idle_data)
 {
-       ModestMailOperationPrivate *priv;
-       TnyFolder *new_folder;
+       CreateMsgIdleInfo *info = (CreateMsgIdleInfo *) idle_data;
 
-       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), NULL);
-       g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
-       g_return_val_if_fail (TNY_IS_FOLDER (folder), NULL);
-
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       /* This is a GDK lock because we are an idle callback and
+        * info->callback can contain Gtk+ code */
 
-       new_folder = tny_folder_copy (folder,
-                                     parent,
-                                     tny_folder_get_name (folder),
-                                     delete_original, 
-                                     &(priv->error));
+       gdk_threads_enter (); /* CHECKED */
+       info->callback (info->mail_op, info->msg, info->userdata);
+       gdk_threads_leave (); /* CHECKED */
 
-       /* Notify the queue */
-       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+       g_object_unref (info->mail_op);
+       if (info->msg)
+               g_object_unref (info->msg);
+       g_slice_free (CreateMsgIdleInfo, info);
 
-       return new_folder;
+       return FALSE;
 }
 
-
-/* ******************************************************************* */
-/* **************************  MSG  ACTIONS  ************************* */
-/* ******************************************************************* */
-
-void 
-modest_mail_operation_remove_msg (ModestMailOperation *self,
-                                 TnyHeader *header,
-                                 gboolean remove_to_trash)
+static gpointer 
+create_msg_thread (gpointer thread_data)
 {
-       TnyFolder *folder;
+       CreateMsgInfo *info = (CreateMsgInfo *) thread_data;
+       TnyMsg *new_msg = NULL;
        ModestMailOperationPrivate *priv;
 
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_HEADER (header));
-
+       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;
+               TnyHeaderFlags flags = 0;
+
+               /* Set priority flags in message */
+               header = tny_msg_get_header (new_msg);
+               if (info->priority_flags != 0)
+                       flags |= info->priority_flags;
+
+               /* Set attachment flags in message */
+               if (info->attachments_list != NULL)
+                       flags |= TNY_HEADER_FLAG_ATTACHMENTS;
+
+               tny_header_set_flags (header, flags);
+               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->bcc  = g_strdup (bcc);
+       info->subject = g_strdup (subject);
+       info->plain_body = g_strdup (plain_body);
+       info->html_body = g_strdup (html_body);
+       info->attachments_list = g_list_copy ((GList *) attachments_list);
+       g_list_foreach (info->attachments_list, (GFunc) g_object_ref, NULL);
+       info->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 *draft_folder = NULL;
+       TnyFolder *outbox_folder = NULL;
+       TnyHeader *header;
+
+       if (!msg) {
+               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;              
+               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_OUTBOX) 
+                       src_folder = outbox_folder;
+               else 
+                       src_folder = draft_folder;
+
+               /* Note: This can fail (with a warning) if the message is not really already in a folder,
+                * because this function requires it to have a UID. */          
+               header = tny_msg_get_header (info->draft_msg);
+               tny_folder_remove_msg (src_folder, header, NULL);
+               tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
+               tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+               g_object_unref (header);
+               g_object_unref (folder);
+       }
+
+end:
+       if (info->draft_msg)
+               g_object_unref (info->draft_msg);
+       if (draft_folder)
+               g_object_unref (draft_folder);
+       if (outbox_folder)
+               g_object_unref (outbox_folder);
+       if (info->transport_account)
+               g_object_unref (info->transport_account);
+       g_slice_free (SendNewMailInfo, info);
+       modest_mail_operation_notify_end (self);
+}
+
+void
+modest_mail_operation_send_new_mail (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)
+{
+       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);
+
+       /* Check parametters */
+       if (to == NULL) {
+               /* 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,
+                            _("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);
+
+}
+
+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)
+{
+       TnyFolder *src_folder = NULL;
+       TnyFolder *folder = NULL;
+       TnyHeader *header = NULL;
+       ModestMailOperationPrivate *priv = NULL;
+       SaveToDraftsInfo *info = (SaveToDraftsInfo *) userdata;
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       if (!msg) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
+                            "modest: failed to create a new msg\n");
+               goto end;
+       }
+
+       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 (!priv->error)
+               tny_folder_add_msg (folder, msg, &(priv->error));
+
+       if ((!priv->error) && (info->draft_msg != NULL)) {
+               header = tny_msg_get_header (info->draft_msg);
+               src_folder = tny_header_get_folder (header); 
+               /* Remove the old draft expunging it */
+               tny_folder_remove_msg (src_folder, header, NULL);
+               tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
+               tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+               tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL);  /* expunge */
+               g_object_unref (header);
+       }
+       
+       if (!priv->error)
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       else
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+
+       if (info->edit_window)
+               modest_msg_edit_window_set_draft (info->edit_window, msg);
+
+
+end:
+       if (folder)
+               g_object_unref (G_OBJECT(folder));
+       if (src_folder)
+               g_object_unref (G_OBJECT(src_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;
+       TnyStoreAccount *account;
+       TnyTransportAccount *transport_account;
+       gint max_size;
+       gint retrieve_limit;
+       gchar *retrieve_type;
+       gchar *account_name;
+       UpdateAccountCallback callback;
+       gpointer user_data;
+       gint new_headers;
+} UpdateAccountInfo;
+
+typedef struct
+{
+       ModestMailOperation *mail_op;
+       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 */
+typedef struct {
+       GObject parent;
+       TnyList *new_headers;
+} InternalFolderObserver;
+
+typedef struct {
+       GObjectClass parent;
+} InternalFolderObserverClass;
+
+static void tny_folder_observer_init (TnyFolderObserverIface *idace);
+
+G_DEFINE_TYPE_WITH_CODE (InternalFolderObserver,
+                        internal_folder_observer,
+                        G_TYPE_OBJECT,
+                        G_IMPLEMENT_INTERFACE(TNY_TYPE_FOLDER_OBSERVER, tny_folder_observer_init));
+
+
+static void
+foreach_add_item (gpointer header, gpointer user_data)
+{
+       tny_list_prepend (TNY_LIST (user_data), 
+                         g_object_ref (G_OBJECT (header)));
+}
+
+/* This is the method that looks for new messages in a folder */
+static void
+internal_folder_observer_update (TnyFolderObserver *self, TnyFolderChange *change)
+{
+       InternalFolderObserver *derived = (InternalFolderObserver *)self;
+       
+       TnyFolderChangeChanged changed;
+
+       changed = tny_folder_change_get_changed (change);
+
+       if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) {
+               TnyList *list;
+
+               /* Get added headers */
+               list = tny_simple_list_new ();
+               tny_folder_change_get_added_headers (change, list);
+
+               /* Add them to the folder observer */
+               tny_list_foreach (list, foreach_add_item, 
+                                 derived->new_headers);
+
+               g_object_unref (G_OBJECT (list));
+       }
+}
+
+static void
+internal_folder_observer_init (InternalFolderObserver *self) 
+{
+       self->new_headers = tny_simple_list_new ();
+}
+static void
+internal_folder_observer_finalize (GObject *object) 
+{
+       InternalFolderObserver *self;
+
+       self = (InternalFolderObserver *) object;
+       g_object_unref (self->new_headers);
+
+       G_OBJECT_CLASS (internal_folder_observer_parent_class)->finalize (object);
+}
+static void
+tny_folder_observer_init (TnyFolderObserverIface *iface) 
+{
+       iface->update_func = internal_folder_observer_update;
+}
+static void
+internal_folder_observer_class_init (InternalFolderObserverClass *klass) 
+{
+       GObjectClass *object_class;
+
+       internal_folder_observer_parent_class = g_type_class_peek_parent (klass);
+       object_class = (GObjectClass*) klass;
+       object_class->finalize = internal_folder_observer_finalize;
+}
+
+/*****************/
+
+static void
+recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all_folders)
+{
+       TnyIterator *iter;
+       TnyList *folders = tny_simple_list_new ();
+
+       tny_folder_store_get_folders (store, folders, query, NULL);
+       iter = tny_list_create_iterator (folders);
+
+       while (!tny_iterator_is_done (iter)) {
+
+               TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter);
+               if (folder) {
+                       tny_list_prepend (all_folders, G_OBJECT (folder));
+                       recurse_folders (folder, query, all_folders);    
+                       g_object_unref (G_OBJECT (folder));
+               }
+
+               tny_iterator_next (iter);
+       }
+        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;
+
+       state = modest_mail_operation_clone_state (mail_op);
+
+       /* This is a GDK lock because we are an idle callback and
+        * the handlers of this signal can contain Gtk+ code */
+
+       gdk_threads_enter (); /* CHECKED */
+       g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+       gdk_threads_leave (); /* CHECKED */
+
+       g_slice_free (ModestMailOperationState, state);
+       
+       return TRUE;
+}
+
+/* 
+ * Issues the "progress-changed" signal and removes the timer. It uses
+ * a lock to ensure that the progress information of the mail
+ * operation is not modified while there are notifications pending
+ */
+static gboolean
+idle_notify_progress_once (gpointer data)
+{
+       ModestPair *pair;
+
+       pair = (ModestPair *) data;
+
+       /* This is a GDK lock because we are an idle callback and
+        * the handlers of this signal can contain Gtk+ code */
+
+       gdk_threads_enter (); /* CHECKED */
+       g_signal_emit (G_OBJECT (pair->first), signals[PROGRESS_CHANGED_SIGNAL], 0, pair->second, NULL);
+       gdk_threads_leave (); /* CHECKED */
+
+       /* Free the state and the reference to the mail operation */
+       g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second);
+       g_object_unref (pair->first);
+
+       return FALSE;
+}
+
+/* 
+ * 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);
+
+       /* 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);
+
+       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;
+}
+
+static gboolean 
+set_last_updated_idle (gpointer data)
+{
+
+       /* This is a GDK lock because we are an idle callback and
+        * modest_account_mgr_set_int can contain 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_int (modest_runtime_get_account_mgr (), 
+                                   (gchar *) data, 
+                                   MODEST_ACCOUNT_LAST_UPDATED, 
+                                   time(NULL), 
+                                   TRUE);
+
+       gdk_threads_leave (); /* CHECKED - please recheck */
+
+       return FALSE;
+}
+
+static gboolean
+idle_update_account_cb (gpointer data)
+{
+       UpdateAccountInfo *idle_info;
+
+       idle_info = (UpdateAccountInfo *) data;
+
+       /* This is a GDK lock because we are an idle callback and
+        * idle_info->callback can contain Gtk+ code */
+
+       gdk_threads_enter (); /* CHECKED */
+       idle_info->callback (idle_info->mail_op,
+                            idle_info->new_headers,
+                            idle_info->user_data);
+       gdk_threads_leave (); /* CHECKED */
+
+       /* 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 = NULL;
+       TnyList *all_folders = NULL;
+       GPtrArray *new_headers = NULL;
+       TnyIterator *iter = NULL;
+       TnyFolderStoreQuery *query = NULL;
+       ModestMailOperationPrivate *priv = NULL;
+       ModestTnySendQueue *send_queue = NULL;
+       gint num_new_headers = 0;
+
+       info = (UpdateAccountInfo *) thr_user_data;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op);
+
+       /* Get account and set it into mail_operation */
+       priv->account = g_object_ref (info->account);
+
+       /*
+        * Previousl, we did this for POP3, to do a logout-login upon send/receive, 
+        * because many POP-servers (like Gmail) do not
+        * show any updates unless we do that.
+        * But that didn't work with gmail anyway, 
+        * and tinymail now takes care of this itself by disconnecting 
+        * automatically after using the connection.
+        */
+       /*
+       if (!first_time && TNY_IS_CAMEL_POP_STORE_ACCOUNT (priv->account)) 
+               tny_camel_pop_store_account_reconnect (TNY_CAMEL_POP_STORE_ACCOUNT(priv->account));
+       */
+
+       /* Get all the folders. We can do it synchronously because
+          we're already running in a different thread than the UI */
+       all_folders = tny_simple_list_new ();
+       query = tny_folder_store_query_new ();
+       tny_folder_store_query_add_item (query, NULL, TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED);
+       tny_folder_store_get_folders (TNY_FOLDER_STORE (info->account),
+                                     all_folders,
+                                     query,
+                                     &(priv->error));
+       if (priv->error) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               goto out;
+       }
+
+       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);
+               }
+               tny_iterator_next (iter);
+       }
+       g_object_unref (G_OBJECT (iter));
+
+       /* Update status and notify. We need to call the notification
+          with a source function in order to call it from the main
+          loop. We need that in order not to get into trouble with
+          Gtk+. We use a timeout in order to provide more status
+          information, because the sync tinymail call does not
+          provide it for the moment */
+       gint timeout = g_timeout_add (100, idle_notify_progress, info->mail_op);
+
+       /* Refresh folders */
+       num_new_headers = 0;
+       new_headers = g_ptr_array_new ();
+       iter = tny_list_create_iterator (all_folders);
+
+       while (!tny_iterator_is_done (iter) && !priv->error && 
+              priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+
+               InternalFolderObserver *observer;
+               TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter));
+
+               /* Refresh the folder */
+               /* Our observer receives notification of new emails during folder refreshes,
+                * so we can use observer->new_headers.
+                */
+               observer = g_object_new (internal_folder_observer_get_type (), NULL);
+               tny_folder_add_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer));
+               
+               /* This gets the status information (headers) from the server.
+                * We use the blocking version, because we are already in a separate 
+                * thread.
+                */
+
+               if (!g_ascii_strcasecmp (info->retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES) || 
+                   !g_ascii_strcasecmp (info->retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES_AND_ATTACHMENTS)) {
+                       TnyIterator *iter;
+
+                       /* If the retrieve type is full messages, refresh and get the messages */
+                       tny_folder_refresh (TNY_FOLDER (folder), &(priv->error));
+
+                       iter = tny_list_create_iterator (observer->new_headers);
+                       while (!tny_iterator_is_done (iter)) {
+                               TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+                                
+                               /* Apply per-message size limits */
+                               if (tny_header_get_message_size (header) < info->max_size)
+                                       g_ptr_array_add (new_headers, g_object_ref (header));
+
+                               g_object_unref (header);
+                               tny_iterator_next (iter);
+                       }
+                       g_object_unref (iter);
+               } else {
+                       /* We do not need to do it the first time
+                          because it's automatically done by the tree
+                          model */
+                       if (G_UNLIKELY (!first_time))
+                               tny_folder_poke_status (TNY_FOLDER (folder));
+               }
+               tny_folder_remove_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer));
+               g_object_unref (observer);
+               observer = NULL;                        
+
+               if (folder)
+                       g_object_unref (G_OBJECT (folder));
+
+               if (priv->error)
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+
+               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->len > 0) {
+               gint msg_num = 0;
+
+               /* Order by date */
+               g_ptr_array_sort (new_headers, (GCompareFunc) compare_headers_by_date);
+
+               /* Apply message count limit */
+               /* If the number of messages exceeds the maximum, ask the
+                * user to download them all,
+                * as per the UI spec "Retrieval Limits" section in 4.4: 
+                */
+               if (new_headers->len > info->retrieve_limit) {
+                       /* TODO: Ask the user, instead of just
+                        * failing, showing
+                        * mail_nc_msg_count_limit_exceeded, with 'Get
+                        * all' and 'Newest only' buttons. */
+                       g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_RETRIEVAL_NUMBER_LIMIT,
+                            "The number of messages to retrieve exceeds the chosen limit for account %s\n", 
+                            tny_account_get_name (TNY_ACCOUNT (info->transport_account)));
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+                       goto out;
+               }
+               
+               priv->done = 0;
+               priv->total = MIN (new_headers->len, info->retrieve_limit);
+               while (msg_num < priv->total) {
+
+                       TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers, msg_num));
+                       TnyFolder *folder = tny_header_get_folder (header);
+                       TnyMsg *msg       = tny_folder_get_msg (folder, header, NULL);
+                       ModestMailOperationState *state;
+                       ModestPair* pair;
+
+                       priv->done++;
+                       /* We can not just use the mail operation because the
+                          values of done and total could change before the
+                          idle is called */
+                       state = modest_mail_operation_clone_state (info->mail_op);
+                       pair = modest_pair_new (g_object_ref (info->mail_op), state, FALSE);
+                       g_idle_add_full (G_PRIORITY_HIGH_IDLE, idle_notify_progress_once,
+                                        pair, (GDestroyNotify) modest_pair_free);
+
+                       g_object_unref (msg);
+                       g_object_unref (folder);
+
+                       msg_num++;
+               }
+       }
+
+       /* Get the number of new headers and free them */
+       num_new_headers = new_headers->len;
+       g_ptr_array_foreach (new_headers, (GFunc) g_object_unref, NULL);
+       g_ptr_array_free (new_headers, FALSE);
+       
+       if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
+               goto out;
+
+       /* Perform send (if operation was not cancelled) */
+       priv->done = 0;
+       priv->total = 0;
+       if (priv->account != NULL) 
+               g_object_unref (priv->account);
+       priv->account = g_object_ref (info->transport_account);
+       
+       send_queue = modest_runtime_get_send_queue (info->transport_account);
+       if (send_queue) {
+               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:
+
+       if (info->callback) {
+               UpdateAccountInfo *idle_info;
+
+               /* This thread is not in the main lock */
+               idle_info = g_malloc0 (sizeof (UpdateAccountInfo));
+               idle_info->mail_op = g_object_ref (info->mail_op);
+               idle_info->new_headers = num_new_headers;
+               idle_info->callback = info->callback;
+               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 */
+       g_object_unref (query);
+       g_object_unref (all_folders);
+       g_object_unref (info->account);
+       g_object_unref (info->transport_account);
+       g_free (info->retrieve_type);
+       g_slice_free (UpdateAccountInfo, info);
+
+       first_time = FALSE;
+
+       return NULL;
+}
+
+gboolean
+modest_mail_operation_update_account (ModestMailOperation *self,
+                                     const gchar *account_name,
+                                     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);
+
+       /* 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 */
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       priv->total = 0;
+       priv->done  = 0;
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+
+       /* Get the Modest account */
+       store_account = (TnyStoreAccount *)
+               modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
+                                                                    account_name,
+                                                                    TNY_ACCOUNT_TYPE_STORE);
+                                                                    
+       /* Make sure that we have a connection, and request one 
+        * if necessary:
+        * TODO: Is there some way to trigger this for every attempt to 
+        * use the network? */
+       if (!modest_platform_connect_and_wait (NULL, TNY_ACCOUNT (store_account)))
+               goto error;
+
+       if (!store_account) {
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                            "cannot get tny store account for %s\n", account_name);
+               goto error;
+       }
+
+       
+       /* Get the transport account, we can not do it in the thread
+          due to some problems with dbus */
+       transport_account = (TnyTransportAccount *)
+               modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(),
+                                                                                   account_name);
+       if (!transport_account) {
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                            "cannot get tny transport account for %s\n", account_name);
+               goto error;
+       }
+
+       /* 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->user_data = user_data;
+
+       /* Get the message size limit */
+       info->max_size  = modest_conf_get_int (modest_runtime_get_conf (), 
+                                              MODEST_CONF_MSG_SIZE_LIMIT, NULL);
+       if (info->max_size == 0)
+               info->max_size = G_MAXINT;
+       else
+               info->max_size = info->max_size * KB;
+
+       /* Get per-account retrieval type */
+       mgr = modest_runtime_get_account_mgr ();
+       info->retrieve_type = modest_account_mgr_get_string (mgr, account_name, 
+                                                            MODEST_ACCOUNT_RETRIEVE, FALSE);
+
+       /* Get per-account message amount retrieval limit */
+       info->retrieve_limit = modest_account_mgr_get_int (mgr, account_name, 
+                                                          MODEST_ACCOUNT_LIMIT_RETRIEVE, FALSE);
+       if (info->retrieve_limit == 0)
+               info->retrieve_limit = G_MAXINT;
+               
+       /* printf ("DEBUG: %s: info->retrieve_limit = %d\n", __FUNCTION__, info->retrieve_limit); */
+
+       /* 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;
+}
+
+/* ******************************************************************* */
+/* ************************** STORE  ACTIONS ************************* */
+/* ******************************************************************* */
+
+
+TnyFolder *
+modest_mail_operation_create_folder (ModestMailOperation *self,
+                                    TnyFolderStore *parent,
+                                    const gchar *name)
+{
+       ModestMailOperationPrivate *priv;
+       TnyFolder *new_folder = NULL;
+
+       TnyList *list = tny_simple_list_new ();
+       TnyFolderStoreQuery *query = tny_folder_store_query_new ();
+
+       g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
+       g_return_val_if_fail (name, NULL);
+       
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       /* Check for already existing folder */
+       tny_folder_store_query_add_item (query, name, TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME);
+       tny_folder_store_get_folders (parent, list, query, NULL);
+       g_object_unref (G_OBJECT (query));
+
+       if (tny_list_get_length (list) > 0) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
+                            _CS("ckdg_ib_folder_already_exists"));
+       }
+
+       g_object_unref (G_OBJECT (list));
+
+       /* Check parent */
+       if (TNY_IS_FOLDER (parent)) {
+               /* Check folder rules */
+               ModestTnyFolderRules rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
+               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,
+                                    _("mail_in_ui_folder_create_error"));
+               }
+       }
+
+       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));
+               CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED);
+               if (!priv->error)
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       }
+
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (self);
+
+       return new_folder;
+}
+
+void
+modest_mail_operation_remove_folder (ModestMailOperation *self,
+                                    TnyFolder           *folder,
+                                    gboolean             remove_to_trash)
+{
+       TnyAccount *account;
+       ModestMailOperationPrivate *priv;
+       ModestTnyFolderRules rules;
+
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_FOLDER (folder));
+       
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       
+       /* Check folder rules */
+       rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
+       if (rules & MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE) {
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+                            _("mail_in_ui_folder_delete_error"));
+               goto end;
+       }
+
+       /* Get the account */
+       account = modest_tny_folder_get_account (folder);
+       priv->account = g_object_ref(account);
+
+       /* Delete folder or move to trash */
+       if (remove_to_trash) {
+               TnyFolder *trash_folder = NULL;
+               trash_folder = modest_tny_account_get_special_folder (account,
+                                                                     TNY_FOLDER_TYPE_TRASH);
+               /* TODO: error_handling */
+               if (trash_folder) {
+                       modest_mail_operation_xfer_folder (self, folder,
+                                                   TNY_FOLDER_STORE (trash_folder), 
+                                                   TRUE, NULL, NULL);
+                       g_object_unref (trash_folder);
+               }
+       } else {
+               TnyFolderStore *parent = tny_folder_get_folder_store (folder);
+
+               tny_folder_store_remove_folder (parent, folder, &(priv->error));
+               CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED);
+
+               if (parent)
+                       g_object_unref (G_OBJECT (parent));
+       }
+       g_object_unref (G_OBJECT (account));
+
+ end:
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (self);
+}
+
+static void
+transfer_folder_status_cb (GObject *obj,
+                          TnyStatus *status,
+                          gpointer user_data)
+{
+       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);
+
+       helper = (XFerMsgAsyncHelper *) user_data;
+       g_return_if_fail (helper != NULL);
+
+       self = helper->mail_op;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       priv->done = status->position;
+       priv->total = status->of_total;
+
+       state = modest_mail_operation_clone_state (self);
+
+       /* This is not a GDK lock because we are a Tinymail callback
+        * which is already GDK locked by Tinymail */
+
+       /* no gdk_threads_enter (), CHECKED */
+
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); 
+
+       /* no gdk_threads_leave (), CHECKED */
+
+       g_slice_free (ModestMailOperationState, state);
+}
+
+
+static void
+transfer_folder_cb (TnyFolder *folder, gboolean cancelled, 
+                   TnyFolderStore *into, 
+                   TnyFolder *new_folder, 
+                   GError *err, 
+                   gpointer user_data)
+{
+       XFerMsgAsyncHelper *helper;
+       ModestMailOperation *self = NULL;
+       ModestMailOperationPrivate *priv = NULL;
+
+       helper = (XFerMsgAsyncHelper *) user_data;
+       g_return_if_fail (helper != NULL);       
+
+       self = helper->mail_op;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       if (err) {
+               priv->error = g_error_copy (err);
+               priv->done = 0;
+               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_OPERATION_CANCELED,
+                            _("Transference of %s was cancelled."),
+                            tny_folder_get_name (folder));
+       } else {
+               priv->done = 1;
+               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) {
+
+               /* 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 (priv->source, helper->user_data);
+               /* no gdk_threads_leave () , CHECKED */
+       }
+
+       /* Free */
+       g_object_unref (helper->mail_op);
+       g_slice_free   (XFerMsgAsyncHelper, helper);
+}
+
+/**
+ *
+ * This function checks if the new name is a valid name for our local
+ * folders account. The new name could not be the same than then name
+ * of any of the mandatory local folders
+ *
+ * We can not rely on tinymail because tinymail does not check the
+ * name of the virtual folders that the account could have in the case
+ * that we're doing a rename (because it directly calls Camel which
+ * knows nothing about our virtual folders). 
+ *
+ * In the case of an actual copy/move (i.e. move/copy a folder between
+ * accounts) tinymail uses the tny_folder_store_create_account which
+ * is reimplemented by our ModestTnyLocalFoldersAccount that indeed
+ * checks the new name of the folder, so this call in that case
+ * wouldn't be needed. *But* NOTE that if tinymail changes its
+ * implementation (if folder transfers within the same account is no
+ * longer implemented as a rename) this call will allow Modest to work
+ * perfectly
+ *
+ * If the new name is not valid, this function will set the status to
+ * failed and will set also an error in the mail operation
+ */
+static gboolean
+new_name_valid_if_local_account (ModestMailOperationPrivate *priv,
+                                TnyFolderStore *into,
+                                const gchar *new_name)
+{
+       if (TNY_IS_ACCOUNT (into) && 
+           modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (into)) &&
+           modest_tny_local_folders_account_folder_name_in_use (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (into),
+                                                                new_name)) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+                            _("FIXME: folder name already in use"));
+               return FALSE;
+       } else
+               return TRUE;
+}
+
+/**
+ * This function checks if @ancestor is an acestor of @folder and
+ * returns TRUE in that case
+ */
+static gboolean
+folder_is_ancestor (TnyFolder *folder,
+                   TnyFolderStore *ancestor)
+{
+       TnyFolder *tmp = NULL;
+       gboolean found = FALSE;
+
+       tmp = folder;
+       while (!found && tmp && !TNY_IS_ACCOUNT (tmp)) {
+               TnyFolderStore *folder_store;
+
+               folder_store = tny_folder_get_folder_store (tmp);
+               if (ancestor == folder_store)
+                       found = TRUE;
+               else
+                       tmp = g_object_ref (folder_store);
+               g_object_unref (folder_store);
+       }
+       return found;
+}
+
+void
+modest_mail_operation_xfer_folder (ModestMailOperation *self,
+                                  TnyFolder *folder,
+                                  TnyFolderStore *parent,
+                                  gboolean delete_original,
+                                  XferMsgsAsynUserCallback user_callback,
+                                  gpointer user_data)
+{
+       ModestMailOperationPrivate *priv = NULL;
+       ModestTnyFolderRules parent_rules = 0, rules; 
+       XFerMsgAsyncHelper *helper = NULL;
+       const gchar *folder_name = 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_STORE (parent));
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       folder_name = tny_folder_get_name (folder);
+
+       /* Get account and set it into mail_operation */
+       priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+
+       /* Get folder rules */
+       rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
+       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 ((gpointer) parent == (gpointer) folder ||
+           (!TNY_IS_FOLDER_STORE (parent)) || 
+           (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE)) {
+
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+                            _("mail_in_ui_folder_move_target_error"));
+
+               /* Notify the queue */
+               modest_mail_operation_notify_end (self);
+
+       } else if (TNY_IS_FOLDER (parent) && 
+                  (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE)) {
+
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+                            _("FIXME: parent folder does not accept new folders"));
+
+               /* Notify the queue */
+               modest_mail_operation_notify_end (self);
+
+       } else if (TNY_IS_FOLDER (parent) &&
+                  TNY_IS_FOLDER_STORE (folder) &&
+                  folder_is_ancestor (TNY_FOLDER (parent), TNY_FOLDER_STORE (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_FOLDER_RULES,
+                            _("mail_in_ui_folder_copy_target_error"));
+
+               /* Notify the queue */
+               modest_mail_operation_notify_end (self);
+
+       } else if (TNY_IS_FOLDER_STORE (parent) &&
+                  modest_tny_folder_has_subfolder_with_name (parent, folder_name)) {
+               /* Check that the new folder name is not used by any
+                   parent subfolder */
+
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+                            _("mail_in_ui_folder_move_target_error"));
+
+               /* Notify the queue */
+               modest_mail_operation_notify_end (self);
+               
+       } else if (!(new_name_valid_if_local_account (priv, parent, folder_name))) {
+               /* Check that the new folder name is not used by any
+                  special local folder */
+
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+                            _("mail_in_ui_folder_move_target_error"));
+
+               /* Notify the queue */
+               modest_mail_operation_notify_end (self);
+       } else {
+               /* Create the helper */
+               helper = g_slice_new0 (XFerMsgAsyncHelper);
+               helper->mail_op = g_object_ref(self);
+               helper->dest_folder = NULL;
+               helper->headers = NULL;
+               helper->user_callback = user_callback;
+               helper->user_data = user_data;
+               
+               /* Move/Copy folder */          
+               tny_folder_copy_async (folder,
+                                      parent,
+                                      tny_folder_get_name (folder),
+                                              delete_original,
+                                      transfer_folder_cb,
+                                      transfer_folder_status_cb,
+                                      helper);
+       } 
+       
+}
+
+void
+modest_mail_operation_rename_folder (ModestMailOperation *self,
+                                    TnyFolder *folder,
+                                    const gchar *name)
+{
+       ModestMailOperationPrivate *priv;
+       ModestTnyFolderRules rules;
+       XFerMsgAsyncHelper *helper;
+
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_FOLDER_STORE (folder));
+       g_return_if_fail (name);
+       
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       /* Get account and set it into mail_operation */
+       priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
+
+       /* 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);
+       } 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 {
+               TnyFolderStore *into;
+
+               into = tny_folder_get_folder_store (folder);    
+
+               /* Check that the new folder name is not used by any
+                  special local folder */
+               if (new_name_valid_if_local_account (priv, into, name)) {
+                       /* 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 */
+                       tny_folder_copy_async (folder, into, name, TRUE,
+                                              transfer_folder_cb,
+                                              transfer_folder_status_cb,
+                                              helper);
+               } else {
+                       modest_mail_operation_notify_end (self);
+               }
+               g_object_unref (into);
+       }
+}
+
+/* ******************************************************************* */
+/* **************************  MSG  ACTIONS  ************************* */
+/* ******************************************************************* */
+
+void modest_mail_operation_get_msg (ModestMailOperation *self,
+                                   TnyHeader *header,
+                                   GetMsgAsyncUserCallback user_callback,
+                                   gpointer user_data)
+{
+       GetMsgAsyncHelper *helper = NULL;
+       TnyFolder *folder;
+       ModestMailOperationPrivate *priv;
+       
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_HEADER (header));
+       
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
        folder = tny_header_get_folder (header);
 
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
-       /* Delete or move to trash */
-       if (remove_to_trash) {
-               TnyFolder *trash_folder;
-               TnyStoreAccount *store_account;
+       /* Get message from folder */
+       if (folder) {
+               /* Get account and set it into mail_operation */
+               priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
+               
+               /* 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;
+
+               helper = g_slice_new0 (GetMsgAsyncHelper);
+               helper->mail_op = self;
+               helper->user_callback = user_callback;
+               helper->user_data = user_data;
+               helper->header = g_object_ref (header);
+
+               // The callback's reference so that the mail op is not
+               // finalized until the async operation is completed even if
+               // the user canceled the request meanwhile.
+               g_object_ref (G_OBJECT (helper->mail_op));
+
+               tny_folder_get_msg_async (folder, header, get_msg_cb, get_msg_status_cb, helper);
 
-               store_account = TNY_STORE_ACCOUNT (tny_folder_get_account (folder));
-               trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(store_account),
-                                                                     TNY_FOLDER_TYPE_TRASH);
-               if (trash_folder) {
-                       modest_mail_operation_xfer_msg (self, header, trash_folder, TRUE);
-/*                     g_object_unref (trash_folder); */
-               } else {
-                       ModestMailOperationPrivate *priv;
+               g_object_unref (G_OBJECT (folder));
+       } else {
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                            _("Error trying to get a message. No folder found for header"));
+
+               /* Notify the queue */
+               modest_mail_operation_notify_end (self);
+       }
+}
+
+static 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;
+
+       g_return_if_fail (status != NULL);
+       g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_GET_MSG);
+
+       helper = (GetMsgAsyncHelper *) user_data;
+       g_return_if_fail (helper != NULL);       
+
+       self = helper->mail_op;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       priv->done = 1;
+       priv->total = 1;
+
+       state = modest_mail_operation_clone_state (self);
+       state->bytes_done = status->position;
+       state->bytes_total = status->of_total;
+
+       /* 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);
+}
+
+/****************************************************/
+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)
+{
+       GetFullMsgsInfo *info;
+       ModestMailOperationPrivate *priv = NULL;
+       TnyIterator *iter = NULL;
+       
+       info = (GetFullMsgsInfo *) thr_user_data;       
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
+
+       iter = tny_list_create_iterator (info->headers);
+       while (!tny_iterator_is_done (iter)) { 
+               TnyHeader *header;
+               TnyFolder *folder;
+               
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               folder = tny_header_get_folder (header);
+                               
+               /* 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));
+
+                       if (msg) {
+                               ModestMailOperationState *state;
+                               ModestPair *pair;
+
+                               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 = 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"));
+                                    "Error trying to get a message. No folder found for header");
+               }
+
+               if (header)
+                       g_object_unref (header);
+               
+               tny_iterator_next (iter);
+       }
+
+       /* 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));
+
+       /* 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);
+
+       return NULL;
+}
+
+void 
+modest_mail_operation_get_msgs_full (ModestMailOperation *self,
+                                    TnyList *header_list, 
+                                    GetMsgAsyncUserCallback user_callback,
+                                    gpointer user_data,
+                                    GDestroyNotify notify)
+{
+       TnyHeader *header = NULL;
+       TnyFolder *folder = NULL;
+       GThread *thread;
+       ModestMailOperationPrivate *priv = NULL;
+       GetFullMsgsInfo *info = NULL;
+       gboolean size_ok = TRUE;
+       gint max_size;
+       TnyIterator *iter = NULL;
+       
+       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;
+       priv->done = 0;
+       priv->total = tny_list_get_length(header_list);
+
+       /* Get account and set it into mail_operation */
+       if (tny_list_get_length (header_list) >= 1) {
+               iter = tny_list_create_iterator (header_list);
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               if (header) {
+                       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;
                }
+       }
 
-               g_object_unref (G_OBJECT (store_account));
+       /* 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 {
-               tny_folder_remove_msg (folder, header, &(priv->error));
-               if (!priv->error)
-                       tny_folder_sync(folder, TRUE, &(priv->error));
+               max_size = max_size * KB;
+       }
+
+       /* 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);
+       }
+
+       if (size_ok) {
+               /* Create the info */
+               info = g_slice_new0 (GetFullMsgsInfo);
+               info->mail_op = self;
+               info->user_callback = user_callback;
+               info->user_data = user_data;
+               info->headers = g_object_ref (header_list);
+               info->notify = notify;
+
+               thread = g_thread_create (get_msgs_full_thread, info, FALSE, NULL);
+       } 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);
        }
+}
+
+
+void 
+modest_mail_operation_remove_msg (ModestMailOperation *self,  TnyHeader *header,
+                                 gboolean remove_to_trash /*ignored*/)
+{
+       TnyFolder *folder;
+       ModestMailOperationPrivate *priv;
+
+       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);
+
+       /* Get account and set it into mail_operation */
+       priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
+
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
+       /* remove message from folder */
+       tny_folder_remove_msg (folder, header, &(priv->error));
+/*     if (!priv->error) { */
+/*             tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED); */
+/*             tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); */
+
+/*             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 *\\/ *\/ */
+/*             else */
+/*                     /\* local folders *\/ */
+/*                     tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /\* TRUE --> expunge *\/ */
+/* /\*                         tny_folder_sync (folder, TRUE, &(priv->error)); /\\* TRUE --> expunge *\\/ *\/ */
+/*     } */
+       
+       
        /* Set status */
        if (!priv->error)
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
@@ -646,96 +2432,235 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
        /* Free */
        g_object_unref (G_OBJECT (folder));
 
-       /* Notify the queue */
-       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (self);
+}
+
+static void
+transfer_msgs_status_cb (GObject *obj,
+                        TnyStatus *status,  
+                        gpointer user_data)
+{
+       XFerMsgAsyncHelper *helper = NULL;
+       ModestMailOperation *self;
+       ModestMailOperationPrivate *priv;
+       ModestMailOperationState *state;
+
+
+       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);       
+
+       self = helper->mail_op;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       priv->done = status->position;
+       priv->total = status->of_total;
+
+       state = modest_mail_operation_clone_state (self);
+
+       /* This is not a GDK lock because we are a Tinymail callback and
+        * Tinymail already acquires the Gdk lock */
+
+       /* no gdk_threads_enter (), CHECKED */
+
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+
+       /* no gdk_threads_leave (), CHECKED */
+
+       g_slice_free (ModestMailOperationState, state);
 }
 
+
 static void
-transfer_msgs_cb (TnyFolder *folder, GError **err, gpointer user_data)
+transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer user_data)
 {
        XFerMsgAsyncHelper *helper;
        ModestMailOperation *self;
        ModestMailOperationPrivate *priv;
+       TnyIterator *iter = NULL;
+       TnyHeader *header = NULL;
 
        helper = (XFerMsgAsyncHelper *) user_data;
        self = helper->mail_op;
+
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
-       if (*err) {
-               priv->error = g_error_copy (*err);
+       if (err) {
+               priv->error = g_error_copy (err);
                priv->done = 0;
-               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               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->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);
+
+                       tny_iterator_next (iter);
+               }
+
+       }
+               
+
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (self);
+
+       /* If user defined callback function was defined, call it */
+       if (helper->user_callback) {
+               /* 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 (priv->source, helper->user_data);
+               /* no gdk_threads_leave (), CHECKED */
+       }
+
        /* Free */
-       g_object_unref (helper->headers);
-       g_object_unref (helper->dest_folder);
-       g_object_unref (folder);
-       g_free (helper);
+       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);
 
-       /* Notify the queue */
-       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
 }
 
 void
-modest_mail_operation_xfer_msg (ModestMailOperation *self,
-                               TnyHeader *header, 
-                               TnyFolder *folder, 
-                               gboolean delete_original)
+modest_mail_operation_xfer_msgs (ModestMailOperation *self,
+                                TnyList *headers, 
+                                TnyFolder *folder, 
+                                gboolean delete_original,
+                                XferMsgsAsynUserCallback user_callback,
+                                gpointer user_data)
 {
-       ModestMailOperationPrivate *priv;
-       TnyFolder *src_folder;
-       TnyList *headers;
-       XFerMsgAsyncHelper *helper;
+       ModestMailOperationPrivate *priv = NULL;
+       TnyIterator *iter = NULL;
+       TnyFolder *src_folder = NULL;
+       XFerMsgAsyncHelper *helper = NULL;
+       TnyHeader *header = NULL;
+       ModestTnyFolderRules rules = 0;
+       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_HEADER (header));
+       g_return_if_fail (TNY_IS_LIST (headers));
        g_return_if_fail (TNY_IS_FOLDER (folder));
 
-       /* Pick references for async calls */
-       g_object_ref (folder);
-
-       headers = tny_simple_list_new ();
-       tny_list_prepend (headers, G_OBJECT (header));
-
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
        priv->total = 1;
        priv->done = 0;
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
-       /* Create the helper */
-       helper = g_malloc0 (sizeof (XFerMsgAsyncHelper));
-       helper->mail_op = self;
-       helper->dest_folder = folder;
-       helper->headers = headers;
+       /* 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,
+                            _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));
+       if (header) {
+               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;
+       }
 
-       src_folder = tny_header_get_folder (header);
+       /* Create the helper */
+       helper = g_slice_new0 (XFerMsgAsyncHelper);
+       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;
+
+       /* Get account and set it into mail_operation */
+       priv->account = modest_tny_folder_get_account (src_folder);
+
+       /* Transfer messages */
        tny_folder_transfer_msgs_async (src_folder, 
                                        headers, 
                                        folder, 
                                        delete_original, 
                                        transfer_msgs_cb, 
+                                       transfer_msgs_status_cb,
                                        helper);
 }
 
+
 static void
 on_refresh_folder (TnyFolder   *folder, 
                   gboolean     cancelled, 
-                  GError     **error,
+                  GError     *error,
                   gpointer     user_data)
 {
-       ModestMailOperation *self;
-       ModestMailOperationPrivate *priv;
+       RefreshAsyncHelper *helper = NULL;
+       ModestMailOperation *self = NULL;
+       ModestMailOperationPrivate *priv = NULL;
 
-       self = MODEST_MAIL_OPERATION (user_data);
+       helper = (RefreshAsyncHelper *) user_data;
+       self = helper->mail_op;
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       if (*error) {
-               priv->error = g_error_copy (*error);
+       g_return_if_fail(priv!=NULL);
+
+       if (error) {
+               priv->error = g_error_copy (error);
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               printf("DEBUG: %s: Operation error:\n %s", __FUNCTION__,
+                      error->message);
                goto out;
        }
 
@@ -745,66 +2670,130 @@ on_refresh_folder (TnyFolder   *folder,
                             MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
                             _("Error trying to refresh the contents of %s"),
                             tny_folder_get_name (folder));
+               printf("DEBUG: %s: Operation cancelled.\n", __FUNCTION__);
                goto out;
        }
 
        priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 
+       /* Call user defined callback, if it exists */
+       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, folder, helper->user_data);
+               /* no gdk_threads_leave (), CHECKED */
+       }
+
  out:
        /* Free */
-       g_object_unref (folder);
+       g_slice_free   (RefreshAsyncHelper, helper);
 
-       /* Notify the queue */
-       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (self);
+       g_object_unref(self);
 }
 
 static void
-on_refresh_folder_status_update (TnyFolder *folder, const gchar *msg,
-                                gint num, gint total,  gpointer user_data)
+on_refresh_folder_status_update (GObject *obj,
+                                TnyStatus *status,
+                                gpointer user_data)
 {
-       ModestMailOperation *self;
-       ModestMailOperationPrivate *priv;
+       RefreshAsyncHelper *helper = NULL;
+       ModestMailOperation *self = NULL;
+       ModestMailOperationPrivate *priv = NULL;
+       ModestMailOperationState *state;
+
+       g_return_if_fail (user_data != NULL);
+       g_return_if_fail (status != NULL);
+       g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_REFRESH);
 
-       /* TODO: if tinymail issues a status update before the
-          callback call then this could happen. If this is true the
-          we must review the design */
-       if (!G_IS_OBJECT (user_data))
-         return;
+       helper = (RefreshAsyncHelper *) user_data;
+       self = helper->mail_op;
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION(self));
 
-       self = MODEST_MAIL_OPERATION (user_data);
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       priv->done = num;
-       priv->total = total;
+       priv->done = status->position;
+       priv->total = status->of_total;
 
-       if (num == 1 && total == 100)
-               return;
+       state = modest_mail_operation_clone_state (self);
+
+       /* This is not a GDK lock because we are a Tinymail callback and
+        * Tinymail already acquires the Gdk lock */
+
+       /* no gdk_threads_enter (), CHECKED */
+
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+
+       /* no gdk_threads_leave (), CHECKED */
 
-       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
+       g_slice_free (ModestMailOperationState, state);
 }
 
 void 
 modest_mail_operation_refresh_folder  (ModestMailOperation *self,
-                                      TnyFolder *folder)
+                                      TnyFolder *folder,
+                                      RefreshAsyncUserCallback user_callback,
+                                      gpointer user_data)
 {
-       ModestMailOperationPrivate *priv;
+       ModestMailOperationPrivate *priv = NULL;
+       RefreshAsyncHelper *helper = NULL;
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       /* Pick a reference */
-       g_object_ref (folder);
-
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
-       /* Refresh the folder */
+       /* Get account and set it into mail_operation */
+       priv->account = modest_tny_folder_get_account  (folder);
+
+       /* Create the helper */
+       helper = g_slice_new0 (RefreshAsyncHelper);
+       helper->mail_op = g_object_ref(self);
+       helper->user_callback = user_callback;
+       helper->user_data = user_data;
+
+       /* Refresh the folder. TODO: tinymail could issue a status
+          updates before the callback call then this could happen. We
+          must review the design */
        tny_folder_refresh_async (folder,
                                  on_refresh_folder,
                                  on_refresh_folder_status_update,
-                                 self);
+                                 helper);
 }
 
-void
-_modest_mail_operation_notify_end (ModestMailOperation *self)
+/**
+ *
+ * It's used by the mail operation queue to notify the observers
+ * attached to that signal that the operation finished. We need to use
+ * that because tinymail does not give us the progress of a given
+ * operation when it finishes (it directly calls the operation
+ * callback).
+ */
+static void
+modest_mail_operation_notify_end (ModestMailOperation *self)
 {
-       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
+       ModestMailOperationState *state;
+       ModestMailOperationPrivate *priv = NULL;
+
+       g_return_if_fail (self);
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       /* Set the account back to not busy */
+       if (priv->account_name) {
+               modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr(), 
+                                                    priv->account_name, FALSE);
+               g_free(priv->account_name);
+               priv->account_name = NULL;
+       }
+       
+       /* Notify the observers about the mail operation end */
+       /* We do not wrapp this emission because we assume that this
+          function is always called from within the main lock */
+       state = modest_mail_operation_clone_state (self);
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+       g_slice_free (ModestMailOperationState, state);
 }