* Fix some detected memory leaks
[modest] / src / modest-mail-operation.c
index 42a2539..320f716 100644 (file)
 #include <tny-store-account.h>
 #include <tny-folder-store.h>
 #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-error.h"
 
 /* '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);
 
-#define MODEST_ERROR modest_error_quark ()
-
-typedef enum _ModestMailOperationErrorCode ModestMailOperationErrorCode;
-enum _ModestMailOperationErrorCode {
-        MODEST_MAIL_OPERATION_ERROR_BAD_ACCOUNT,
-        MODEST_MAIL_OPERATION_ERROR_MISSING_PARAMETER,
-
-       MODEST_MAIL_OPERATION_NUM_ERROR_CODES
-};
+static void     update_folders_cb    (TnyFolderStore *self, 
+                                     TnyList *list, 
+                                     GError **err, 
+                                     gpointer user_data);
+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     get_msg_status_cb (GObject *obj,
+                                  TnyStatus *status,  
+                                  gpointer user_data);
+
+
+enum _ModestMailOperationSignals 
+{
+       PROGRESS_CHANGED_SIGNAL,
 
-static void set_error (ModestMailOperation *mail_operation, 
-                      ModestMailOperationErrorCode error_code,
-                      const gchar *fmt, ...);
-static void status_update_cb (TnyFolder *folder, const gchar *what, 
-                             gint status, gpointer user_data);
-static void folder_refresh_cb (TnyFolder *folder, gboolean cancelled, 
-                              gpointer user_data);
-static void add_attachments (TnyMsg *msg, const GList *attachments_list);
-static TnyMimePart * add_body_part (TnyMsg *msg, const gchar *body,
-                                   const gchar *content_type, gboolean has_attachments);
-
-/* list my signals  */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
+       NUM_SIGNALS
 };
 
 typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate;
 struct _ModestMailOperationPrivate {
-       TnyAccount                *account;
-       ModestMailOperationStatus  status;
+       guint                      done;
+       guint                      total;
+       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))
 
-/* some utility functions */
-static char * get_content_type(const gchar *s);
-static gboolean is_ascii(const gchar *s);
+#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;
+       TnyIterator *iter;
+       guint failed;
+       guint canceled;
+
+} RefreshFolderAsyncHelper;
+
+typedef struct _XFerMsgAsyncHelper
+{
+       ModestMailOperation *mail_op;
+       TnyList *headers;
+       TnyFolder *dest_folder;
+
+} XFerMsgAsyncHelper;
+
 
 /* globals */
 static GObjectClass *parent_class = NULL;
 
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
+static guint signals[NUM_SIGNALS] = {0};
 
 GType
 modest_mail_operation_get_type (void)
@@ -125,12 +168,21 @@ modest_mail_operation_class_init (ModestMailOperationClass *klass)
 
        g_type_class_add_private (gobject_class, sizeof(ModestMailOperationPrivate));
 
-       /* signal definitions go here, e.g.: */
-/*     signals[MY_SIGNAL_1] = */
-/*             g_signal_new ("my_signal_1",....); */
-/*     signals[MY_SIGNAL_2] = */
-/*             g_signal_new ("my_signal_2",....); */
-/*     etc. */
+       /**
+        * ModestMailOperation::progress-changed
+        * @self: the #MailOperation that emits the signal
+        * @user_data: user data set when the signal handler was connected
+        *
+        * Emitted when the progress of a mail operation changes
+        */
+       signals[PROGRESS_CHANGED_SIGNAL] = 
+               g_signal_new ("progress-changed",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestMailOperationClass, progress_changed),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__VOID,
+                             G_TYPE_NONE, 0);
 }
 
 static void
@@ -140,9 +192,12 @@ modest_mail_operation_init (ModestMailOperation *obj)
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
 
-       priv->account = NULL;
-       priv->status = MODEST_MAIL_OPERATION_STATUS_INVALID;
-       priv->error = NULL;
+       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
@@ -152,582 +207,1064 @@ modest_mail_operation_finalize (GObject *obj)
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
 
