* Replaced tny_folder_get_msg by its async version
[modest] / src / modest-mail-operation.c
index f5cb15c..d655730 100644 (file)
 #include <tny-store-account.h>
 #include <tny-folder-store.h>
 #include <tny-folder-store-query.h>
+#include <tny-camel-msg.h>
+#include <tny-camel-header.h>
+#include <tny-camel-stream.h>
+#include <tny-camel-mime-part.h>
+#include <tny-simple-list.h>
+#include <camel/camel-stream-mem.h>
 #include <glib/gi18n.h>
+
+#include "modest-text-utils.h"
+#include "modest-tny-msg-actions.h"
 #include "modest-tny-platform-factory.h"
+#include "modest-marshal.h"
+#include "modest-formatter.h"
 
 /* 'private'/'protected' functions */
 static void modest_mail_operation_class_init (ModestMailOperationClass *klass);
@@ -49,22 +60,29 @@ typedef enum _ModestMailOperationErrorCode ModestMailOperationErrorCode;
 enum _ModestMailOperationErrorCode {
         MODEST_MAIL_OPERATION_ERROR_BAD_ACCOUNT,
         MODEST_MAIL_OPERATION_ERROR_MISSING_PARAMETER,
+       MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
 
        MODEST_MAIL_OPERATION_NUM_ERROR_CODES
 };
 
-static void       set_error          (ModestMailOperation *mail_operation, 
+static void     set_error            (ModestMailOperation *mail_operation, 
                                      ModestMailOperationErrorCode error_code,
                                      const gchar *fmt, ...);
-static void       status_update_cb   (TnyFolder *folder, 
+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       folder_refresh_cb  (TnyFolder *folder, 
-                                     gboolean cancelled, 
+static void     update_folders_cb    (TnyFolderStore *self, 
+                                     TnyList *list, 
+                                     GError **err, 
                                      gpointer user_data);
-static void       add_attachments    (TnyMsg *msg, 
-                                     const GList *attachments_list);
+static void     add_attachments      (TnyMsg *msg, 
+                                     GList *attachments_list);
 
 
 static TnyMimePart *         add_body_part    (TnyMsg *msg, 
@@ -73,16 +91,34 @@ static TnyMimePart *         add_body_part    (TnyMsg *msg,
                                               gboolean has_attachments);
 
 
-/* list my signals  */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
+static void modest_mail_operation_xfer_folder (ModestMailOperation *mail_op,
+                                              TnyFolder *folder,
+                                              TnyFolderStore *parent,
+                                              gboolean delete_original);
+
+static void modest_mail_operation_xfer_msg    (ModestMailOperation *mail_op,
+                                              TnyHeader *header, 
+                                              TnyFolder *folder, 
+                                              gboolean delete_original);
+
+static TnyFolder * modest_mail_operation_find_trash_folder (ModestMailOperation *mail_op,
+                                                           TnyStoreAccount *store_account);
+
+
+enum _ModestMailOperationSignals 
+{
+       PROGRESS_CHANGED_SIGNAL,
+
+       NUM_SIGNALS
 };
 
 typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate;
 struct _ModestMailOperationPrivate {
-       TnyAccount                *account;
+       guint                      failed;
+       guint                      canceled;
+       guint                      done;
+       guint                      total;
+       GMutex                    *cb_lock;
        ModestMailOperationStatus  status;
        GError                    *error;
 };
@@ -97,8 +133,7 @@ static gboolean is_ascii(const gchar *s);
 /* 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)
@@ -136,11 +171,14 @@ 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. */
+       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
@@ -150,9 +188,13 @@ 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->error    = NULL;
+       priv->done     = 0;
+       priv->failed   = 0;
+       priv->canceled = 0;
+       priv->total    = 0;
+       priv->cb_lock  = g_mutex_new ();
 }
 
 static void
@@ -162,57 +204,37 @@ 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_error_free (priv->error);
                priv->error = NULL;
        }
 
+       g_mutex_free (priv->cb_lock);
+
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
 ModestMailOperation*
-modest_mail_operation_new (TnyAccount *account)
+modest_mail_operation_new (void)
 {
-       ModestMailOperation *mail_operation;
-       ModestMailOperationPrivate *priv;
-
-       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);
-
-       return mail_operation;
+       return MODEST_MAIL_OPERATION(g_object_new(MODEST_TYPE_MAIL_OPERATION, NULL));
 }
 
 
 void
-modest_mail_operation_send_mail (ModestMailOperation *mail_operation,
+modest_mail_operation_send_mail (ModestMailOperation *mail_op,
+                                TnyTransportAccount *transport_account,
                                 TnyMsg* msg)
 {
-       ModestMailOperationPrivate *priv;
-       TnyTransportAccount *transport_account;
-
-       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"));
-       }
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op));
+       g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
 
