* Fix some detected memory leaks
[modest] / src / modest-mail-operation.c
index 59d3509..320f716 100644 (file)
 #include <tny-folder-store-query.h>
 #include <tny-camel-stream.h>
 #include <tny-simple-list.h>
+#include <tny-send-queue.h>
+#include <tny-status.h>
 #include <camel/camel-stream-mem.h>
 #include <glib/gi18n.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-platform-factory.h"
 #include "modest-marshal.h"
-#include "modest-formatter.h"
 #include "modest-error.h"
 
 /* 'private'/'protected' functions */
@@ -52,38 +56,27 @@ 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     status_update_cb     (TnyFolder *folder, 
-                                     const gchar *what, 
-                                     gint status, 
-                                     gint oftotal,
-                                     gpointer user_data);
-static void     folder_refresh_cb    (TnyFolder *folder, 
-                                     gboolean canceled,
-                                     GError **err,
-                                     gpointer user_data);
 static void     update_folders_cb    (TnyFolderStore *self, 
                                      TnyList *list, 
                                      GError **err, 
                                      gpointer user_data);
-static void     add_attachments      (TnyMsg *msg, 
-                                     GList *attachments_list);
-
-
-static TnyMimePart *         add_body_part    (TnyMsg *msg, 
-                                              const gchar *body,
-                                              const gchar *content_type, 
-                                              gboolean has_attachments);
+static void     update_folders_status_cb (GObject *obj,
+                                         TnyStatus *status,  
+                                         gpointer user_data);
 
+static void     update_process_msg_status_cb (GObject *obj,
+                                             TnyStatus *status,  
+                                             gpointer user_data);
+static void     get_msg_cb (TnyFolder *folder, 
+                           gboolean cancelled, 
+                           TnyMsg *msg, 
+                           GError **err, 
+                           gpointer user_data);
 
-static void        modest_mail_operation_xfer_folder       (ModestMailOperation *self,
-                                                           TnyFolder *folder,
-                                                           TnyFolderStore *parent,
-                                                           gboolean delete_original);
+static void     get_msg_status_cb (GObject *obj,
+                                  TnyStatus *status,  
+                                  gpointer user_data);
 
-static gboolean    modest_mail_operation_xfer_msg          (ModestMailOperation *self,
-                                                           TnyHeader *header, 
-                                                           TnyFolder *folder, 
-                                                           gboolean delete_original);
 
 enum _ModestMailOperationSignals 
 {
@@ -96,13 +89,27 @@ typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate;
 struct _ModestMailOperationPrivate {
        guint                      done;
        guint                      total;
-       ModestMailOperationStatus  status;
+       ModestMailOperationStatus  status;      
+       ModestMailOperationId      id;          
+       GObject                   *source;
        GError                    *error;
 };
+
 #define MODEST_MAIL_OPERATION_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                    MODEST_TYPE_MAIL_OPERATION, \
                                                    ModestMailOperationPrivate))
 
+#define CHECK_EXCEPTION(priv, new_status)  if (priv->error) {\
+                                                   priv->status = new_status;\
+                                               }
+
+typedef struct _GetMsgAsyncHelper {    
+       ModestMailOperation *mail_op;
+       GetMsgAsynUserCallback user_callback;   
+       guint pending_ops;
+       gpointer user_data;
+} GetMsgAsyncHelper;
+
 typedef struct _RefreshFolderAsyncHelper
 {
        ModestMailOperation *mail_op;
@@ -112,9 +119,14 @@ typedef struct _RefreshFolderAsyncHelper
 
 } RefreshFolderAsyncHelper;
 
-/* some utility functions */
-static char * get_content_type(const gchar *s);
-static gboolean is_ascii(const gchar *s);
+typedef struct _XFerMsgAsyncHelper
+{
+       ModestMailOperation *mail_op;
+       TnyList *headers;
+       TnyFolder *dest_folder;
+
+} XFerMsgAsyncHelper;
+
 
 /* globals */
 static GObjectClass *parent_class = NULL;
@@ -164,7 +176,7 @@ modest_mail_operation_class_init (ModestMailOperationClass *klass)
         * Emitted when the progress of a mail operation changes
         */
        signals[PROGRESS_CHANGED_SIGNAL] = 
-               g_signal_new ("progress_changed",
+               g_signal_new ("progress-changed",
                              G_TYPE_FROM_CLASS (gobject_class),
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ModestMailOperationClass, progress_changed),
@@ -181,9 +193,11 @@ modest_mail_operation_init (ModestMailOperation *obj)
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
 
        priv->status   = MODEST_MAIL_OPERATION_STATUS_INVALID;
+       priv->id       = MODEST_MAIL_OPERATION_ID_UNKNOWN;
        priv->error    = NULL;
        priv->done     = 0;
        priv->total    = 0;
+       priv->source = NULL;
 }
 
 static void
@@ -197,14 +211,52 @@ modest_mail_operation_finalize (GObject *obj)
                g_error_free (priv->error);
                priv->error = NULL;
        }
+       if (priv->source) {
+               g_object_unref (priv->source);
+               priv->source = NULL;
+       }
 
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
 ModestMailOperation*