-       if (priv->account) {
-               g_object_unref (priv->account);
-               priv->account = NULL;
-       }
        if (priv->error) {
-               g_object_unref (priv->error);
+               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 (TnyAccount *account)
+modest_mail_operation_new (ModestMailOperationId id, 
+                          GObject *source)
 {
-       ModestMailOperation *mail_operation;
+       ModestMailOperation *obj;
        ModestMailOperationPrivate *priv;
+               
+       obj = MODEST_MAIL_OPERATION(g_object_new(MODEST_TYPE_MAIL_OPERATION, NULL));
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
 
-       mail_operation = 
-               MODEST_MAIL_OPERATION(g_object_new(MODEST_TYPE_MAIL_OPERATION, NULL));
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_operation);
-
-       priv->account = g_object_ref (account);
+       priv->id = id;
+       if (source != NULL)
+               priv->source = g_object_ref(source);
 
-       return mail_operation;
+       return obj;
 }
 
 
-void
-modest_mail_operation_send_mail (ModestMailOperation *mail_operation,
-                                TnyMsg* msg)
+ModestMailOperationId
+modest_mail_operation_get_id (ModestMailOperation *self)
 {
        ModestMailOperationPrivate *priv;
-       TnyTransportAccount *transport_account;
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_operation);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       
+       return priv->id;
+}
 
-       if (!TNY_IS_TRANSPORT_ACCOUNT (priv->account)) {
-               set_error (mail_operation,
-                          MODEST_MAIL_OPERATION_ERROR_BAD_ACCOUNT,
-                          _("Error trying to send a mail. Use a transport account"));
-       }
+gboolean 
+modest_mail_operation_is_mine (ModestMailOperation *self, 
+                              GObject *me)
+{
+       ModestMailOperationPrivate *priv;
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       if (priv->source == NULL) return FALSE;
 
-       transport_account = TNY_TRANSPORT_ACCOUNT (priv->account);
+       return priv->source == me;
+}
+
+
+void
+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");
+       }
 
-       mail_operation = modest_mail_operation_new (NULL);
-       tny_transport_account_send (transport_account, msg);
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
 }
 
 void
-modest_mail_operation_send_new_mail (ModestMailOperation *mail_operation,
-                                    const gchar *from,
-                                    const gchar *to,
-                                    const gchar *cc,
-                                    const gchar *bcc,
-                                    const gchar *subject,
-                                    const gchar *body,
-                                    const GList *attachments_list)
+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,
+                                    TnyHeaderFlags priority_flags)
 {
        TnyMsg *new_msg;
-       TnyHeader *header;
-       TnyTransportAccount *transport_account;
-       ModestMailOperationPrivate *priv;
-       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));
 
-       g_return_if_fail (mail_operation);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
        /* Check parametters */
        if (to == NULL) {
-               set_error (mail_operation,
-                          MODEST_MAIL_OPERATION_ERROR_MISSING_PARAMETER,
-                          _("Error trying to send a mail. You need to set almost one a recipient"));
+               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;
        }
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_operation);
-
-       if (!TNY_IS_TRANSPORT_ACCOUNT (priv->account)) {
-               set_error (mail_operation,
-                          MODEST_MAIL_OPERATION_ERROR_BAD_ACCOUNT,
-                          _("Error trying to send a mail. Use a transport account"));
+       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;
        }
 
-       /* Create new msg */
-       transport_account = TNY_TRANSPORT_ACCOUNT (priv->account);
+       /* TODO: add priority handling. It's received in the priority_flags operator, and
+          it should have effect in the sending operation */
 
-       new_msg          = TNY_MSG (tny_camel_msg_new ());
-       header           = TNY_HEADER (tny_camel_header_new ());
+       /* Call mail operation */
+       modest_mail_operation_send_mail (self, transport_account, new_msg);
 
