* fix all compiler warnings (when using gtk/ frontend)
[modest] / src / modest-mail-operation.c
index cb43706..59d3509 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 <camel/camel-stream-mem.h>
 #include <glib/gi18n.h>
+#include <modest-tny-account.h>
+#include "modest-text-utils.h"
+#include "modest-tny-msg.h"
+#include "modest-tny-platform-factory.h"
+#include "modest-marshal.h"
+#include "modest-formatter.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     status_update_cb     (TnyFolder *folder, 
+                                     const gchar *what, 
+                                     gint status, 
+                                     gint oftotal,
+                                     gpointer user_data);
+static void     folder_refresh_cb    (TnyFolder *folder, 
+                                     gboolean canceled,
+                                     GError **err,
+                                     gpointer user_data);
+static void     update_folders_cb    (TnyFolderStore *self, 
+                                     TnyList *list, 
+                                     GError **err, 
+                                     gpointer user_data);
+static void     add_attachments      (TnyMsg *msg, 
+                                     GList *attachments_list);
+
+
+static TnyMimePart *         add_body_part    (TnyMsg *msg, 
+                                              const gchar *body,
+                                              const gchar *content_type, 
+                                              gboolean has_attachments);
+
+
+static void        modest_mail_operation_xfer_folder       (ModestMailOperation *self,
+                                                           TnyFolder *folder,
+                                                           TnyFolderStore *parent,
+                                                           gboolean delete_original);
+
+static gboolean    modest_mail_operation_xfer_msg          (ModestMailOperation *self,
+                                                           TnyHeader *header, 
+                                                           TnyFolder *folder, 
+                                                           gboolean delete_original);
+
+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);
-
-/* list my signals  */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
+       NUM_SIGNALS
 };
 
 typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate;
 struct _ModestMailOperationPrivate {
-       TnyAccount                *account;
+       guint                      done;
+       guint                      total;
        ModestMailOperationStatus  status;
        GError                    *error;
 };
@@ -77,6 +103,15 @@ struct _ModestMailOperationPrivate {
                                                    MODEST_TYPE_MAIL_OPERATION, \
                                                    ModestMailOperationPrivate))
 
+typedef struct _RefreshFolderAsyncHelper
+{
+       ModestMailOperation *mail_op;
+       TnyIterator *iter;
+       guint failed;
+       guint canceled;
+
+} RefreshFolderAsyncHelper;
+
 /* some utility functions */
 static char * get_content_type(const gchar *s);
 static gboolean is_ascii(const gchar *s);
@@ -84,8 +119,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)
@@ -122,12 +156,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
@@ -137,9 +180,10 @@ 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->total    = 0;
 }
 
 static void
@@ -149,12 +193,8 @@ 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;
        }
 
@@ -162,44 +202,26 @@ modest_mail_operation_finalize (GObject *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 *self,
+                                TnyTransportAccount *transport_account,
                                 TnyMsg* msg)
 {
-       ModestMailOperationPrivate *priv;
-       TnyTransportAccount *transport_account;
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(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"));
-       }
-
-       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 *self,
+                                    TnyTransportAccount *transport_account,
                                     const gchar *from,
                                     const gchar *to,
                                     const gchar *cc,
@@ -208,258 +230,185 @@ modest_mail_operation_send_new_mail (ModestMailOperation *mail_operation,
                                     const gchar *body,
                                     const GList *attachments_list)
 {
+       TnyPlatformFactory *fact;
        TnyMsg *new_msg;
-       TnyHeader *headers;
-       TnyStream *text_body_stream, *attachment_stream;
-       TnyTransportAccount *transport_account;
-       ModestMailOperationPrivate *priv;
-       ModestTnyAttachment *attachment;
-       GList *pos;
+       TnyHeader *header;
        gchar *content_type;
-       const gchar *attachment_content_type;
-       const gchar *attachment_filename;
+       ModestMailOperationPrivate *priv = NULL;
 
-       g_return_if_fail (mail_operation);
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
 
-       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"));
-               return;
-       }
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       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"));
+       /* Check parametters */
+       if (to == NULL) {
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_MISSING_PARAMETER,
+                            _("Error trying to send a mail. You need to set almost one a recipient"));
                return;
        }
 