-modest_mail_operation_new (void)
+modest_mail_operation_new (ModestMailOperationId id, 
+                          GObject *source)
+{
+       ModestMailOperation *obj;
+       ModestMailOperationPrivate *priv;
+               
+       obj = MODEST_MAIL_OPERATION(g_object_new(MODEST_TYPE_MAIL_OPERATION, NULL));
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
+
+       priv->id = id;
+       if (source != NULL)
+               priv->source = g_object_ref(source);
+
+       return obj;
+}
+
+
+ModestMailOperationId
+modest_mail_operation_get_id (ModestMailOperation *self)
+{
+       ModestMailOperationPrivate *priv;
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       
+       return priv->id;
+}
+
+gboolean 
+modest_mail_operation_is_mine (ModestMailOperation *self, 
+                              GObject *me)
 {
-       return MODEST_MAIL_OPERATION(g_object_new(MODEST_TYPE_MAIL_OPERATION, NULL));
+       ModestMailOperationPrivate *priv;
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       if (priv->source == NULL) return FALSE;
+
+       return priv->source == me;
 }
 
 
@@ -213,28 +265,43 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
                                 TnyTransportAccount *transport_account,
                                 TnyMsg* msg)
 {
+       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));
+       
+       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");
+       }
 
-       tny_transport_account_send (transport_account, msg, NULL); /* FIXME */
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
 }
 
 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 *body,
-                                    const GList *attachments_list)
-{
-       TnyPlatformFactory *fact;
+                                    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)
+{
        TnyMsg *new_msg;
-       TnyHeader *header;
-       gchar *content_type;
        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));
@@ -244,298 +311,208 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
        /* 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 almost one a recipient"));
+                            MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER,
+                            _("Error trying to send a mail. You need to set at least one recipient"));
                return;
        }
 
-       /* Create new msg */
-       fact    = modest_tny_platform_factory_get_instance ();
-       new_msg = tny_platform_factory_new_msg (fact);
-       header  = tny_platform_factory_new_header (fact);
-
-       /* WARNING: set the header before assign values to it */
-       tny_msg_set_header (new_msg, header);
-       tny_header_set_from (TNY_HEADER (header), from);
-       tny_header_set_replyto (TNY_HEADER (header), from);
-       tny_header_set_to (TNY_HEADER (header), to);
-       tny_header_set_cc (TNY_HEADER (header), cc);
-       tny_header_set_bcc (TNY_HEADER (header), bcc);
-       tny_header_set_subject (TNY_HEADER (header), subject);
-
-       content_type = get_content_type(body);
-
-       /* Add the body of the new mail */      
-       add_body_part (new_msg, body, (const gchar *) content_type,
-                      (attachments_list == NULL) ? FALSE : TRUE);
+       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;
+       }
 
-       /* Add attachments */
-       add_attachments (new_msg, (GList*) attachments_list);
+       /* TODO: add priority handling. It's received in the priority_flags operator, and
+          it should have effect in the sending operation */
 
-       /* Send mail */
-       tny_transport_account_send (transport_account, new_msg, NULL); /* FIXME */
+       /* Call mail operation */
+       modest_mail_operation_send_mail (self, transport_account, new_msg);
 
-       /* Clean */
-       g_object_unref (header);
-       g_object_unref (new_msg);
-       g_free(content_type);
+       /* Free */
+       g_object_unref (G_OBJECT (new_msg));
 }
 
-static void
-add_if_attachment (gpointer data, gpointer user_data)
+void
+modest_mail_operation_save_to_drafts (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,
+                                     TnyHeaderFlags priority_flags)
 {
-       TnyMimePart *part;
-       GList *attachments_list;
+       TnyMsg *msg = NULL;
+       TnyFolder *folder = NULL;
+       ModestMailOperationPrivate *priv = NULL;
+       GError *err = NULL;
 
-       part = TNY_MIME_PART (data);
-       attachments_list = (GList *) user_data;
+       /* GList *node = NULL; */
 
-       if (tny_mime_part_is_attachment (part))
-               attachments_list = g_list_prepend (attachments_list, part);
-}
+       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);
 
-static TnyMsg *
-create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, guint type)
-{
-       TnyPlatformFactory *fact;
-       TnyMsg *new_msg;
-       TnyHeader *new_header, *header;
-       gchar *new_subject;
-       TnyMimePart *body;
-       ModestFormatter *formatter;
-
-       /* Get body from original msg. Always look for the text/plain
-          part of the message to create the reply/forwarded mail */
-       header = tny_msg_get_header (msg);
-       body   = modest_tny_msg_find_body_part (msg, FALSE);
-
-       /* TODO: select the formatter from account prefs */
-       formatter = modest_formatter_new ("text/plain");
-
-       /* Format message body */
-       if (is_reply) {
-               switch (type) {
-               case MODEST_MAIL_OPERATION_REPLY_TYPE_CITE:
-               default:
-                       new_msg = modest_formatter_cite  (formatter, body, header);
-                       break;
-               case MODEST_MAIL_OPERATION_REPLY_TYPE_QUOTE:
-                       new_msg = modest_formatter_quote (formatter, body, header);
-                       break;
-               }
+       if (html_body == NULL) {
+               msg = modest_tny_msg_new (to, from, cc, bcc, subject, plain_body, (GSList *) attachments_list); /* FIXME: attachments */
        } else {
-               switch (type) {
-               case MODEST_MAIL_OPERATION_FORWARD_TYPE_INLINE:
-               default:
-                       new_msg = modest_formatter_inline  (formatter, body, header);
-                       break;
-               case MODEST_MAIL_OPERATION_FORWARD_TYPE_ATTACHMENT:
-                       new_msg = modest_formatter_attach (formatter, body, header);
-                       break;
-               }
+               msg = modest_tny_msg_new_html_plain (to, from, cc, bcc, subject, html_body, plain_body, (GSList *) attachments_list);
+       }
+       if (!msg) {
+               g_printerr ("modest: failed to create a new msg\n");
+               goto cleanup;
        }
-       g_object_unref (G_OBJECT(formatter));
-       g_object_unref (G_OBJECT(body));
-       
-       /* Fill the header */
-       fact = modest_tny_platform_factory_get_instance ();
-       new_header = TNY_HEADER (tny_platform_factory_new_header (fact));
-       tny_msg_set_header (new_msg, new_header);
-       tny_header_set_from (new_header, from);
-       tny_header_set_replyto (new_header, from);
 
-       /* Change the subject */
-       new_subject =
-               (gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header),
-                                                            (is_reply) ? _("Re:") : _("Fwd:"));
-       tny_header_set_subject (new_header, (const gchar *) new_subject);
-       g_free (new_subject);
+       folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS);
+       if (!folder) {
+               g_printerr ("modest: failed to find Drafts folder\n");
+               goto cleanup;
+       }
+       
+       tny_folder_add_msg (folder, msg, &err);
+       if (err) {
+               g_printerr ("modest: error adding msg to Drafts folder: %s",
+                           err->message);
+               g_error_free (err);
+               goto cleanup;
+       }
 