-       /* IMPORTANT: 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_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);
+       /* Free */
+       g_object_unref (G_OBJECT (new_msg));
+}
 
-       content_type = get_content_type(body);
+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)
+{
+       TnyMsg *msg = NULL;
+       TnyFolder *folder = NULL;
+       ModestMailOperationPrivate *priv = NULL;
+       GError *err = NULL;
 
-       /* Add the body of the new mail */      
-       add_body_part (new_msg, body, (const gchar *) content_type,
-                      (attachments_list == NULL) ? FALSE : TRUE);
+       /* GList *node = NULL; */
 
-       /* Add attachments */
-       add_attachments (new_msg, attachments_list);
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
 
-       /* Send mail */ 
-       tny_transport_account_send (transport_account, new_msg);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       /* Clean */
-       g_object_unref (header);
-       g_object_unref (new_msg);
-       g_free(content_type);
-}
-
-/**
- * modest_mail_operation_create_forward_mail:
- * @msg: a valid #TnyMsg instance
- * @forward_type: the type of forwarded message
- * 
- * creates a forwarded message from an existing one
- * 
- * Returns: a new #TnyMsg, or NULL in case of error
- **/
-TnyMsg* 
-modest_mail_operation_create_forward_mail (TnyMsg *msg, 
-                                          ModestMailOperationForwardType forward_type)
+       if (html_body == NULL) {
+               msg = modest_tny_msg_new (to, from, cc, bcc, subject, plain_body, (GSList *) attachments_list); /* FIXME: attachments */
+       } else {
+               msg = modest_tny_msg_new_html_plain (to, from, cc, bcc, subject, html_body, plain_body, (GSList *) attachments_list);
+       }
+       if (!msg) {
+               g_printerr ("modest: failed to create a new msg\n");
+               goto cleanup;
+       }
+
+       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;
+       }
+
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+
+       /* Free */
+cleanup:
+       if (msg)
+               g_object_unref (G_OBJECT(msg));
+       if (folder)
+               g_object_unref (G_OBJECT(folder));
+}
+
+static void
+recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all_folders)
 {
-       TnyMsg *new_msg;
-       TnyHeader *new_header, *header;
-       TnyStream *attachment_stream;
-       gchar *new_subject, *new_body, *content_type, *quoted;
-       TnyMimePart *text_body_part = NULL;
-       GList *attachments_list;
-       TnyList *parts;
        TnyIterator *iter;
+       TnyList *folders = tny_simple_list_new ();
 
+       tny_folder_store_get_folders (store, folders, query, NULL);
+       iter = tny_list_create_iterator (folders);
 
-       /* Create new objects */
-       new_msg          = TNY_MSG (tny_camel_msg_new ());
-       new_header       = TNY_HEADER (tny_camel_header_new ());
+       while (!tny_iterator_is_done (iter)) {
 
-       header = tny_msg_get_header (msg);
+               TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter);
 
-       /* Fill the header */
-       tny_msg_set_header (new_msg, new_header);
-       /* FIXME: set it from default account, current account ... */
-       tny_header_set_from (new_header, "<svsdrozo@terra.es>");
+               tny_list_prepend (all_folders, G_OBJECT (folder));
 
-       /* Change the subject */
-       new_subject = (gchar *) modest_text_utils_create_forward_subject (tny_header_get_subject(header));
-       tny_header_set_subject (new_header, (const gchar *) new_subject);
-       g_free (new_subject);
+               recurse_folders (folder, query, all_folders);
+           
+               g_object_unref (G_OBJECT (folder));
 
-       /* Get body from original msg */
-       new_body = (gchar *) modest_tny_msg_actions_find_body (msg, FALSE);
-       if (!new_body) {
-               g_object_unref (new_msg);
-               return NULL;
+               tny_iterator_next (iter);
        }
-       content_type = get_content_type(new_body);
+        g_object_unref (G_OBJECT (iter));
+        g_object_unref (G_OBJECT (folders));
+}
+
+static void
+update_folders_status_cb (GObject *obj,
+                         TnyStatus *status,  
+                         gpointer user_data)
+{
+       ModestMailOperation *self;
+       ModestMailOperationPrivate *priv;
 
-       /* Create the list of attachments */
-       parts = TNY_LIST (tny_simple_list_new());
-       tny_msg_get_parts (msg, parts);
-       iter = tny_list_create_iterator (parts);
-       attachments_list = NULL;
+       g_return_if_fail (status != NULL);
+       g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_REFRESH);
 