-       transport_account = TNY_TRANSPORT_ACCOUNT (priv->account);
-
-       mail_operation = modest_mail_operation_new (NULL);
-       tny_transport_account_send (transport_account, msg);
+       tny_transport_account_send (transport_account, msg, NULL); /* FIXME */
 }
 
 void
-modest_mail_operation_send_new_mail (ModestMailOperation *mail_operation,
+modest_mail_operation_send_new_mail (ModestMailOperation *mail_op,
+                                    TnyTransportAccount *transport_account,
                                     const gchar *from,
                                     const gchar *to,
                                     const gchar *cc,
@@ -223,38 +245,27 @@ modest_mail_operation_send_new_mail (ModestMailOperation *mail_operation,
 {
        TnyMsg *new_msg;
        TnyHeader *header;
-       TnyTransportAccount *transport_account;
-       ModestMailOperationPrivate *priv;
        gchar *content_type;
 
-       g_return_if_fail (mail_operation);
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op));
+       g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
 
        /* Check parametters */
        if (to == NULL) {
-               set_error (mail_operation,
+               set_error (mail_op,
                           MODEST_MAIL_OPERATION_ERROR_MISSING_PARAMETER,
                           _("Error trying to send a mail. You need to set almost one a 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"));
-               return;
-       }
-
        /* Create new msg */
-       transport_account = TNY_TRANSPORT_ACCOUNT (priv->account);
-
        new_msg          = TNY_MSG (tny_camel_msg_new ());
        header           = TNY_HEADER (tny_camel_header_new ());
 
        /* 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);
@@ -267,10 +278,10 @@ modest_mail_operation_send_new_mail (ModestMailOperation *mail_operation,
                       (attachments_list == NULL) ? FALSE : TRUE);
 
        /* Add attachments */
-       add_attachments (new_msg, attachments_list);
+       add_attachments (new_msg, (GList*) attachments_list);
 
-       /* Send mail */ 
-       tny_transport_account_send (transport_account, new_msg);
+       /* Send mail */
+       tny_transport_account_send (transport_account, new_msg, NULL); /* FIXME */
 
        /* Clean */
        g_object_unref (header);
@@ -278,6 +289,79 @@ modest_mail_operation_send_new_mail (ModestMailOperation *mail_operation,
        g_free(content_type);
 }
 
+static void
+add_if_attachment (gpointer data, gpointer user_data)
+{
+       TnyMimePart *part;
+       GList *attachments_list;
+
+       part = TNY_MIME_PART (data);
+       attachments_list = (GList *) user_data;
+
+       if (tny_mime_part_is_attachment (part))
+               attachments_list = g_list_prepend (attachments_list, part);
+}
+
+
+static TnyMsg *
+create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, guint type)
+{
+       TnyMsg *new_msg;
+       TnyHeader *new_header, *header;
+       gchar *new_subject;
+       TnyMimePart *body;
+       ModestFormatter *formatter;
+
+       /* Get body from original msg */
+       header = tny_msg_get_header (msg);
+       body   = modest_tny_msg_actions_find_body_part (msg, TRUE);
+
+       /* 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;
+               }
+       } 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;
+               }
+       }
+       g_object_unref (G_OBJECT (formatter));
+
+       /* Fill the header */
+       new_header = TNY_HEADER (tny_camel_header_new ());
+       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);
+
+       /* Clean */
+       g_object_unref (G_OBJECT (new_header));
+       g_object_unref (G_OBJECT (header));
+
+       return new_msg;
+}
+
 /**
  * modest_mail_operation_create_forward_mail:
  * @msg: a valid #TnyMsg instance
@@ -293,93 +377,20 @@ modest_mail_operation_create_forward_mail (TnyMsg *msg,
                                           ModestMailOperationForwardType forward_type)
 {
        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 *parts = NULL;
+       GList *attachments_list = NULL;
 
-       /* Create new objects */
-       new_msg          = TNY_MSG (tny_camel_msg_new ());
-       new_header       = TNY_HEADER (tny_camel_header_new ());
+       new_msg = create_reply_forward_mail (msg, from, FALSE, forward_type);
 
-       header = tny_msg_get_header (msg);
-
-       /* Fill the header */
-       tny_msg_set_header (new_msg, new_header);
-       tny_header_set_from (new_header, from);
-
-       /* 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);
-
-       /* 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);
-
-       /* Create the list of attachments */
+       /* Add attachments */
        parts = TNY_LIST (tny_simple_list_new());
        tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
-       iter = tny_list_create_iterator (parts);
-       attachments_list = NULL;
-
-       while (!tny_iterator_is_done(iter)) {
-               TnyMimePart *part;
-
-               part = TNY_MIME_PART (tny_iterator_get_current (iter));
-               if (tny_mime_part_is_attachment (part))
-                       attachments_list = g_list_prepend (attachments_list, part);
-
-               tny_iterator_next (iter);
-       }
-
-       /* Add attachments */
+       tny_list_foreach (parts, add_if_attachment, attachments_list);
        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 */
        if (attachments_list) g_list_free (attachments_list);
-       g_object_unref (parts);
-       if (text_body_part) g_free (text_body_part);
-       g_free (content_type);
-       g_free (new_body);
+       g_object_unref (G_OBJECT (parts));
 
        return new_msg;
 }