-       /* Clean */
-       g_object_unref (G_OBJECT (new_header));
-       g_object_unref (G_OBJECT (header));
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
 
-       return new_msg;
+       /* Free */
+cleanup:
+       if (msg)
+               g_object_unref (G_OBJECT(msg));
+       if (folder)
+               g_object_unref (G_OBJECT(folder));
 }
 
-TnyMsg* 
-modest_mail_operation_create_forward_mail (TnyMsg *msg, 
-                                          const gchar *from,
-                                          ModestMailOperationForwardType forward_type)
+static void
+recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all_folders)
 {
-       TnyMsg *new_msg;
-       TnyList *parts = NULL;
-       GList *attachments_list = NULL;
-
-       new_msg = create_reply_forward_mail (msg, from, FALSE, forward_type);
-
-       /* Add attachments */
-       parts = TNY_LIST (tny_simple_list_new());
-       tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
-       tny_list_foreach (parts, add_if_attachment, attachments_list);
-       add_attachments (new_msg, attachments_list);
+       TnyIterator *iter;
+       TnyList *folders = tny_simple_list_new ();
 
-       /* Clean */
-       if (attachments_list) g_list_free (attachments_list);
-       g_object_unref (G_OBJECT (parts));
+       tny_folder_store_get_folders (store, folders, query, NULL);
+       iter = tny_list_create_iterator (folders);
 
-       return new_msg;
-}
+       while (!tny_iterator_is_done (iter)) {
 
-TnyMsg* 
-modest_mail_operation_create_reply_mail (TnyMsg *msg, 
-                                        const gchar *from,
-                                        ModestMailOperationReplyType reply_type,
-                                        ModestMailOperationReplyMode reply_mode)
-{
-       TnyMsg *new_msg = NULL;
-       TnyHeader *new_header, *header;
-       const gchar* reply_to;
-       gchar *new_cc = NULL;
-       const gchar *cc = NULL, *bcc = NULL;
-       GString *tmp = NULL;
+               TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter);
 
-       new_msg = create_reply_forward_mail (msg, from, TRUE, reply_type);
+               tny_list_prepend (all_folders, G_OBJECT (folder));
 
-       /* Fill the header */
-       header = tny_msg_get_header (msg);
-       new_header = tny_msg_get_header (new_msg);
-       reply_to = tny_header_get_replyto (header);
+               recurse_folders (folder, query, all_folders);
+           
+               g_object_unref (G_OBJECT (folder));
 
-       if (reply_to)
-               tny_header_set_to (new_header, reply_to);
-       else
-               tny_header_set_to (new_header, tny_header_get_from (header));
-
-       switch (reply_mode) {
-       case MODEST_MAIL_OPERATION_REPLY_MODE_SENDER:
-               /* Do not fill neither cc nor bcc */
-               break;
-       case MODEST_MAIL_OPERATION_REPLY_MODE_LIST:
-               /* TODO */
-               break;
-       case MODEST_MAIL_OPERATION_REPLY_MODE_ALL:
-               /* Concatenate to, cc and bcc */
-               cc = tny_header_get_cc (header);
-               bcc = tny_header_get_bcc (header);
-
-               tmp = g_string_new (tny_header_get_to (header));
-               if (cc)  g_string_append_printf (tmp, ",%s",cc);
-               if (bcc) g_string_append_printf (tmp, ",%s",bcc);
-
-               /* Remove my own address from the cc list. TODO:
-                  remove also the To: of the new message, needed due
-                  to the new reply_to feature */
-               new_cc = (gchar *)
-                       modest_text_utils_remove_address ((const gchar *) tmp->str,
-                                                         from);
-               /* FIXME: remove also the mails from the new To: */
-               tny_header_set_cc (new_header, new_cc);
-
-               /* Clean */
-               g_string_free (tmp, TRUE);
-               g_free (new_cc);
-               break;
-       }
-
-       /* Clean */
-       g_object_unref (G_OBJECT (new_header));
-       g_object_unref (G_OBJECT (header));
-
-       return new_msg;
+               tny_iterator_next (iter);
+       }
+        g_object_unref (G_OBJECT (iter));
+        g_object_unref (G_OBJECT (folders));
 }
 
 static void