-       transport_account = TNY_TRANSPORT_ACCOUNT (priv->account);
-
-       new_msg          = TNY_MSG (tny_camel_msg_new ());
-       headers          = TNY_HEADER (tny_camel_header_new ());
-       text_body_stream = TNY_STREAM (tny_camel_stream_new
-                                      (camel_stream_mem_new_with_buffer
-                                       (body, strlen(body))));
+       /* Create new msg */
+       fact    = modest_tny_platform_factory_get_instance ();
+       new_msg = tny_platform_factory_new_msg (fact);
+       header  = tny_platform_factory_new_header (fact);
 
-       /* IMPORTANT: set the header before assign values to it */
-       tny_msg_set_header (new_msg, headers);
-       tny_header_set_from (TNY_HEADER (headers), from);
-       tny_header_set_to (TNY_HEADER (headers), to);
-       tny_header_set_cc (TNY_HEADER (headers), cc);
-       tny_header_set_bcc (TNY_HEADER (headers), bcc);
-       tny_header_set_subject (TNY_HEADER (headers), subject);
+       /* WARNING: set the header before assign values to it */
+       tny_msg_set_header (new_msg, header);
+       tny_header_set_from (TNY_HEADER (header), from);
+       tny_header_set_replyto (TNY_HEADER (header), from);
+       tny_header_set_to (TNY_HEADER (header), to);
+       tny_header_set_cc (TNY_HEADER (header), cc);
+       tny_header_set_bcc (TNY_HEADER (header), bcc);
+       tny_header_set_subject (TNY_HEADER (header), subject);
 
        content_type = get_content_type(body);
-       
-       if (attachments_list == NULL) {
-               tny_stream_reset (text_body_stream);
-               tny_mime_part_construct_from_stream (TNY_MIME_PART(new_msg),
-                                                    text_body_stream, content_type);
-               tny_stream_reset (text_body_stream);
-       } else {
-               TnyMimePart *text_body_part;
-
-               text_body_part = 
-                       TNY_MIME_PART (tny_camel_mime_part_new (camel_mime_part_new()));
-               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);
-               tny_msg_add_part (new_msg, text_body_part);
-               g_object_unref (G_OBJECT(text_body_part));
-       }
 
-       for (pos = (GList *)attachments_list;
-            pos;
-            pos = pos->next) {
-               TnyMimePart *attachment_part;
+       /* Add the body of the new mail */      
+       add_body_part (new_msg, body, (const gchar *) content_type,
+                      (attachments_list == NULL) ? FALSE : TRUE);
 
-               attachment = pos->data;
-               attachment_filename = modest_tny_attachment_get_name (attachment);
-               attachment_stream = modest_tny_attachment_get_stream (attachment);
-               attachment_part = TNY_MIME_PART (tny_camel_mime_part_new (camel_mime_part_new()));
-               
-               attachment_content_type = modest_tny_attachment_get_mime_type (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 (new_msg, attachment_part);
-               g_object_unref(G_OBJECT(attachment_part));
-       }
-       
-       tny_transport_account_send (transport_account, new_msg);
+       /* Add attachments */
+       add_attachments (new_msg, (GList*) attachments_list);
+
+       /* Send mail */
+       tny_transport_account_send (transport_account, new_msg, NULL); /* FIXME */
 
        /* Clean */
-       g_object_unref (G_OBJECT(text_body_stream));
-       g_object_unref (G_OBJECT(headers));
-       g_object_unref (G_OBJECT(new_msg));
+       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)
+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)
 {
+       TnyPlatformFactory *fact;
        TnyMsg *new_msg;
        TnyHeader *new_header, *header;
-       TnyStream *attachment_stream;
-       gchar *new_subject, *new_body, *content_type, *quoted;
-       TnyList *parts;
-       TnyMimePart *text_body_part = NULL;
-       TnyStream *text_body_stream = NULL;
-
-       /* Create new objects */
-       new_msg          = TNY_MSG (tny_camel_msg_new ());
-       new_header       = TNY_HEADER (tny_camel_header_new ());
+       gchar *new_subject;
+       TnyMimePart *body;
+       ModestFormatter *formatter;
 
+       /* Get body from original msg. Always look for the text/plain
+          part of the message to create the reply/forwarded mail */
        header = tny_msg_get_header (msg);
-
+       body   = modest_tny_msg_find_body_part (msg, FALSE);
+
+       /* TODO: select the formatter from account prefs */
+       formatter = modest_formatter_new ("text/plain");
+
+       /* Format message body */
+       if (is_reply) {
+               switch (type) {
+               case MODEST_MAIL_OPERATION_REPLY_TYPE_CITE:
+               default:
+                       new_msg = modest_formatter_cite  (formatter, body, header);
+                       break;
+               case MODEST_MAIL_OPERATION_REPLY_TYPE_QUOTE:
+                       new_msg = modest_formatter_quote (formatter, body, header);
+                       break;
+               }
+       } 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));
+       g_object_unref (G_OBJECT(body));
+       
        /* Fill the header */