@@ -402,20 +413,18 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg,
 {
        TnyMsg *new_msg;
        TnyHeader *new_header, *header;
-       TnyStream *attachment_stream;
-       gchar *new_subject, *new_body, *content_type, *quoted;
-       TnyList *parts;
-       TnyMimePart *text_body_part;
+       const gchar* reply_to;
 
-       /* 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);
+       new_msg = create_reply_forward_mail (msg, from, TRUE, reply_type);
 
        /* Fill the header */
-       tny_msg_set_header (new_msg, new_header);
-       tny_header_set_to (new_header, tny_header_get_from (header));
-       tny_header_set_from (new_header, from);
+       header = tny_msg_get_header (msg);
+       new_header = tny_msg_get_header (new_msg);
+       reply_to = tny_header_get_replyto (header);
+       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) {
                gchar *new_cc = NULL;
@@ -437,10 +446,13 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg,
                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 */
+
+               /* 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_mail_from_mail_list ((const gchar *) tmp->str, 
-                                                                     (const gchar *) from);
+                       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);
 
@@ -450,130 +462,468 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg,
                break;
        }
 
-       /* 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);
+       /* Clean */
+       g_object_unref (G_OBJECT (new_header));
+       g_object_unref (G_OBJECT (header));
 
-       /* 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;
+       return new_msg;
+}
+
+static void
+status_update_cb (TnyFolder *folder, const gchar *what, gint status, gint oftotal, gpointer user_data) 
+{
+       g_print ("%s status: %d, of total %d\n", what, status, oftotal);
+}
+
+static void
+folder_refresh_cb (TnyFolder *folder, gboolean canceled, GError **err, gpointer user_data)
+{
+       ModestMailOperation *mail_op = NULL;
+       ModestMailOperationPrivate *priv = NULL;
+
+       mail_op = MODEST_MAIL_OPERATION (user_data);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op);
+
+       g_mutex_lock (priv->cb_lock);
+
+       if ((canceled && *err) || *err) {
+               priv->error = g_error_copy (*err);
+               priv->failed++;
+       } else if (canceled) {
+               priv->canceled++;
+               set_error (mail_op,
+                          MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
+                          _("Error trying to refresh folder %s. Operation canceled"),
+                          tny_folder_get_name (folder));
+       } else {
+               priv->done++;
        }
-       /* Add body part */
-       text_body_part = add_body_part (new_msg, new_body, 
-                                       (const gchar *) content_type, TRUE);
 
-       /* Clean */
-/*     g_free (text_body_part); */
-       g_free (content_type);
-       g_free (new_body);
+       if (priv->done == priv->total)
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       else if ((priv->done + priv->canceled + priv->failed) == priv->total)
+               if (priv->failed == priv->total)
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               else if (priv->failed == priv->total)
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
+               else
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS;
 
-       return new_msg;
+       g_mutex_unlock (priv->cb_lock);
+
+       g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
 }
 
-void
-modest_mail_operation_update_account (ModestMailOperation *mail_operation)
+
+static void
+update_folders_cb (TnyFolderStore *self, TnyList *list, GError **err, gpointer user_data)
 {
-       TnyStoreAccount *storage_account;
+       ModestMailOperation *mail_op;
        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));
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_operation);
+       mail_op = MODEST_MAIL_OPERATION (user_data);
+       priv    = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op);
 