-       while (!tny_iterator_is_done(iter)) {
-               TnyMimePart *part;
+       /* 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);
 
-               part = TNY_MIME_PART (tny_iterator_get_current (iter));
-               if (tny_mime_part_is_attachment (part))
-                       attachments_list = g_list_prepend (attachments_list, part);
+       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);
+}
+
+static void
+update_folders_cb (TnyFolderStore *folder_store, TnyList *list, GError **err, gpointer user_data)
+{
+       ModestMailOperation *self;
+       ModestMailOperationPrivate *priv;
+       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;
+               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));
 
-       /* Add attachments */
-       add_attachments (new_msg, attachments_list);
-
-       switch (forward_type) {
-               TnyMimePart *attachment_part;
-               gchar *inlined_text;
-
-       case MODEST_MAIL_OPERATION_FORWARD_TYPE_INLINE:
-               /* Prepend "Original message" text */
-               inlined_text = (gchar *) 
-                       modest_text_utils_create_inlined_text (tny_header_get_from (header),
-                                                              tny_header_get_date_sent (header),
-                                                              tny_header_get_to (header),
-                                                              tny_header_get_subject (header),
-                                                              (const gchar*) new_body);
-               g_free (new_body);
-               new_body = inlined_text;
-
-               /* Add body part */
-               add_body_part (new_msg, new_body, 
-                              (const gchar *) content_type, 
-                              (tny_list_get_length (parts) > 0) ? TRUE : FALSE);
-
-               break;
-       case MODEST_MAIL_OPERATION_FORWARD_TYPE_ATTACHMENT:
-               attachment_part = add_body_part (new_msg, new_body, 
-                                                (const gchar *) content_type, TRUE);
-
-               /* Set the subject as the name of the attachment */
-               tny_mime_part_set_filename (attachment_part, tny_header_get_subject (header));
-               
-               break;
-       }
-
-       /* Clean */
-       g_object_unref (parts);
-       if (attachments_list) g_list_free (attachments_list);
-       if (text_body_part) g_object_unref (text_body_part);
-       g_free (content_type);
-       g_free (new_body);
-
-       return new_msg;
-}
-
-/**
- * modest_mail_operation_create_reply_mail:
- * @msg: a valid #TnyMsg instance
- * @reply_type: the format of the new message
- * @reply_mode: the mode of reply, to the sender only, to a mail list or to all
- * 
- * creates a new message to reply to an existing one
- * 
- * Returns: Returns: a new #TnyMsg, or NULL in case of error
- **/
-TnyMsg* 
-modest_mail_operation_create_reply_mail (TnyMsg *msg, 
-                                        ModestMailOperationReplyType reply_type,
-                                        ModestMailOperationReplyMode reply_mode)
-{
-       TnyMsg *new_msg;
-       TnyHeader *new_header, *header;
-       TnyStream *attachment_stream;
-       gchar *new_subject, *new_body, *content_type, *quoted;
-       TnyList *parts;
-       TnyMimePart *text_body_part;
-       gchar *my_email = NULL;
-
-       /* Create new objects */
-       new_msg          = TNY_MSG (tny_camel_msg_new ());
-       new_header       = TNY_HEADER (tny_camel_header_new ());
-
-       header = tny_msg_get_header (msg);
-
-       /* Fill the header */
-       tny_msg_set_header (new_msg, new_header);
-       tny_header_set_to (new_header, tny_header_get_from (header));
-       /* TODO: set "From:" from my current account */
-/*     current_account = modest_account_mgr_get_current_account (account_mgr); */
-/*             my_email = modest_account_mgr_get_string (account_mgr, */
-/*                                                    current_account, */
-/*                                                    MODEST_ACCOUNT_EMAIL, */
-/*                                                    FALSE, */
-/*                                                    NULL); */
-/*     tny_header_set_from (new_header, email); */
-       my_email = g_strdup ("svsdrozo@terra.es");
-
-       switch (reply_mode) {
-               gchar *new_cc = NULL;
-               const gchar *cc = NULL, *bcc = NULL;
-               GString *tmp = NULL;
-
-       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 */
-               new_cc = (gchar *) 
-                       modest_text_utils_remove_mail_from_mail_list ((const gchar *) tmp->str, 
-                                                                     (const gchar *) my_email);
-               /* 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;
-       }
-       g_free (my_email);
-
-       /* Change the subject */
-       new_subject = (gchar*) modest_text_utils_create_reply_subject (tny_header_get_subject(header));
-       tny_header_set_subject (new_header, (const gchar *) new_subject);
-       g_free (new_subject);
-
-       /* Get body from original msg */
-       new_body = (gchar*) modest_tny_msg_actions_find_body (msg, FALSE);
-       if (!new_body) {
-               g_object_unref (new_msg);
-               return NULL;
-       }
-       content_type = get_content_type(new_body);
-
-       switch (reply_type) {
-               gchar *cited_text;
-
-       case MODEST_MAIL_OPERATION_REPLY_TYPE_CITE:
-               /* Prepend "Original message" text */
-               cited_text = (gchar *) modest_text_utils_create_cited_text (tny_header_get_from (header),
-                                                                           tny_header_get_date_sent (header),
-                                                                           (const gchar*) new_body);
-               g_free (new_body);
-               new_body = cited_text;
-               break;
-       case MODEST_MAIL_OPERATION_REPLY_TYPE_QUOTE:
-               /* FIXME: replace 80 with a value from ModestConf */
-               quoted = (gchar*) modest_text_utils_quote (new_body, 
-                                                          tny_header_get_from (header),
-                                                          tny_header_get_date_sent (header),
-                                                          80);
-               g_free (new_body);
-               new_body = quoted;
-               break;
-       }
-       /* Add body part */
-       text_body_part = add_body_part (new_msg, new_body, 
-                                       (const gchar *) content_type, TRUE);
-
-       /* Clean */
-       g_object_unref (G_OBJECT(text_body_part));
-       g_free (content_type);
-       g_free (new_body);
-
-       return new_msg;
+       /* 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));
+
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
 }
 
-void
-modest_mail_operation_update_account (ModestMailOperation *mail_operation)
+gboolean
+modest_mail_operation_update_account (ModestMailOperation *self,
+                                     TnyStoreAccount *store_account)
 {
-       TnyStoreAccount *storage_account;
        ModestMailOperationPrivate *priv;
        TnyList *folders;
-       TnyIterator *ifolders;
-       TnyFolder *cur_folder;
-       TnyFolderStoreQuery *query;
 
-       g_return_if_fail (mail_operation);
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_operation));
+       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE);
+       g_return_val_if_fail (TNY_IS_STORE_ACCOUNT(store_account), FALSE);
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_operation);
+       /* Pick async call reference */
+       g_object_ref (store_account);
 
-       /* Check that it is a store account */
-       if (!TNY_IS_STORE_ACCOUNT (priv->account)) {
-               set_error (mail_operation,
-                          MODEST_MAIL_OPERATION_ERROR_BAD_ACCOUNT,
-                          _("Error trying to update an account. Use a store account"));
-               return;
-       }
-       storage_account = TNY_STORE_ACCOUNT (priv->account);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       /* Get subscribed folders */
-       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 (TNY_FOLDER_STORE (storage_account),
-                                     folders, NULL);
-       g_object_unref (query);
+       priv->total = 0;
+       priv->done  = 0;
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
        
-       ifolders = tny_list_create_iterator (folders);
+       /* Get subscribed folders & refresh them */
+       folders = TNY_LIST (tny_simple_list_new ());
 
-       /* Async refresh folders */     
-       for (tny_iterator_first (ifolders); 
-            !tny_iterator_is_done (ifolders); 
-            tny_iterator_next (ifolders)) {
-               
-               cur_folder = TNY_FOLDER (tny_iterator_get_current (ifolders));
-               tny_folder_refresh_async (cur_folder, folder_refresh_cb,
-                                         status_update_cb, mail_operation);
-       }
+       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);
        
-       g_object_unref (ifolders);
+       return TRUE;
 }
 
 ModestMailOperationStatus