+       fact = modest_tny_platform_factory_get_instance ();
+       new_header = TNY_HEADER (tny_platform_factory_new_header (fact));
        tny_msg_set_header (new_msg, new_header);
-       /* FIXME: set it from default account, current account ... */
-       tny_header_set_from (new_header, "<me@home.org>");
+       tny_header_set_from (new_header, from);
+       tny_header_set_replyto (new_header, from);
 
        /* Change the subject */
-       new_subject = (gchar *) modest_text_utils_create_forward_subject (tny_header_get_subject(header));
+       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);
 
-       /* 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 (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;
-
-               /* Create the body */
-               text_body_stream = TNY_STREAM (tny_camel_stream_new
-                                              (camel_stream_mem_new_with_buffer
-                                               (new_body, strlen(new_body))));
-
-               text_body_part = 
-                       TNY_MIME_PART (tny_camel_mime_part_new (camel_mime_part_new()));
-               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);
-               
-               /* Add body part to msg */
-               tny_msg_add_part (new_msg, text_body_part);
-               break;
-       case MODEST_MAIL_OPERATION_FORWARD_TYPE_ATTACHMENT:
-               attachment_part = TNY_MIME_PART (tny_camel_mime_part_new (camel_mime_part_new()));
+       /* Clean */
+       g_object_unref (G_OBJECT (new_header));
+       g_object_unref (G_OBJECT (header));
 
-               text_body_stream = TNY_STREAM (tny_camel_stream_new
-                                              (camel_stream_mem_new_with_buffer
-                                               (new_body, strlen(new_body))));
+       return new_msg;
+}
 
-               tny_mime_part_construct_from_stream (attachment_part,
-                                                    text_body_stream,
-                                                    content_type);
-               tny_stream_reset (attachment_stream);
-               
-               /* Set the subject as the name of the attachment */
-               tny_mime_part_set_filename (attachment_part, tny_header_get_subject (header));
-               
-               tny_msg_add_part (new_msg, attachment_part);
-               g_object_unref (G_OBJECT (attachment_part));
-               break;
-       }
-       /* TODO: attachments? */
+TnyMsg* 
+modest_mail_operation_create_forward_mail (TnyMsg *msg, 
+                                          const gchar *from,
+                                          ModestMailOperationForwardType forward_type)
+{
+       TnyMsg *new_msg;
+       TnyList *parts = NULL;
+       GList *attachments_list = NULL;
+
+       new_msg = create_reply_forward_mail (msg, from, FALSE, forward_type);
+
+       /* Add attachments */
+       parts = TNY_LIST (tny_simple_list_new());
+       tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+       tny_list_foreach (parts, add_if_attachment, attachments_list);
+       add_attachments (new_msg, attachments_list);
 
        /* Clean */
-       if (text_body_part) g_object_unref (G_OBJECT(text_body_part));
-       if (text_body_stream) g_object_unref (G_OBJECT(text_body_stream));
-       g_free (content_type);
-       g_free (new_body);
+       if (attachments_list) g_list_free (attachments_list);
+       g_object_unref (G_OBJECT (parts));
 
        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, 
+                                        const gchar *from,
                                         ModestMailOperationReplyType reply_type,
                                         ModestMailOperationReplyMode reply_mode)
 {
-       TnyMsg *new_msg;
+       TnyMsg *new_msg = NULL;
        TnyHeader *new_header, *header;
-       TnyStream *attachment_stream;
-       gchar *new_subject, *new_body, *content_type, *quoted;
-       TnyList *parts;
-       TnyMimePart *text_body_part;
-       TnyStream *text_body_stream;
-       gchar *my_email = NULL;
+       const gchar* reply_to;
+       gchar *new_cc = NULL;
+       const gchar *cc = NULL, *bcc = NULL;
+       GString *tmp = 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, TRUE, reply_type);
 
+       /* Fill the header */
        header = tny_msg_get_header (msg);
+       new_header = tny_msg_get_header (new_msg);
+       reply_to = tny_header_get_replyto (header);
 