-status_update_cb (TnyFolder *folder, const gchar *what, gint status, gint oftotal, gpointer user_data) 
+update_folders_status_cb (GObject *obj,
+                         TnyStatus *status,  
+                         gpointer user_data)
 {
-       g_print ("%s status: %d, of total %d\n", what, status, oftotal);
-}
+       ModestMailOperation *self;
+       ModestMailOperationPrivate *priv;
 
-static void
-folder_refresh_cb (TnyFolder *folder, gboolean canceled, GError **err, gpointer user_data)
-{
-       ModestMailOperation *self = NULL;
-       ModestMailOperationPrivate *priv = NULL;
-       RefreshFolderAsyncHelper *helper;
+       g_return_if_fail (status != NULL);
+       g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_REFRESH);
 
-       helper = (RefreshFolderAsyncHelper *) user_data;
-       self = MODEST_MAIL_OPERATION (helper->mail_op);
+       /* Temporary FIX: useful when tinymail send us status
+          information *after* calling the function callback */
+       if (!MODEST_IS_MAIL_OPERATION (user_data))
+               return;
+
+       self = MODEST_MAIL_OPERATION (user_data);
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       if ((canceled && *err) || *err) {
-               priv->error = g_error_copy (*err);
-               helper->failed++;
-       } else if (canceled) {
-               helper->canceled++;
-               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
-                            _("Error trying to refresh folder %s. Operation canceled"),
-                            tny_folder_get_name (folder));
-       } else {
-               priv->done++;
-       }
+       priv->done = status->position;
+       priv->total = status->of_total;
+
+       if (priv->done == 1 && priv->total == 100)
+               return;
 
-       if (priv->done == priv->total)
-               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-       else if ((priv->done + helper->canceled + helper->failed) == priv->total) {
-               if (helper->failed == priv->total)
-                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-               else if (helper->failed == priv->total)
-                       priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
-               else
-                       priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS;
-       }
-       tny_iterator_next (helper->iter);
-       if (tny_iterator_is_done (helper->iter)) {
-               TnyList *list;
-               list = tny_iterator_get_list (helper->iter);
-               g_object_unref (G_OBJECT (helper->iter));
-               g_object_unref (G_OBJECT (list));
-               g_slice_free (RefreshFolderAsyncHelper, helper);
-       } else {
-               TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (helper->iter));
-               tny_folder_refresh_async (folder, folder_refresh_cb,
-                                         status_update_cb, 
-                                         helper);
-               g_object_unref (G_OBJECT(folder));
-       }
        g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
 }
 
-
 static void
 update_folders_cb (TnyFolderStore *folder_store, TnyList *list, GError **err, gpointer user_data)
 {
        ModestMailOperation *self;
        ModestMailOperationPrivate *priv;
-       RefreshFolderAsyncHelper *helper;
-       TnyFolder *folder;
+       TnyIterator *iter;
+       TnyList *all_folders;
        
        self  = MODEST_MAIL_OPERATION (user_data);
        priv  = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
+       g_message (__FUNCTION__);
+       
        if (*err) {
                priv->error = g_error_copy (*err);
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-               return;
+               goto out;
        }
 
-       priv->total = tny_list_get_length (list);
-       priv->done = 0;
-       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+       /* 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));
 
-       helper = g_slice_new0 (RefreshFolderAsyncHelper);
-       helper->mail_op = self;
-       helper->iter = tny_list_create_iterator (list);
-       helper->failed = 0;
-       helper->canceled = 0;
+               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));
 
-       /* Async refresh folders */
-       folder = TNY_FOLDER (tny_iterator_get_current (helper->iter));
-       tny_folder_refresh_async (folder, folder_refresh_cb,
-                                 status_update_cb, helper);
-       g_object_unref (G_OBJECT(folder));
+       /* 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));
+
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
 }
 
 gboolean
@@ -544,21 +521,26 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 {
        ModestMailOperationPrivate *priv;
        TnyList *folders;
-       TnyFolderStoreQuery *query;
 
        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);
+
        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 ());
-       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_async (TNY_FOLDER_STORE (store_account),
-                                           folders, update_folders_cb, query, self);
-       g_object_unref (query);
 
+       g_message ("tny_folder_store_get_folders_async");
+       tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account),
+                                           folders, update_folders_cb, NULL, update_folders_status_cb, self);
+       
        return TRUE;
 }
 
@@ -590,7 +572,23 @@ modest_mail_operation_get_error (ModestMailOperation *self)
 gboolean 
 modest_mail_operation_cancel (ModestMailOperation *self)
 {
-       /* TODO */
+       ModestMailOperationPrivate *priv;
+
+       if (!MODEST_IS_MAIL_OPERATION (self)) {
+               g_warning ("%s: invalid parametter", G_GNUC_FUNCTION);
+               return FALSE;
+       }
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       /* TODO: Tinymail does not support cancel operation  */
+       
+       /* Set new status */
+       priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
+
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+
        return TRUE;
 }
 
@@ -651,54 +649,93 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
                                     TnyFolderStore *parent,
                                     const gchar *name)
 {
+       ModestTnyFolderRules rules;
+       ModestMailOperationPrivate *priv;
+       TnyFolder *new_folder = NULL;
+       gboolean can_create = FALSE;
+
        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);
 