-modest_mail_operation_get_status (ModestMailOperation *mail_operation)
+modest_mail_operation_get_status (ModestMailOperation *self)
 {
        ModestMailOperationPrivate *priv;
 
-/*     g_return_val_if_fail (mail_operation, MODEST_MAIL_OPERATION_STATUS_INVALID); */
-/*     g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_operation),  */
-/*                           MODEST_MAIL_OPERATION_STATUS_INVALID); */
+       g_return_val_if_fail (self, MODEST_MAIL_OPERATION_STATUS_INVALID);
+       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self),
+                             MODEST_MAIL_OPERATION_STATUS_INVALID);
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_operation);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
        return priv->status;
 }
 
 const GError *
-modest_mail_operation_get_error (ModestMailOperation *mail_operation)
+modest_mail_operation_get_error (ModestMailOperation *self)
 {
        ModestMailOperationPrivate *priv;
 
-/*     g_return_val_if_fail (mail_operation, NULL); */
-/*     g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_operation), NULL); */
+       g_return_val_if_fail (self, NULL);
+       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), NULL);
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_operation);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
        return priv->error;
 }
 
-void 
-modest_mail_operation_cancel (ModestMailOperation *mail_operation)
+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;
+}
+
+guint 
+modest_mail_operation_get_task_done (ModestMailOperation *self)
+{
+       ModestMailOperationPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0);
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       return priv->done;
 }
 