-       /* 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 ("svillarsenin@terra.es");
+       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;
-               const gchar *cc = NULL, *bcc = NULL;
-               GString *tmp = NULL;
-
        case MODEST_MAIL_OPERATION_REPLY_MODE_SENDER:
                /* Do not fill neither cc nor bcc */
                break;
@@ -475,9 +424,12 @@ 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 */
-               new_cc = modest_text_utils_remove_mail_from_mail_list ((const gchar *) tmp->str, 
-                                                                      (const gchar *) my_email);
+               /* Remove my own address from the cc list. TODO:
+                  remove also the To: of the new message, needed due
+                  to the new reply_to feature */
+               new_cc = (gchar *)
+                       modest_text_utils_remove_address ((const gchar *) tmp->str,
+                                                         from);
                /* FIXME: remove also the mails from the new To: */
                tny_header_set_cc (new_header, new_cc);
 
@@ -486,146 +438,472 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg,
                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);
+       /* 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 *self = NULL;
+       ModestMailOperationPrivate *priv = NULL;
+       RefreshFolderAsyncHelper *helper;
+
+       helper = (RefreshFolderAsyncHelper *) user_data;
+       self = MODEST_MAIL_OPERATION (helper->mail_op);
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       if ((canceled && *err) || *err) {
+               priv->error = g_error_copy (*err);
+               helper->failed++;
+       } else if (canceled) {
+               helper->canceled++;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
+                            _("Error trying to refresh folder %s. Operation canceled"),
+                            tny_folder_get_name (folder));
+       } else {
+               priv->done++;
        }
-       /* Create the MIME part for the body */
-       text_body_stream = TNY_STREAM (tny_camel_stream_new
-                                      (camel_stream_mem_new_with_buffer
-                                       (new_body, strlen(new_body))));
 
-       text_body_part = 
-               TNY_MIME_PART (tny_camel_mime_part_new (camel_mime_part_new()));
-       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);
+       if (priv->done == priv->total)
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       else if ((priv->done + helper->canceled + helper->failed) == priv->total) {
+               if (helper->failed == priv->total)
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               else if (helper->failed == priv->total)
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
+               else
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS;
+       }
+       tny_iterator_next (helper->iter);
+       if (tny_iterator_is_done (helper->iter)) {
+               TnyList *list;
+               list = tny_iterator_get_list (helper->iter);
+               g_object_unref (G_OBJECT (helper->iter));
+               g_object_unref (G_OBJECT (list));
+               g_slice_free (RefreshFolderAsyncHelper, helper);
+       } else {
+               TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (helper->iter));
+               tny_folder_refresh_async (folder, folder_refresh_cb,
+                                         status_update_cb, 
+                                         helper);
+               g_object_unref (G_OBJECT(folder));
+       }
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
+}
 
-       /* Add body part to msg */
-       tny_msg_add_part (new_msg, text_body_part);
 
-       /* TODO: attachments? */
+static void
+update_folders_cb (TnyFolderStore *folder_store, TnyList *list, GError **err, gpointer user_data)
+{
+       ModestMailOperation *self;
+       ModestMailOperationPrivate *priv;
+       RefreshFolderAsyncHelper *helper;
+       TnyFolder *folder;
+       
+       self  = MODEST_MAIL_OPERATION (user_data);
+       priv  = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
-       /* Clean */
-       g_object_unref (G_OBJECT(text_body_part));
-       g_object_unref (G_OBJECT(text_body_stream));
-       g_free (content_type);
-       g_free (new_body);
+       if (*err) {
+               priv->error = g_error_copy (*err);
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               return;
+       }
 
-       return new_msg;
+       priv->total = tny_list_get_length (list);
+       priv->done = 0;
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+
+       helper = g_slice_new0 (RefreshFolderAsyncHelper);
+       helper->mail_op = self;
+       helper->iter = tny_list_create_iterator (list);
+       helper->failed = 0;
+       helper->canceled = 0;
+
+       /* Async refresh folders */
+       folder = TNY_FOLDER (tny_iterator_get_current (helper->iter));
+       tny_folder_refresh_async (folder, folder_refresh_cb,
+                                 status_update_cb, helper);
+       g_object_unref (G_OBJECT(folder));
 }
 
-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));
-
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(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);
 