-       TnyFolder *new_folder = NULL;
-       TnyStoreAccount *store_account;
-
-       /* Create the folder */
-       new_folder = tny_folder_store_create_folder (parent, name, NULL); /* FIXME */
-       if (!new_folder) 
-               return NULL;
+       /* Check parent */
+       if (!TNY_IS_FOLDER (parent)) {
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER,
+                            _("mail_in_ui_folder_create_error"));
+       } else {
+               /* Check folder rules */
+               rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
+               if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE)
+                       g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                                    MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+                                    _("mail_in_ui_folder_create_error"));
+               else
+                       can_create = TRUE;              
+       }
 
-       /* Subscribe to folder */
-       if (!tny_folder_is_subscribed (new_folder)) {
-               store_account = TNY_STORE_ACCOUNT (tny_folder_get_account (TNY_FOLDER (parent)));
-               tny_store_account_subscribe (store_account, new_folder);
-               g_object_unref (G_OBJECT (store_account));
+       if (can_create) {
+               /* Create the folder */
+               new_folder = tny_folder_store_create_folder (parent, name, &(priv->error));
+               CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED);
        }
 
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+
        return new_folder;
 }
 
 void
 modest_mail_operation_remove_folder (ModestMailOperation *self,
-                                    TnyFolder *folder,
-                                    gboolean remove_to_trash)
+                                    TnyFolder           *folder,
+                                    gboolean             remove_to_trash)
 {
-       TnyFolderStore *folder_store;
+       TnyAccount *account;
+       ModestMailOperationPrivate *priv;
+       ModestTnyFolderRules rules;
 
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_FOLDER (folder));
 
-       /* Get folder store */
-       folder_store = TNY_FOLDER_STORE (tny_folder_get_account (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) {
+               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 = tny_folder_get_account (folder);
 
        /* Delete folder or move to trash */
        if (remove_to_trash) {
-               TnyFolder *trash_folder;
-               trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(folder_store),
+               TnyFolder *trash_folder, *new_folder;
+               trash_folder = modest_tny_account_get_special_folder (account,
                                                                      TNY_FOLDER_TYPE_TRASH);
                /* TODO: error_handling */
-               modest_mail_operation_move_folder (self, folder, 
-                                                  TNY_FOLDER_STORE (trash_folder));
+               new_folder = modest_mail_operation_xfer_folder (self, folder, 
+                                                               TNY_FOLDER_STORE (trash_folder), TRUE);
+               g_object_unref (G_OBJECT (new_folder));
        } else {
-               tny_folder_store_remove_folder (folder_store, folder, NULL); /* FIXME */
-               g_object_unref (G_OBJECT (folder));
+               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));
 
-       /* Free instances */
-       g_object_unref (G_OBJECT (folder_store));
+ end:
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
 }
 
 void
@@ -706,127 +743,301 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
                                     TnyFolder *folder,
                                     const gchar *name)
 {
+       ModestMailOperationPrivate *priv;
+       ModestTnyFolderRules rules;
+
        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);
 
-       /* FIXME: better error handling */
-       if (strrchr (name, '/') != NULL)
-               return;
+       /* Check folder rules */
+       rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
+       if (rules & MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE) {
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+                            _("FIXME: unable to rename"));
+       } else {
+               /* Rename. Camel handles folder subscription/unsubscription */
+               tny_folder_set_name (folder, name, &(priv->error));
+               CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED);
+       }
 
-       /* Rename. Camel handles folder subscription/unsubscription */
-       tny_folder_set_name (folder, name, NULL); /* FIXME */
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
  }
 
-void
-modest_mail_operation_move_folder (ModestMailOperation *self,
+TnyFolder *
+modest_mail_operation_xfer_folder (ModestMailOperation *self,
                                   TnyFolder *folder,
-                                  TnyFolderStore *parent)
+                                  TnyFolderStore *parent,
+                                  gboolean delete_original)
 {
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
-       g_return_if_fail (TNY_IS_FOLDER (folder));
-       
-       modest_mail_operation_xfer_folder (self, folder, parent, TRUE);
+       ModestMailOperationPrivate *priv;
+       TnyFolder *new_folder = NULL;
+       ModestTnyFolderRules rules;
+
+       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);
+
+       /* The moveable restriction is applied also to copy operation */
+       rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
+       if (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE) {
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+                            _("FIXME: unable to rename"));
+       } else {
+               /* Move/Copy folder */
+               new_folder = tny_folder_copy (folder,
+                                             parent,
+                                             tny_folder_get_name (folder),
+                                             delete_original, 
+                                             &(priv->error));
+       }
+
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+
+       return new_folder;
 }
 
-void
-modest_mail_operation_copy_folder (ModestMailOperation *self,
-                                  TnyFolder *folder,
-                                  TnyFolderStore *parent)
+
+/* ******************************************************************* */
+/* **************************  MSG  ACTIONS  ************************* */
+/* ******************************************************************* */
+
+void          modest_mail_operation_get_msg     (ModestMailOperation *self,
+                                                TnyHeader *header,
+                                                GetMsgAsynUserCallback 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_FOLDER_STORE (parent));
-       g_return_if_fail (TNY_IS_FOLDER (folder));
+       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;
 
-       modest_mail_operation_xfer_folder (self, folder, parent, FALSE);
+       /* Get message from folder */
+       if (folder) {
+               helper = g_slice_new0 (GetMsgAsyncHelper);
+               helper->mail_op = self;
+               helper->user_callback = user_callback;
+               helper->pending_ops = 1;
+               helper->user_data = user_data;
+
+               tny_folder_get_msg_async (folder, header, get_msg_cb, get_msg_status_cb, helper);
+
+               g_object_unref (G_OBJECT (folder));
+       } else {
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                            _("Error trying to get a message. No folder found for header"));
+       }
 }
 
 static void