-static gboolean
-is_ascii(const gchar *s)
+guint 
+modest_mail_operation_get_task_total (ModestMailOperation *self)
 {
-       while (s[0]) {
-               if (s[0] & 128 || s[0] < 32)
-                       return FALSE;
-               s++;
+       ModestMailOperationPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0);
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       return priv->total;
+}
+
+gboolean
+modest_mail_operation_is_finished (ModestMailOperation *self)
+{
+       ModestMailOperationPrivate *priv;
+       gboolean retval = FALSE;
+
+       if (!MODEST_IS_MAIL_OPERATION (self)) {
+               g_warning ("%s: invalid parametter", G_GNUC_FUNCTION);
+               return retval;
        }
-       return TRUE;
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       if (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS   ||
+           priv->status == MODEST_MAIL_OPERATION_STATUS_FAILED    ||
+           priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED  ||
+           priv->status == MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS) {
+               retval = TRUE;
+       } else {
+               retval = FALSE;
+       }
+
+       return retval;
 }
 
-static char *
-get_content_type(const gchar *s)
+/* ******************************************************************* */
+/* ************************** STORE  ACTIONS ************************* */
+/* ******************************************************************* */
+
+
+TnyFolder *
+modest_mail_operation_create_folder (ModestMailOperation *self,
+                                    TnyFolderStore *parent,
+                                    const gchar *name)
 {
-       GString *type;
+       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);
        