-       /* 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 */
+       /* 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 (TNY_FOLDER_STORE (storage_account),
-                                     folders, NULL);
+       tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account),
+                                           folders, update_folders_cb, query, self);
        g_object_unref (query);
-       
-       ifolders = tny_list_create_iterator (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_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 */
+       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;
+}
+
+guint 
+modest_mail_operation_get_task_total (ModestMailOperation *self)
+{
+       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;
+       }
+
+       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;
+}
+
+/* ******************************************************************* */
+/* ************************** STORE  ACTIONS ************************* */
+/* ******************************************************************* */
+
+
+TnyFolder *
+modest_mail_operation_create_folder (ModestMailOperation *self,
+                                    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 *self,
+                                    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_tny_account_get_special_folder (TNY_ACCOUNT(folder_store),
+                                                                     TNY_FOLDER_TYPE_TRASH);
+               /* TODO: error_handling */
+               modest_mail_operation_move_folder (self, 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 *self,
+                                    TnyFolder *folder,
+                                    const gchar *name)
+{
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_FOLDER_STORE (folder));
+       g_return_if_fail (name);
+
+       /* 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 *self,
+                                  TnyFolder *folder,
+                                  TnyFolderStore *parent)
+{
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
+       g_return_if_fail (TNY_IS_FOLDER (folder));
+       
+       modest_mail_operation_xfer_folder (self, folder, parent, TRUE);
+}
+
+void
+modest_mail_operation_copy_folder (ModestMailOperation *self,
+                                  TnyFolder *folder,
+                                  TnyFolderStore *parent)
+{
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
+       g_return_if_fail (TNY_IS_FOLDER (folder));
+
+       modest_mail_operation_xfer_folder (self, folder, parent, FALSE);
+}
+
+static void
+modest_mail_operation_xfer_folder (ModestMailOperation *self,
+                                  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 (self, 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 (self, child, TNY_FOLDER_STORE (dest_folder),
+                                                  delete_original);
+               tny_iterator_next (iter);
+               g_object_unref (G_OBJECT(child));
+       }
+
+       /* Delete source folder (if needed) */
+       if (delete_original)
+               modest_mail_operation_remove_folder (self, 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));
+}
+
+
+/* ******************************************************************* */
+/* **************************  MSG  ACTIONS  ************************* */
+/* ******************************************************************* */
+
+gboolean 
+modest_mail_operation_copy_msg (ModestMailOperation *self,
+                               TnyHeader *header, 
+                               TnyFolder *folder)
+{
+       g_return_val_if_fail (TNY_IS_HEADER (header), FALSE);
+       g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE);
+
+       return modest_mail_operation_xfer_msg (self, header, folder, FALSE);
+}
+
+gboolean 
+modest_mail_operation_move_msg (ModestMailOperation *self,
+                               TnyHeader *header, 
+                               TnyFolder *folder)
+{
+       g_return_val_if_fail (TNY_IS_HEADER (header), FALSE);
+       g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE);
+
+       return modest_mail_operation_xfer_msg (self, header, folder, TRUE);
+}
+
+void 
+modest_mail_operation_remove_msg (ModestMailOperation *self,
+                                 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_tny_account_get_special_folder (TNY_ACCOUNT(store_account),
+                                                                     TNY_FOLDER_TYPE_TRASH);
+               if (trash_folder) {
+                       modest_mail_operation_move_msg (self, header, trash_folder);
+/*                     g_object_unref (trash_folder); */
+               } else {
+                       ModestMailOperationPrivate *priv;
+
+                       /* Set status failed and set an error */
+                       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+                       g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                                    MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                                    _("Error trying to delete a message. Trash folder not found"));
+               }
+
+               g_object_unref (G_OBJECT (store_account));
+       } else {
+               tny_folder_remove_msg (folder, header, NULL); /* FIXME */
+               tny_folder_sync(folder, TRUE, NULL); /* FIXME */
+       }
+
+       /* Free */
+       g_object_unref (folder);
+}
+
+static void
+transfer_msgs_cb (TnyFolder *folder, GError **err, gpointer user_data)
+{
+       ModestMailOperationPrivate *priv;
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(user_data);
+       priv->done = 1;
+       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+
+       g_signal_emit (G_OBJECT (user_data), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
+}
+
+static gboolean
+modest_mail_operation_xfer_msg (ModestMailOperation *self,
+                               TnyHeader *header, 
+                               TnyFolder *folder, 
+                               gboolean delete_original)
+{
+       ModestMailOperationPrivate *priv;
+       TnyFolder *src_folder;
+       TnyList *headers;
+
+       src_folder = tny_header_get_folder (header);
+       headers = tny_simple_list_new ();
+
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       priv->total = 1;
+       priv->done = 0;
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+
+       tny_list_prepend (headers, G_OBJECT (header));
+       tny_folder_transfer_msgs_async (src_folder, headers, folder, 
+                                       delete_original, transfer_msgs_cb, self);
+
+       /* Free */
+       g_object_unref (headers);
+       g_object_unref (folder);
+
+       return TRUE;
+}
+
+
+/* ******************************************************************* */
+/* ************************* UTILIY FUNCTIONS ************************ */
+/* ******************************************************************* */
 static gboolean
 is_ascii(const gchar *s)
 {
@@ -655,60 +933,77 @@ get_content_type(const gchar *s)
        return g_string_free(type, FALSE);
 }
 
-static GQuark 
-modest_error_quark (void)
+static void
+add_attachments (TnyMsg *msg, GList *attachments_list)
 {
-  static GQuark err_q = 0;
+       GList *pos;
+       TnyMimePart *attachment_part, *old_attachment;
+       const gchar *attachment_content_type;
+       const gchar *attachment_filename;
+       TnyStream *attachment_stream;
+       TnyPlatformFactory *fact;
 
-  if (err_q == 0)
-    err_q = g_quark_from_static_string ("modest-error-quark");
+       fact = modest_tny_platform_factory_get_instance ();
+       for (pos = (GList *)attachments_list; pos; pos = pos->next) {
 
-  return err_q;
+               old_attachment = pos->data;
+               attachment_filename = tny_mime_part_get_filename (old_attachment);
+               attachment_stream = tny_mime_part_get_stream (old_attachment);
+               attachment_part = tny_platform_factory_new_mime_part (fact);
+               
+               attachment_content_type = tny_mime_part_get_content_type (old_attachment);
+                                
+               tny_mime_part_construct_from_stream (attachment_part,
+                                                    attachment_stream,
+                                                    attachment_content_type);
+               tny_stream_reset (attachment_stream);
+               
+               tny_mime_part_set_filename (attachment_part, attachment_filename);
+               
+               tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part);
+/*             g_object_unref (attachment_part); */
+       }
 }
 
 