-       /* 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);
+       ifolders = tny_list_create_iterator (list);
+       priv->total = tny_list_get_length (list);
+       priv->done = 0;
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
-       /* 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, query);
-       g_object_unref (query);
-       
-       ifolders = tny_list_create_iterator (folders);
-
-       /* Async refresh folders */     
+       /* Async refresh folders. Reference the mail_op because
+          tinymail destroys the user_data */   
        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);
+               tny_folder_refresh_async (cur_folder, 
+                                         folder_refresh_cb,
+                                         status_update_cb, g_object_ref (mail_op));
        }
        
-       g_object_unref (ifolders);
+       g_object_unref (G_OBJECT (ifolders));
+       g_object_unref (G_OBJECT (list));
+}
+
+gboolean
+modest_mail_operation_update_account (ModestMailOperation *mail_op,
+                                     TnyStoreAccount *store_account)
+{
+       ModestMailOperationPrivate *priv;
+       TnyList *folders;
+       TnyFolderStoreQuery *query;
+
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op));
+       g_return_if_fail (TNY_IS_STORE_ACCOUNT(store_account));
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op);
+
+       /* 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, mail_op);
+       g_object_unref (query);
+
+       return TRUE;
 }
 
 ModestMailOperationStatus
-modest_mail_operation_get_status (ModestMailOperation *mail_operation)
+modest_mail_operation_get_status (ModestMailOperation *mail_op)
 {
        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),  */
+/*     g_return_val_if_fail (mail_op, MODEST_MAIL_OPERATION_STATUS_INVALID); */
+/*     g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op),  */
 /*                           MODEST_MAIL_OPERATION_STATUS_INVALID); */
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_operation);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op);
        return priv->status;
 }
 
 const GError *
-modest_mail_operation_get_error (ModestMailOperation *mail_operation)
+modest_mail_operation_get_error (ModestMailOperation *mail_op)
 {
        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 (mail_op, NULL); */
+/*     g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), NULL); */
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_operation);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op);
        return priv->error;
 }
 
 void 
-modest_mail_operation_cancel (ModestMailOperation *mail_operation)
+modest_mail_operation_cancel (ModestMailOperation *mail_op)
 {
        /* TODO */
 }
 