-       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\"");
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       /* 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;              
+       }
+
+       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)
+{
+       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) {
+               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, *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 {
+               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 the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+}
+
+void
+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);
+
+       /* 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);
+       }
+
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
+ }
+
+TnyFolder *
+modest_mail_operation_xfer_folder (ModestMailOperation *self,
+                                  TnyFolder *folder,
+                                  TnyFolderStore *parent,
+                                  gboolean delete_original)
+{
+       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;
+}
+
+
+/* ******************************************************************* */
+/* **************************  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_HEADER (header));
+       
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       folder = tny_header_get_folder (header);
+
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+
+       /* 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
+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);
+       
+       helper->pending_ops--;
+
+       /* Check errors and cancel */
+       if (*error) {
+               priv->error = g_error_copy (*error);
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               goto out;
+       }
+       if (cancelled) {
+               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;
+       }
+
+       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+
+       /* If user defined callback function was defined, call it */
+       if (helper->user_callback) {
+               helper->user_callback (priv->source, msg, helper->user_data);
+       }
+
+       /* 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);  
+       }
+}
+
+static void     
+get_msg_status_cb (GObject *obj,
+                  TnyStatus *status,  
+                  gpointer user_data)
+{
+       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);
+
+       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)
+{
+       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);
+
+       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);
        }
-       return g_string_free(type, FALSE);
 }
 
-static GQuark 
-modest_error_quark (void)
+static void     
+update_process_msg_status_cb (GObject *obj,
+                             TnyStatus *status,  
+                             gpointer user_data)
 {
-  static GQuark err_q = 0;
+       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);
+
+       if (status->of_total > 0)
+               priv->done += status->position/status->of_total;
 
-  if (err_q == 0)
-    err_q = g_quark_from_static_string ("modest-error-quark");
+       g_print("TEST: %d/%d", priv->done, priv->total); 
 
-  return err_q;
+       if (priv->done == 1 && priv->total == 100)
+               return;
+
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
 }
 
 
-static void 
-set_error (ModestMailOperation *mail_operation, 
-          ModestMailOperationErrorCode error_code,
-          const gchar *fmt, ...)
+
+void 
+modest_mail_operation_remove_msg (ModestMailOperation *self,
+                                 TnyHeader *header,
+                                 gboolean remove_to_trash)
 {
+       TnyFolder *folder;
        ModestMailOperationPrivate *priv;
-       GError* error;
-       va_list args;
-       gchar* orig;
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_operation);
+       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;
+
+               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) {
+                       TnyList *headers;
+
+                       /* Create list */
+                       headers = tny_simple_list_new ();
+                       tny_list_append (headers, G_OBJECT (header));
+                       g_object_unref (header);
 
-       va_start (args, fmt);
+                       /* 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;
+
+                       /* 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"));
+               }
 
-       orig = g_strdup_vprintf(fmt, args);
-       error = g_error_new (MODEST_ERROR, error_code, orig);
+               g_object_unref (G_OBJECT (store_account));
+       } else {
+               tny_folder_remove_msg (folder, header, &(priv->error));
+               if (!priv->error)
+                       tny_folder_sync(folder, TRUE, &(priv->error));
+       }
 
-       va_end (args);
+       /* Set status */
+       if (!priv->error)
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       else
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 
-       if (priv->error)
-               g_object_unref (priv->error);
+       /* Free */
+       g_object_unref (G_OBJECT (folder));
 
-       priv->error = error;
-       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+       /* Notify the queue */
+       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
 }
 
 static void
-status_update_cb (TnyFolder *folder, const gchar *what, gint status, gpointer user_data) 
+transfer_msgs_status_cb (GObject *obj,
+                        TnyStatus *status,  
+                        gpointer user_data)
 {
-       /* TODO: update main window progress bar */
 }
 
+
 static void
-folder_refresh_cb (TnyFolder *folder, gboolean cancelled, gpointer user_data) 
+transfer_msgs_cb (TnyFolder *folder, GError **err, gpointer user_data)
 {
-       if (cancelled) {
-               ModestMailOperation *mail_operation;
-               ModestMailOperationPrivate *priv;
+       XFerMsgAsyncHelper *helper;
+       ModestMailOperation *self;
+       ModestMailOperationPrivate *priv;
 
-               mail_operation = MODEST_MAIL_OPERATION (user_data);
-               priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_operation);
+       helper = (XFerMsgAsyncHelper *) user_data;
+       self = helper->mail_op;
 
-               priv->status =  MODEST_MAIL_OPERATION_STATUS_CANCELLED;
+       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 {
+               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);
 }
 