-modest_mail_operation_xfer_folder (ModestMailOperation *self,
-                                  TnyFolder *folder,
-                                  TnyFolderStore *parent,
-                                  gboolean delete_original)
+get_msg_cb (TnyFolder *folder, 
+           gboolean cancelled, 
+           TnyMsg *msg, 
+           GError **error, 
+           gpointer user_data)
 {
-       const gchar *folder_name;
-       TnyFolder *dest_folder, *child;
-       TnyIterator *iter;
-       TnyList *folders, *headers;
+       GetMsgAsyncHelper *helper = NULL;
+       ModestMailOperation *self = NULL;
+       ModestMailOperationPrivate *priv = NULL;
 
-       g_return_if_fail (TNY_IS_FOLDER (folder));
-       g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
+       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);
+       
+       helper->pending_ops--;
 
-       /* Create the destination folder */
-       folder_name = tny_folder_get_name (folder);
-       dest_folder = modest_mail_operation_create_folder (self, parent, folder_name);
+       /* Check errors and cancel */
+       if (*error) {
+               priv->error = g_error_copy (*error);
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               goto out;
+       }
+       if (cancelled) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                            _("Error trying to refresh the contents of %s"),
+                            tny_folder_get_name (folder));
+               goto out;
+       }
 
-       /* Transfer messages */
-       headers = TNY_LIST (tny_simple_list_new ());
-       tny_folder_get_headers (folder, headers, FALSE, NULL); /* FIXME */
-       tny_folder_transfer_msgs (folder, headers, dest_folder, delete_original, NULL); /* FIXME */
+       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 
-       /* Recurse children */
-       folders = TNY_LIST (tny_simple_list_new ());
-       tny_folder_store_get_folders (TNY_FOLDER_STORE (folder), folders, NULL, NULL ); /* FIXME */
-       iter = tny_list_create_iterator (folders);
+       /* If user defined callback function was defined, call it */
+       if (helper->user_callback) {
+               helper->user_callback (priv->source, msg, helper->user_data);
+       }
 
-       while (!tny_iterator_is_done (iter)) {
-               child = TNY_FOLDER (tny_iterator_get_current (iter));
-               modest_mail_operation_xfer_folder (self, child, TNY_FOLDER_STORE (dest_folder),
-                                                  delete_original);
-               tny_iterator_next (iter);
-               g_object_unref (G_OBJECT(child));
+       /* Free */
+ out:
+       if (helper->pending_ops == 0) {
+               g_slice_free (GetMsgAsyncHelper, helper);
+               
+               /* Notify the queue */
+               modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);  
        }
+}
 
-       /* Delete source folder (if needed) */
-       if (delete_original)
-               modest_mail_operation_remove_folder (self, folder, FALSE);
+static void     
+get_msg_status_cb (GObject *obj,
+                  TnyStatus *status,  
+                  gpointer user_data)
+{
+       GetMsgAsyncHelper *helper = NULL;
+       ModestMailOperation *self;
+       ModestMailOperationPrivate *priv;
 
-       /* Clean up */
-       g_object_unref (G_OBJECT (dest_folder));
-       g_object_unref (G_OBJECT (headers));
-       g_object_unref (G_OBJECT (folders));
-       g_object_unref (G_OBJECT (iter));
-}
+       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);       
 
-/* ******************************************************************* */
-/* **************************  MSG  ACTIONS  ************************* */
-/* ******************************************************************* */
+       /* Temporary FIX: useful when tinymail send us status
+          information *after* calling the function callback */
+       if (!MODEST_IS_MAIL_OPERATION (helper->mail_op))
+               return;
 
-gboolean 
-modest_mail_operation_copy_msg (ModestMailOperation *self,
-                               TnyHeader *header, 
-                               TnyFolder *folder)
+       self = helper->mail_op;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       priv->done += status->position;
+       priv->total = status->of_total;
+
+       if (priv->done == 1 && priv->total == 100)
+               return;
+
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
+}
+
+
+void          modest_mail_operation_process_msg     (ModestMailOperation *self,
+                                                    TnyList *header_list, 
+                                                    GetMsgAsynUserCallback user_callback,
+                                                    gpointer user_data)
 {
-       g_return_val_if_fail (TNY_IS_HEADER (header), FALSE);
-       g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE);
+       ModestMailOperationPrivate *priv = NULL;
+       GetMsgAsyncHelper *helper = NULL;
+       TnyHeader *header = NULL;
+       TnyFolder *folder = NULL;
+       TnyIterator *iter = NULL;
+       
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+
+       iter = tny_list_create_iterator (header_list); 
+       priv->total = tny_list_get_length(header_list);
 
-       return modest_mail_operation_xfer_msg (self, header, folder, FALSE);
+       helper = g_slice_new0 (GetMsgAsyncHelper);
+       helper->mail_op = self;
+       helper->user_callback = user_callback;
+       helper->pending_ops = priv->total;
+       helper->user_data = user_data;
+
+       while (!tny_iterator_is_done (iter)) { 
+               
+               header = TNY_HEADER (tny_iterator_get_current (iter));          
+               folder = tny_header_get_folder (header);
+                               
+               /* Get message from folder */
+               if (folder) {
+                       /* The callback will call it per each header */
+                       tny_folder_get_msg_async (folder, header, get_msg_cb, update_process_msg_status_cb, helper);
+                       g_object_unref (G_OBJECT (folder));
+               } else {                        
+                       /* Set status failed and set an error */
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+                       g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                                    MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                                    _("Error trying to get a message. No folder found for header"));
+
+                       /* Notify the queue */
+                       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+
+                       /* free */
+                       g_slice_free (GetMsgAsyncHelper, helper);
+                       break;
+               }
+
+               g_object_unref (header);                
+               tny_iterator_next (iter);
+       }
 }
 