+guint 
+modest_mail_operation_get_task_done (ModestMailOperation *mail_op)
+{
+       ModestMailOperationPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), 0);
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op);
+       return priv->done;
+}
+
+guint 
+modest_mail_operation_get_task_total (ModestMailOperation *mail_op)
+{
+       ModestMailOperationPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), 0);
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op);
+       return priv->total;
+}
+
+gboolean
+modest_mail_operation_is_finished (ModestMailOperation *mail_op)
+{
+       ModestMailOperationPrivate *priv;
+       gboolean retval = FALSE;
+
+       if (!MODEST_IS_MAIL_OPERATION (mail_op)) {
+               g_warning ("%s: invalid parametter", G_GNUC_FUNCTION);
+               return retval;
+       }
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op);
+
+       g_mutex_lock (priv->cb_lock);
+
+       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;
+       }
+       g_mutex_unlock (priv->cb_lock);
+
+       return retval;
+}
+
+/* ******************************************************************* */
+/* ************************** STORE  ACTIONS ************************* */
+/* ******************************************************************* */
+
+
+TnyFolder *
+modest_mail_operation_create_folder (ModestMailOperation *mail_op,
+                                    TnyFolderStore *parent,
+                                    const gchar *name)
+{
+       g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
+       g_return_val_if_fail (name, NULL);
+
+       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;
+
+       /* 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));
+       }
+
+       return new_folder;
+}
+
+void
+modest_mail_operation_remove_folder (ModestMailOperation *mail_op,
+                                    TnyFolder *folder,
+                                    gboolean remove_to_trash)
+{
+       TnyFolderStore *folder_store;
+
+       g_return_if_fail (TNY_IS_FOLDER (folder));
+
+       /* Get folder store */
+       folder_store = TNY_FOLDER_STORE (tny_folder_get_account (folder));
+
+       /* Delete folder or move to trash */
+       if (remove_to_trash) {
+               TnyFolder *trash_folder;
+
+               trash_folder = modest_mail_operation_find_trash_folder (mail_op,
+                                                                       TNY_STORE_ACCOUNT (folder_store));
+
+               /* TODO: error_handling */
+               modest_mail_operation_move_folder (mail_op, 
+                                                  folder, 
+                                                  TNY_FOLDER_STORE (trash_folder));
+       } else {
+               tny_folder_store_remove_folder (folder_store, folder, NULL); /* FIXME */
+               g_object_unref (G_OBJECT (folder));
+       }
+
+       /* Free instances */
+       g_object_unref (G_OBJECT (folder_store));
+}
+
+void
+modest_mail_operation_rename_folder (ModestMailOperation *mail_op,
+                                    TnyFolder *folder,
+                                    const gchar *name)
+{
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op));
+       g_return_if_fail (TNY_IS_FOLDER_STORE (folder));
+
+       /* FIXME: better error handling */
+       if (strrchr (name, '/') != NULL)
+               return;
+
+       /* Rename. Camel handles folder subscription/unsubscription */
+       tny_folder_set_name (folder, name, NULL); /* FIXME */
+ }
+
+void
+modest_mail_operation_move_folder (ModestMailOperation *mail_op,
+                                  TnyFolder *folder,
+                                  TnyFolderStore *parent)
+{
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op));
+       g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
+       g_return_if_fail (TNY_IS_FOLDER (folder));
+       
+       modest_mail_operation_xfer_folder (mail_op, folder, parent, TRUE);
+}
+
+void
+modest_mail_operation_copy_folder (ModestMailOperation *mail_op,
+                                  TnyFolder *folder,
+                                  TnyFolderStore *parent)
+{
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op));
+       g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
+       g_return_if_fail (TNY_IS_FOLDER (folder));
+
+       modest_mail_operation_xfer_folder (mail_op, folder, parent, FALSE);
+}
+
+static void
+modest_mail_operation_xfer_folder (ModestMailOperation *mail_op,
+                                  TnyFolder *folder,
+                                  TnyFolderStore *parent,
+                                  gboolean delete_original)
+{
+       const gchar *folder_name;
+       TnyFolder *dest_folder, *child;
+       TnyIterator *iter;
+       TnyList *folders, *headers;
+
+       g_return_if_fail (TNY_IS_FOLDER (folder));
+       g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
+
+       /* Create the destination folder */
+       folder_name = tny_folder_get_name (folder);
+       dest_folder = modest_mail_operation_create_folder (mail_op, 
+                                                          parent, folder_name);
+
+       /* 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 */
+
+       /* 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);
+
+       while (!tny_iterator_is_done (iter)) {
+
+               child = TNY_FOLDER (tny_iterator_get_current (iter));
+               modest_mail_operation_xfer_folder (mail_op, child,
+                                                  TNY_FOLDER_STORE (dest_folder),
+                                                  delete_original);
+               tny_iterator_next (iter);
+       }
+
+       /* Delete source folder (if needed) */
+       if (delete_original)
+               modest_mail_operation_remove_folder (mail_op, folder, FALSE);
+
+       /* 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));
+}
+
+static TnyFolder *
+modest_mail_operation_find_trash_folder (ModestMailOperation *mail_op,
+                                        TnyStoreAccount *store_account)
+{
+       TnyList *folders;
+       TnyIterator *iter;
+       gboolean found;
+       /*TnyFolderStoreQuery *query;*/
+       TnyFolder *trash_folder;
+
+       /* Look for Trash folder */
+       folders = TNY_LIST (tny_simple_list_new ());
+       tny_folder_store_get_folders (TNY_FOLDER_STORE (store_account),
+                                     folders, NULL, NULL); /* FIXME */
+       iter = tny_list_create_iterator (folders);
+
+       found = FALSE;
+       while (!tny_iterator_is_done (iter) && !found) {
+
+               trash_folder = TNY_FOLDER (tny_iterator_get_current (iter));
+               if (tny_folder_get_folder_type (trash_folder) == TNY_FOLDER_TYPE_TRASH)
+                       found = TRUE;
+               else
+                       tny_iterator_next (iter);
+       }
+
+       /* Clean up */
+       g_object_unref (G_OBJECT (folders));
+       g_object_unref (G_OBJECT (iter));
+
+       /* TODO: better error handling management */
+       if (!found) 
+               return NULL;
+       else
+               return trash_folder;
+}
+
+/* ******************************************************************* */
+/* **************************  MSG  ACTIONS  ************************* */
+/* ******************************************************************* */
+
+void 
+modest_mail_operation_copy_msg (ModestMailOperation *mail_op,
+                               TnyHeader *header, 
+                               TnyFolder *folder)
+{
+       g_return_if_fail (TNY_IS_HEADER (header));
+       g_return_if_fail (TNY_IS_FOLDER (folder));
+
+       modest_mail_operation_xfer_msg (mail_op, header, folder, FALSE);
+}
+
+void 
+modest_mail_operation_move_msg (ModestMailOperation *mail_op,
+                               TnyHeader *header, 
+                               TnyFolder *folder)
+{
+       g_return_if_fail (TNY_IS_HEADER (header));
+       g_return_if_fail (TNY_IS_FOLDER (folder));
+
+       modest_mail_operation_xfer_msg (mail_op, header, folder, TRUE);
+}
+
+void 
+modest_mail_operation_remove_msg (ModestMailOperation *mail_op,
+                                 TnyHeader *header,
+                                 gboolean remove_to_trash)
+{
+       TnyFolder *folder;
+
+       g_return_if_fail (TNY_IS_HEADER (header));
+
+       folder = tny_header_get_folder (header);
+
+       /* 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_mail_operation_find_trash_folder (mail_op, store_account);
+
+               modest_mail_operation_move_msg (mail_op, header, trash_folder);
+
+               g_object_unref (G_OBJECT (store_account));
+       } else {
+               tny_folder_remove_msg (folder, header, NULL); /* FIXME */
+               tny_folder_expunge (folder, NULL); /* FIXME */
+       }
+
+       /* Free */
+       g_object_unref (folder);
+}
+
+static void
+modest_mail_operation_xfer_msg (ModestMailOperation *mail_op,
+                               TnyHeader *header, 
+                               TnyFolder *folder, 
+                               gboolean delete_original)
+{
+       TnyFolder *src_folder;
+       TnyList *headers;
+
+       src_folder = tny_header_get_folder (header);
+       headers = tny_simple_list_new ();
+
+       /* Move */
+       tny_list_prepend (headers, G_OBJECT (header));
+       tny_folder_transfer_msgs (src_folder, headers, folder, delete_original, NULL); /* FIXME */
+
+       /* Free */
+       g_object_unref (headers);
+       g_object_unref (folder);
+}
+
+
+/* ******************************************************************* */
+/* ************************* UTILIY FUNCTIONS ************************ */
+/* ******************************************************************* */
 static gboolean
 is_ascii(const gchar *s)
 {
@@ -606,17 +956,17 @@ get_content_type(const gchar *s)
 static GQuark 
 modest_error_quark (void)
 {
-  static GQuark err_q = 0;
-
-  if (err_q == 0)
-    err_q = g_quark_from_static_string ("modest-error-quark");
-
-  return err_q;
+       static GQuark err_q = 0;
+       
+       if (err_q == 0)
+               err_q = g_quark_from_static_string ("modest-error-quark");
+       
+       return err_q;
 }
 
 
 static void 
-set_error (ModestMailOperation *mail_operation, 
+set_error (ModestMailOperation *mail_op, 
           ModestMailOperationErrorCode error_code,
           const gchar *fmt, ...)
 {
@@ -625,7 +975,7 @@ set_error (ModestMailOperation *mail_operation,
        va_list args;
        gchar* orig;
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_operation);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op);
 
        va_start (args, fmt);
 
@@ -638,31 +988,10 @@ set_error (ModestMailOperation *mail_operation,
                g_object_unref (priv->error);
 
        priv->error = error;
-       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-}
-
-static void
-status_update_cb (TnyFolder *folder, const gchar *what, gint status, gpointer user_data) 
-{
-       /* TODO: update main window progress bar */
 }
 
 static void
-folder_refresh_cb (TnyFolder *folder, gboolean cancelled, gpointer user_data) 
-{
-       if (cancelled) {
-               ModestMailOperation *mail_operation;
-               ModestMailOperationPrivate *priv;
-
-               mail_operation = MODEST_MAIL_OPERATION (user_data);
-               priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_operation);
-
-               priv->status =  MODEST_MAIL_OPERATION_STATUS_CANCELLED;
-       }
-}
-
-static void
-add_attachments (TnyMsg *msg, const GList *attachments_list)
+add_attachments (TnyMsg *msg, GList *attachments_list)
 {
        GList *pos;
        TnyMimePart *attachment_part, *old_attachment;
@@ -691,6 +1020,7 @@ add_attachments (TnyMsg *msg, const GList *attachments_list)
        }
 }
 
+
 static TnyMimePart *
 add_body_part (TnyMsg *msg, 
               const gchar *body,