-static void 
-set_error (ModestMailOperation *mail_operation, 
-          ModestMailOperationErrorCode error_code,
-          const gchar *fmt, ...)
+static TnyMimePart *
+add_body_part (TnyMsg *msg, 
+              const gchar *body,
+              const gchar *content_type,
+              gboolean has_attachments)
 {
-       ModestMailOperationPrivate *priv;
-       GError* error;
-       va_list args;
-       gchar* orig;
-
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_operation);
-
-       va_start (args, fmt);
-
-       orig = g_strdup_vprintf(fmt, args);
-       error = g_error_new (MODEST_ERROR, error_code, orig);
+       TnyMimePart *text_body_part = NULL;
+       TnyStream *text_body_stream;
+       TnyPlatformFactory *fact;
 
-       va_end (args);
+       fact = modest_tny_platform_factory_get_instance ();
 
-       if (priv->error)
-               g_object_unref (priv->error);
+       /* Create the stream */
+       text_body_stream = TNY_STREAM (tny_camel_stream_new
+                                      (camel_stream_mem_new_with_buffer
+                                       (body, strlen(body))));
 
-       priv->error = error;
-       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-}
+       /* Create body part if needed */
+       if (has_attachments)
+               text_body_part = tny_platform_factory_new_mime_part (fact);
+       else
+               text_body_part = TNY_MIME_PART(msg);
 
-static void
-status_update_cb (TnyFolder *folder, const gchar *what, gint status, gpointer user_data) 
-{
-       /* TODO: update main window progress bar */
-}
+       /* 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);
 
-static void
-folder_refresh_cb (TnyFolder *folder, gboolean cancelled, gpointer user_data) 
-{
-       if (cancelled) {
-               ModestMailOperation *mail_operation;
-               ModestMailOperationPrivate *priv;
+       /* Add part if needed */
+       if (has_attachments) {
+               tny_mime_part_add_part (TNY_MIME_PART (msg), text_body_part);
+               g_object_unref (G_OBJECT(text_body_part));
+       }
 
-               mail_operation = MODEST_MAIL_OPERATION (user_data);
-               priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_operation);
+       /* Clean */
+       g_object_unref (text_body_stream);
 
-               priv->status =  MODEST_MAIL_OPERATION_STATUS_CANCELLED;
-       }
+       return text_body_part;
 }