-gboolean 
-modest_mail_operation_move_msg (ModestMailOperation *self,
-                               TnyHeader *header, 
-                               TnyFolder *folder)
+static void     
+update_process_msg_status_cb (GObject *obj,
+                             TnyStatus *status,  
+                             gpointer user_data)
 {
-       g_return_val_if_fail (TNY_IS_HEADER (header), FALSE);
-       g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE);
+       GetMsgAsyncHelper *helper = NULL;
+       ModestMailOperation *self;
+       ModestMailOperationPrivate *priv;
+
+       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);       
+
+       /* Temporary FIX: useful when tinymail send us status
+          information *after* calling the function callback */
+       if (!MODEST_IS_MAIL_OPERATION (helper->mail_op))
+               return;
+
+       self = helper->mail_op;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       return modest_mail_operation_xfer_msg (self, header, folder, TRUE);
+       if (status->of_total > 0)
+               priv->done += status->position/status->of_total;
+
+       g_print("TEST: %d/%d", priv->done, priv->total); 
+
+       if (priv->done == 1 && priv->total == 100)
+               return;
+
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
 }
 
+
+
 void 
 modest_mail_operation_remove_msg (ModestMailOperation *self,
                                  TnyHeader *header,
                                  gboolean remove_to_trash)
 {
        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;
@@ -836,7 +1047,16 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
                trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(store_account),
                                                                      TNY_FOLDER_TYPE_TRASH);
                if (trash_folder) {
-                       modest_mail_operation_move_msg (self, header, trash_folder);
+                       TnyList *headers;
+
+                       /* Create list */
+                       headers = tny_simple_list_new ();
+                       tny_list_append (headers, G_OBJECT (header));
+                       g_object_unref (header);
+
+                       /* Move to trash */
+                       modest_mail_operation_xfer_msgs (self, headers, trash_folder, TRUE);
+                       g_object_unref (headers);
 /*                     g_object_unref (trash_folder); */
                } else {
                        ModestMailOperationPrivate *priv;
@@ -851,159 +1071,200 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
 
                g_object_unref (G_OBJECT (store_account));
        } else {
-               tny_folder_remove_msg (folder, header, NULL); /* FIXME */
-               tny_folder_sync(folder, TRUE, NULL); /* FIXME */
+               tny_folder_remove_msg (folder, header, &(priv->error));
+               if (!priv->error)
+                       tny_folder_sync(folder, TRUE, &(priv->error));
        }
 
+       /* Set status */
+       if (!priv->error)
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       else
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+
        /* Free */
-       g_object_unref (folder);
+       g_object_unref (G_OBJECT (folder));
+
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
 }
 
 static void
+transfer_msgs_status_cb (GObject *obj,
+                        TnyStatus *status,  
+                        gpointer user_data)
+{
+}
+
+
+static void
 transfer_msgs_cb (TnyFolder *folder, GError **err, gpointer user_data)
 {
+       XFerMsgAsyncHelper *helper;
+       ModestMailOperation *self;
        ModestMailOperationPrivate *priv;
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(user_data);
-       priv->done = 1;
-       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       helper = (XFerMsgAsyncHelper *) user_data;
+       self = helper->mail_op;
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
-       g_signal_emit (G_OBJECT (user_data), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
+       if (*err) {
+               priv->error = g_error_copy (*err);
+               priv->done = 0;
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+       } else {
+               priv->done = 1;
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       }
+
+       /* Free */
+       g_object_unref (helper->headers);
+       g_object_unref (helper->dest_folder);
+       g_object_unref (folder);
+       g_free (helper);
+
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
 }
 
-static gboolean
-modest_mail_operation_xfer_msg (ModestMailOperation *self,
-                               TnyHeader *header, 
-                               TnyFolder *folder, 
-                               gboolean delete_original)
+void
+modest_mail_operation_xfer_msgs (ModestMailOperation *self,
+                                TnyList *headers, 
+                                TnyFolder *folder, 
+                                gboolean delete_original)
 {
        ModestMailOperationPrivate *priv;
+       TnyIterator *iter;
        TnyFolder *src_folder;
-       TnyList *headers;
+       XFerMsgAsyncHelper *helper;
+       TnyHeader *header;
 
-       src_folder = tny_header_get_folder (header);
-       headers = tny_simple_list_new ();
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_LIST (headers));
+       g_return_if_fail (TNY_IS_FOLDER (folder));
+
+       /* Pick references for async calls */
+       g_object_ref (folder);
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
        priv->total = 1;
        priv->done = 0;
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
-       tny_list_prepend (headers, G_OBJECT (header));
-       tny_folder_transfer_msgs_async (src_folder, headers, folder, 
-                                       delete_original, transfer_msgs_cb, self);
+       /* Create the helper */
+       helper = g_malloc0 (sizeof (XFerMsgAsyncHelper));
+       helper->mail_op = self;
+       helper->dest_folder = folder;
+       helper->headers = headers;
 
-       /* Free */
-       g_object_unref (headers);
-       g_object_unref (folder);
+       /* Get source folder */
+       iter = tny_list_create_iterator (headers);
+       header = TNY_HEADER (tny_iterator_get_current (iter));
+       src_folder = tny_header_get_folder (header);
+       g_object_unref (header);
+       g_object_unref (iter);
 
-       return TRUE;
+       /* Transfer messages */
+       tny_folder_transfer_msgs_async (src_folder, 
+                                       headers, 
+                                       folder, 
+                                       delete_original, 
+                                       transfer_msgs_cb, 
+                                       transfer_msgs_status_cb, 
+                                       helper);
 }
 
 