+void
+modest_mail_operation_xfer_msgs (ModestMailOperation *self,
+                                TnyList *headers, 
+                                TnyFolder *folder, 
+                                gboolean delete_original)
+{
+       ModestMailOperationPrivate *priv;
+       TnyIterator *iter;
+       TnyFolder *src_folder;
+       XFerMsgAsyncHelper *helper;
+       TnyHeader *header;
+
+       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;
+
+       /* Create the helper */
+       helper = g_malloc0 (sizeof (XFerMsgAsyncHelper));
+       helper->mail_op = self;
+       helper->dest_folder = folder;
+       helper->headers = headers;
+
+       /* 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);
+
+       /* Transfer messages */
+       tny_folder_transfer_msgs_async (src_folder, 
+                                       headers, 
+                                       folder, 
+                                       delete_original, 
+                                       transfer_msgs_cb, 
+                                       transfer_msgs_status_cb, 
+                                       helper);
+}
+
+
 static void
-add_attachments (TnyMsg *msg, const GList *attachments_list)
+on_refresh_folder (TnyFolder   *folder, 
+                  gboolean     cancelled, 
+                  GError     **error,
+                  gpointer     user_data)
 {
-       GList *pos;
-       TnyMimePart *attachment_part, *old_attachment;
-       const gchar *attachment_content_type;
-       const gchar *attachment_filename;
-       TnyStream *attachment_stream;
+       ModestMailOperation *self;
+       ModestMailOperationPrivate *priv;
 
-       for (pos = (GList *)attachments_list; pos; pos = pos->next) {
+       self = MODEST_MAIL_OPERATION (user_data);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-               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_MIME_PART (tny_camel_mime_part_new (camel_mime_part_new()));
-               
-               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_msg_add_part (msg, attachment_part);
-               g_object_unref(G_OBJECT(attachment_part));
+       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;
+       }
+
+       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 TnyMimePart *
-add_body_part (TnyMsg *msg, 
-              const gchar *body,
-              const gchar *content_type,
-              gboolean has_attachments)
+static void
+on_refresh_folder_status_update (GObject *obj,
+                                TnyStatus *status,
+                                gpointer user_data)
 {
-       TnyMimePart *text_body_part = NULL;
-       TnyStream *text_body_stream;
+       ModestMailOperation *self;
+       ModestMailOperationPrivate *priv;
 
-       /* Create the stream */
-       text_body_stream = TNY_STREAM (tny_camel_stream_new
-                                      (camel_stream_mem_new_with_buffer
-                                       (body, strlen(body))));
+       g_return_if_fail (status != NULL);
+       g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_REFRESH);
 
-       /* Create body part if needed */
-       if (has_attachments)
-               text_body_part = 
-                       TNY_MIME_PART (tny_camel_mime_part_new (camel_mime_part_new()));
-       else
-               text_body_part = TNY_MIME_PART(msg);
+       /* Temporary FIX: useful when tinymail send us status
+          information *after* calling the function callback */
+       if (!MODEST_IS_MAIL_OPERATION (user_data))
+               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);
+       self = MODEST_MAIL_OPERATION (user_data);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       /* Add part if needed */
-       if (has_attachments) {
-               tny_msg_add_part (msg, text_body_part);
-               g_object_unref (G_OBJECT(text_body_part));
-       }
+       priv->done = status->position;
+       priv->total = status->of_total;
 
-       /* Clean */
-       g_object_unref (text_body_stream);
+       if (priv->done == 1 && priv->total == 100)
+               return;
 
-       return text_body_part;
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
+}
+
+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);
+
+       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);
+}
+
+void
+_modest_mail_operation_notify_end (ModestMailOperation *self)
+{
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
 }