-/* ******************************************************************* */
-/* ************************* UTILIY FUNCTIONS ************************ */
-/* ******************************************************************* */
-static gboolean
-is_ascii(const gchar *s)
+static void
+on_refresh_folder (TnyFolder   *folder, 
+                  gboolean     cancelled, 
+                  GError     **error,
+                  gpointer     user_data)
 {
-       while (s[0]) {
-               if (s[0] & 128 || s[0] < 32)
-                       return FALSE;
-               s++;
+       ModestMailOperation *self;
+       ModestMailOperationPrivate *priv;
+
+       self = MODEST_MAIL_OPERATION (user_data);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       if (*error) {
+               priv->error = g_error_copy (*error);
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               goto out;
        }
-       return TRUE;
-}
 
-static char *
-get_content_type(const gchar *s)
-{
-       GString *type;
-       
-       type = g_string_new("text/plain");
-       if (!is_ascii(s)) {
-               if (g_utf8_validate(s, -1, NULL)) {
-                       g_string_append(type, "; charset=\"utf-8\"");
-               } else {
-                       /* it should be impossible to reach this, but better safe than sorry */
-                       g_warning("invalid utf8 in message");
-                       g_string_append(type, "; charset=\"latin1\"");
-               }
+       if (cancelled) {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                            _("Error trying to refresh the contents of %s"),
+                            tny_folder_get_name (folder));
+               goto out;
        }
-       return g_string_free(type, FALSE);
+
+       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+
+ out:
+       /* Free */
+       g_object_unref (folder);
+
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
 }
 
 static void
-add_attachments (TnyMsg *msg, GList *attachments_list)
-{
-       GList *pos;
-       TnyMimePart *attachment_part, *old_attachment;
-       const gchar *attachment_content_type;
-       const gchar *attachment_filename;
-       TnyStream *attachment_stream;
-       TnyPlatformFactory *fact;
-
-       fact = modest_tny_platform_factory_get_instance ();
-       for (pos = (GList *)attachments_list; pos; pos = pos->next) {
-
-               old_attachment = pos->data;
-               attachment_filename = tny_mime_part_get_filename (old_attachment);
-               attachment_stream = tny_mime_part_get_stream (old_attachment);
-               attachment_part = tny_platform_factory_new_mime_part (fact);
-               
-               attachment_content_type = tny_mime_part_get_content_type (old_attachment);
-                                
-               tny_mime_part_construct_from_stream (attachment_part,
-                                                    attachment_stream,
-                                                    attachment_content_type);
-               tny_stream_reset (attachment_stream);
-               
-               tny_mime_part_set_filename (attachment_part, attachment_filename);
-               
-               tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part);
-/*             g_object_unref (attachment_part); */
-       }
-}
+on_refresh_folder_status_update (GObject *obj,
+                                TnyStatus *status,
+                                gpointer user_data)
+{
+       ModestMailOperation *self;
+       ModestMailOperationPrivate *priv;
 
+       g_return_if_fail (status != NULL);
+       g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_REFRESH);
 
-static TnyMimePart *
-add_body_part (TnyMsg *msg, 
-              const gchar *body,
-              const gchar *content_type,
-              gboolean has_attachments)
-{
-       TnyMimePart *text_body_part = NULL;
-       TnyStream *text_body_stream;
-       TnyPlatformFactory *fact;
+       /* Temporary FIX: useful when tinymail send us status
+          information *after* calling the function callback */
+       if (!MODEST_IS_MAIL_OPERATION (user_data))
+               return;
 
-       fact = modest_tny_platform_factory_get_instance ();
+       self = MODEST_MAIL_OPERATION (user_data);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       /* Create the stream */
-       text_body_stream = TNY_STREAM (tny_camel_stream_new
-                                      (camel_stream_mem_new_with_buffer
-                                       (body, strlen(body))));
+       priv->done = status->position;
+       priv->total = status->of_total;
 
-       /* Create body part if needed */
-       if (has_attachments)
-               text_body_part = tny_platform_factory_new_mime_part (fact);
-       else
-               text_body_part = TNY_MIME_PART(msg);
+       if (priv->done == 1 && priv->total == 100)
+               return;
 
-       /* Construct MIME part */
-       tny_stream_reset (text_body_stream);
-       tny_mime_part_construct_from_stream (text_body_part,
-                                            text_body_stream,
-                                            content_type);
-       tny_stream_reset (text_body_stream);
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
+}
 
-       /* Add part if needed */
-       if (has_attachments) {
-               tny_mime_part_add_part (TNY_MIME_PART (msg), text_body_part);
-               g_object_unref (G_OBJECT(text_body_part));
-       }
+void 
+modest_mail_operation_refresh_folder  (ModestMailOperation *self,
+                                      TnyFolder *folder)
+{
+       ModestMailOperationPrivate *priv;
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       /* Pick a reference */
+       g_object_ref (folder);
 
-       /* Clean */
-       g_object_unref (text_body_stream);
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+
+       /* 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);
+}
 
-       return text_body_part;
+void
+_modest_mail_operation_notify_end (ModestMailOperation *self)
+{
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
 }