* Fixes NB#57580
[modest] / src / modest-mail-operation.c
index 44ee8b8..2a627a7 100644 (file)
@@ -27,8 +27,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "modest-mail-operation.h"
-/* include other impl specific header files */
 #include <string.h>
 #include <stdarg.h>
 #include <tny-mime-part.h>
@@ -52,6 +50,7 @@
 #include "modest-tny-platform-factory.h"
 #include "modest-marshal.h"
 #include "modest-error.h"
+#include "modest-mail-operation.h"
 
 #define KB 1024
 
@@ -81,12 +80,13 @@ enum _ModestMailOperationSignals
 
 typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate;
 struct _ModestMailOperationPrivate {
-       guint                      id;
+       TnyAccount                 *account;
        guint                      done;
        guint                      total;
        GObject                   *source;
        GError                    *error;
        ErrorCheckingUserCallback  error_checking;
+       gpointer                   error_checking_user_data;
        ModestMailOperationStatus  status;      
        ModestMailOperationTypeOperation op_type;
 };
@@ -115,12 +115,6 @@ typedef struct _XFerMsgAsyncHelper
        gpointer user_data;
 } XFerMsgAsyncHelper;
 
-typedef struct _XFerFolderAsyncHelper
-{
-       ModestMailOperation *mail_op;
-
-} XFerFolderAsyncHelper;
-
 /* globals */
 static GObjectClass *parent_class = NULL;
 
@@ -185,14 +179,15 @@ modest_mail_operation_init (ModestMailOperation *obj)
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
 
+       priv->account        = NULL;
        priv->status         = MODEST_MAIL_OPERATION_STATUS_INVALID;
        priv->op_type        = MODEST_MAIL_OPERATION_TYPE_UNKNOWN;
        priv->error          = NULL;
-       priv->error_checking = NULL;
-       priv->id             = 0;
        priv->done           = 0;
        priv->total          = 0;
        priv->source         = NULL;
+       priv->error_checking = NULL;
+       priv->error_checking_user_data = NULL;
 }
 
 static void
@@ -210,6 +205,11 @@ modest_mail_operation_finalize (GObject *obj)
                g_object_unref (priv->source);
                priv->source = NULL;
        }
+       if (priv->account) {
+               g_object_unref (priv->account);
+               priv->account = NULL;
+       }
+
 
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
@@ -234,7 +234,8 @@ modest_mail_operation_new (ModestMailOperationTypeOperation op_type,
 ModestMailOperation*
 modest_mail_operation_new_with_error_handling (ModestMailOperationTypeOperation op_type,
                                               GObject *source,
-                                              ErrorCheckingUserCallback error_handler)
+                                              ErrorCheckingUserCallback error_handler,
+                                              gpointer user_data)
 {
        ModestMailOperation *obj;
        ModestMailOperationPrivate *priv;
@@ -256,9 +257,8 @@ modest_mail_operation_execute_error_handler (ModestMailOperation *self)
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
        g_return_if_fail(priv->status != MODEST_MAIL_OPERATION_STATUS_SUCCESS);     
 
-       if (priv->error_checking == NULL) 
-               return; 
-       priv->error_checking (priv->source, self);
+       if (priv->error_checking != NULL)
+               priv->error_checking (self, priv->error_checking_user_data);
 }
 
 
@@ -331,8 +331,8 @@ modest_mail_operation_cancel (ModestMailOperation *self)
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
-       /* TODO: Tinymail does not support cancel operation  */
-/*     tny_account_cancel (); */
+       /* cancel current operation in account */
+       tny_account_cancel (priv->account);
 
        /* Set new status */
        priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
@@ -445,25 +445,25 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
                                 TnyTransportAccount *transport_account,
                                 TnyMsg* msg)
 {
-       TnySendQueue *send_queue;
+       TnySendQueue *send_queue = NULL;
+       ModestMailOperationPrivate *priv;
        
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
        g_return_if_fail (TNY_IS_MSG (msg));
        
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+       /* Get account and set it into mail_operation */
+       priv->account = g_object_ref (transport_account);
+
        send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account));
-       if (!TNY_IS_SEND_QUEUE(send_queue))
-               g_printerr ("modest: could not find send queue for account\n");
-       else {
-               GError *err = NULL;
-               tny_send_queue_add (send_queue, msg, &err);
-               if (err) {
-                       g_printerr ("modest: error adding msg to send queue: %s\n",
-                                   err->message);
-                       g_error_free (err);
-               } else {
-                       /* g_message ("modest: message added to send queue"); */
-               }
+       if (!TNY_IS_SEND_QUEUE(send_queue)) {
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                            "modest: could not find send queue for account\n");
+       } else {
+               tny_send_queue_add (send_queue, msg, &(priv->error));
        }
 
        /* Notify about operation end */
@@ -480,17 +480,21 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
                                     const GList *attachments_list,
                                     TnyHeaderFlags priority_flags)
 {
-       TnyMsg *new_msg;
+       TnyMsg *new_msg = NULL;
        ModestMailOperationPrivate *priv = NULL;
-       /* GList *node = NULL; */
 
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
+       /* Get account and set it into mail_operation */
+       priv->account = g_object_ref (transport_account);
+
        /* Check parametters */
        if (to == NULL) {
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER,
                             _("Error trying to send a mail. You need to set at least one recipient"));
@@ -530,47 +534,46 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self,
        TnyMsg *msg = NULL;
        TnyFolder *folder = NULL;
        ModestMailOperationPrivate *priv = NULL;
-       GError *err = NULL;
-
-       /* GList *node = NULL; */
 
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
+       /* Get account and set it into mail_operation */
+       priv->account = g_object_ref (transport_account);
+
        if (html_body == NULL) {
                msg = modest_tny_msg_new (to, from, cc, bcc, subject, plain_body, (GSList *) attachments_list); /* FIXME: attachments */
        } else {
                msg = modest_tny_msg_new_html_plain (to, from, cc, bcc, subject, html_body, plain_body, (GSList *) attachments_list);
        }
        if (!msg) {
-               g_printerr ("modest: failed to create a new msg\n");
-               goto cleanup;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
+                            "modest: failed to create a new msg\n");
+               goto end;
        }
 
        folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS);
        if (!folder) {
-               g_printerr ("modest: failed to find Drafts folder\n");
-               goto cleanup;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+                            "modest: failed to create a new msg\n");
+               goto end;
        }
        
-       tny_folder_add_msg (folder, msg, &err);
-       if (err) {
-               g_printerr ("modest: error adding msg to Drafts folder: %s",
-                           err->message);
-               g_error_free (err);
-               goto cleanup;
-       }
-
-       modest_mail_operation_notify_end (self);
+       tny_folder_add_msg (folder, msg, &(priv->error));
+       if (priv->error)
+               goto end;
 
-       /* Free */
-cleanup:
+end:
        if (msg)
                g_object_unref (G_OBJECT(msg));
        if (folder)
                g_object_unref (G_OBJECT(folder));
+
+       modest_mail_operation_notify_end (self);
 }
 
 typedef struct 
@@ -606,6 +609,9 @@ G_DEFINE_TYPE_WITH_CODE (InternalFolderObserver,
 static void
 foreach_add_item (gpointer header, gpointer user_data)
 {
+       /* printf("DEBUG: %s: header subject=%s\n", 
+        * __FUNCTION__, tny_header_get_subject(TNY_HEADER(header)));
+        */
        tny_list_prepend (TNY_LIST (user_data), 
                          g_object_ref (G_OBJECT (header)));
 }
@@ -614,6 +620,8 @@ foreach_add_item (gpointer header, gpointer user_data)
 static void
 internal_folder_observer_update (TnyFolderObserver *self, TnyFolderChange *change)
 {
+       InternalFolderObserver *derived = (InternalFolderObserver *)self;
+       
        TnyFolderChangeChanged changed;
 
        changed = tny_folder_change_get_changed (change);
@@ -625,9 +633,13 @@ internal_folder_observer_update (TnyFolderObserver *self, TnyFolderChange *chang
                list = tny_simple_list_new ();
                tny_folder_change_get_added_headers (change, list);
 
+               /* printf ("DEBUG: %s: Calling foreach with a list of size=%d\n", 
+                *      __FUNCTION__, tny_list_get_length(list));
+                */
+                
                /* Add them to the folder observer */
                tny_list_foreach (list, foreach_add_item, 
-                                 ((InternalFolderObserver *)self)->new_headers);
+                                 derived->new_headers);
 
                g_object_unref (G_OBJECT (list));
        }
@@ -771,11 +783,15 @@ update_account_thread (gpointer thr_user_data)
        TnyIterator *iter = NULL;
        TnyFolderStoreQuery *query = NULL;
        ModestMailOperationPrivate *priv;
+       ModestTnySendQueue *send_queue;
 
        info = (UpdateAccountInfo *) thr_user_data;
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op);
 
-       /* Get all the folders We can do it synchronously because
+       /* Get account and set it into mail_operation */
+       priv->account = g_object_ref (info->account);
+
+       /* Get all the folders. We can do it synchronously because
           we're already running in a different thread than the UI */
        all_folders = tny_simple_list_new ();
        query = tny_folder_store_query_new ();
@@ -799,7 +815,7 @@ update_account_thread (gpointer thr_user_data)
        g_object_unref (G_OBJECT (iter));
 
        /* Update status and notify. We need to call the notification
-          with a source functopm in order to call it from the main
+          with a source function in order to call it from the main
           loop. We need that in order not to get into trouble with
           Gtk+. We use a timeout in order to provide more status
           information, because the sync tinymail call does not
@@ -815,18 +831,33 @@ update_account_thread (gpointer thr_user_data)
                TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter));
 
                /* Refresh the folder */
+               /* Our observer receives notification of new emails during folder refreshes,
+                * so we can use observer->new_headers.
+                * TODO: This does not seem to be providing accurate numbers.
+                * Possibly the observer is notified asynchronously.
+                */
                observer = g_object_new (internal_folder_observer_get_type (), NULL);
                tny_folder_add_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer));
+               
+               /* This gets the status information (headers) from the server.
+                * We use the blocking version, because we are already in a separate 
+                * thread.
+                */
                tny_folder_refresh (TNY_FOLDER (folder), &(priv->error));
 
                /* If the retrieve type is headers only do nothing more */
-               if (!strcmp (info->retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES) || 
-                   !strcmp (info->retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES_AND_ATTACHMENTS)) {
+               if (!g_ascii_strcasecmp (info->retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES) || 
+                   !g_ascii_strcasecmp (info->retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES_AND_ATTACHMENTS)) {
                        TnyIterator *iter;
 
                        iter = tny_list_create_iterator (observer->new_headers);
                        while (!tny_iterator_is_done (iter)) {
                                TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+                               /* printf ("  DEBUG1.2 %s: checking size: account=%s, subject=%s\n", 
+                                *      __FUNCTION__, tny_account_get_id (priv->account), 
+                                * tny_header_get_subject (header));
+                                */
+                                
                                /* Apply per-message size limits */
                                if (tny_header_get_message_size (header) < info->max_size)
                                        g_ptr_array_add (new_headers, g_object_ref (header));
@@ -836,8 +867,10 @@ update_account_thread (gpointer thr_user_data)
                        }
                        g_object_unref (iter);
                }
+               
                tny_folder_remove_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer));
                g_object_unref (observer);
+               observer = NULL;
 
                if (priv->error)
                        priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
@@ -855,11 +888,26 @@ update_account_thread (gpointer thr_user_data)
                g_ptr_array_sort (new_headers, (GCompareFunc) compare_headers_by_date);
 
                /* Apply message count limit */
-               /* TODO if the number of messages exceeds the maximum, ask the
-                  user to download them all */
+               /* If the number of messages exceeds the maximum, ask the
+                * user to download them all,
+                * as per the UI spec "Retrieval Limits" section in 4.4: 
+                */
+               printf ("DEBUG: %s: account=%s, len=%d, retrieve_limit = %d\n", __FUNCTION__, 
+                       tny_account_get_id (priv->account), new_headers->len, info->retrieve_limit);
+               if (new_headers->len > info->retrieve_limit) {
+                       /* TODO: Ask the user, instead of just failing, showing mail_nc_msg_count_limit_exceeded, 
+                        * with 'Get all' and 'Newest only' buttons. */
+                       g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_RETRIEVAL_NUMBER_LIMIT,
+                            "The number of messages to retrieve exceeds the chosen limit for account %s\n", 
+                            tny_account_get_name (TNY_ACCOUNT (info->transport_account)));
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+                       goto out;
+               }
+               
                priv->done = 0;
                priv->total = MIN (new_headers->len, info->retrieve_limit);
-               while ((msg_num < info->retrieve_limit)) {
+               while (msg_num < priv->total) {
 
                        TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers, msg_num));
                        TnyFolder *folder = tny_header_get_folder (header);
@@ -889,16 +937,22 @@ update_account_thread (gpointer thr_user_data)
        priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND;
        priv->done = 0;
        priv->total = 0;
-
-       ModestTnySendQueue *send_queue = modest_runtime_get_send_queue
-               (info->transport_account);
-
-       timeout = g_timeout_add (250, idle_notify_progress, info->mail_op);
-       /* TODO: Is this meant to block? */
-       modest_tny_send_queue_try_to_send (send_queue);
-       g_source_remove (timeout);
-
-       g_object_unref (G_OBJECT(send_queue));
+       if (priv->account != NULL) 
+               g_object_unref (priv->account);
+       priv->account = g_object_ref (info->transport_account);
+       
+       send_queue = modest_runtime_get_send_queue (info->transport_account);
+       if (send_queue) {
+               timeout = g_timeout_add (250, idle_notify_progress, info->mail_op);
+               modest_tny_send_queue_try_to_send (send_queue);
+               g_source_remove (timeout);
+       } else {
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
+                            "cannot create a send queue for %s\n", 
+                            tny_account_get_name (TNY_ACCOUNT (info->transport_account)));
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+       }
        
        /* Check if the operation was a success */
        if (!priv->error) {
@@ -1004,6 +1058,8 @@ modest_mail_operation_update_account (ModestMailOperation *self,
                                                           MODEST_ACCOUNT_LIMIT_RETRIEVE, FALSE);
        if (info->retrieve_limit == 0)
                info->retrieve_limit = G_MAXINT;
+               
+       printf ("DEBUG: %s: info->retrieve_limit = %d\n", __FUNCTION__, info->retrieve_limit);
 
        thread = g_thread_create (update_account_thread, info, FALSE, NULL);
 
@@ -1020,10 +1076,8 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
                                     TnyFolderStore *parent,
                                     const gchar *name)
 {
-       ModestTnyFolderRules rules;
        ModestMailOperationPrivate *priv;
        TnyFolder *new_folder = NULL;
-       gboolean can_create = FALSE;
 
        g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
        g_return_val_if_fail (name, NULL);
@@ -1031,25 +1085,24 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
        /* Check parent */
-       if (!TNY_IS_FOLDER (parent)) {
-               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER,
-                            _("mail_in_ui_folder_create_error"));
-       } else {
+       if (TNY_IS_FOLDER (parent)) {
                /* Check folder rules */
-               rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
-               if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE)
+               ModestTnyFolderRules rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
+               if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
+                       /* Set status failed and set an error */
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                        g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                                     MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
                                     _("mail_in_ui_folder_create_error"));
-               else
-                       can_create = TRUE;              
+               }
        }
 
-       if (can_create) {
+       if (!priv->error) {
                /* Create the folder */
                new_folder = tny_folder_store_create_folder (parent, name, &(priv->error));
                CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED);
+               if (!priv->error)
+                       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
        }
 
        /* Notify about operation end */
@@ -1075,6 +1128,8 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
        /* Check folder rules */
        rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
        if (rules & MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE) {
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
                             _("mail_in_ui_folder_delete_error"));
@@ -1083,6 +1138,7 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
 
        /* Get the account */
        account = tny_folder_get_account (folder);
+       priv->account = g_object_ref(account);
 
        /* Delete folder or move to trash */
        if (remove_to_trash) {
@@ -1108,52 +1164,11 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
        modest_mail_operation_notify_end (self);
 }
 
-void
-modest_mail_operation_rename_folder (ModestMailOperation *self,
-                                    TnyFolder *folder,
-                                    const gchar *name)
-{
-       ModestMailOperationPrivate *priv;
-       ModestTnyFolderRules rules;
-
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_FOLDER_STORE (folder));
-       g_return_if_fail (name);
-       
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
-
-       /* Check folder rules */
-       rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
-       if (rules & MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE) {
-               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
-                            _("FIXME: unable to rename"));
-       } else {
-               /* Rename. Camel handles folder subscription/unsubscription */
-               TnyFolderStore *into;
-               TnyFolder *nfol;
-
-               into = tny_folder_get_folder_store (folder);
-               nfol = tny_folder_copy (folder, into, name, TRUE, &(priv->error));
-               if (into)
-                       g_object_unref (into);
-               if (nfol)
-                       g_object_unref (nfol);
-
-               CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED);
-               
-       }
-
-       /* Notify about operation end */
-       modest_mail_operation_notify_end (self);
- }
-
 static void
 transfer_folder_status_cb (GObject *obj,
                           TnyStatus *status,
                           gpointer user_data)
 {
-       XFerMsgAsyncHelper *helper = NULL;
        ModestMailOperation *self;
        ModestMailOperationPrivate *priv;
        ModestMailOperationState *state;
@@ -1161,10 +1176,7 @@ transfer_folder_status_cb (GObject *obj,
        g_return_if_fail (status != NULL);
        g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_COPY_FOLDER);
 
-       helper = (XFerMsgAsyncHelper *) user_data;
-       g_return_if_fail (helper != NULL);
-
-       self = helper->mail_op;
+       self = MODEST_MAIL_OPERATION (user_data);
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
        if ((status->position == 1) && (status->of_total == 100))
@@ -1180,14 +1192,16 @@ transfer_folder_status_cb (GObject *obj,
 
 
 static void
-transfer_folder_cb (TnyFolder *folder, TnyFolderStore *into, gboolean cancelled, TnyFolder *new_folder, GError **err, gpointer user_data)
+transfer_folder_cb (TnyFolder *folder, 
+                   TnyFolderStore *into, 
+                   gboolean cancelled, 
+                   TnyFolder *new_folder, GError **err, 
+                   gpointer user_data)
 {
-       XFerFolderAsyncHelper *helper = NULL;
        ModestMailOperation *self = NULL;
        ModestMailOperationPrivate *priv = NULL;
 
-       helper = (XFerFolderAsyncHelper *) user_data;
-       self = helper->mail_op;
+       self = MODEST_MAIL_OPERATION (user_data);
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
@@ -1207,7 +1221,6 @@ transfer_folder_cb (TnyFolder *folder, TnyFolderStore *into, gboolean cancelled,
        }
                
        /* Free */
-       g_slice_free   (XFerFolderAsyncHelper, helper);
        g_object_unref (folder);
        g_object_unref (into);
        if (new_folder != NULL)
@@ -1223,26 +1236,31 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                                   TnyFolderStore *parent,
                                   gboolean delete_original)
 {
-       XFerFolderAsyncHelper *helper = NULL;
        ModestMailOperationPrivate *priv = NULL;
        ModestTnyFolderRules parent_rules, rules;
 
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
        g_return_if_fail (TNY_IS_FOLDER (folder));
+       g_return_if_fail (TNY_IS_FOLDER (parent));
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
-       /* Pick references for async calls */
-       g_object_ref (folder);
-       g_object_ref (parent);
+       /* Get account and set it into mail_operation */
+       priv->account = tny_folder_get_account (TNY_FOLDER(folder));
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
        /* Get folder rules */
        rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
        parent_rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
 
+       if (!TNY_IS_FOLDER_STORE (parent)) {
+               
+       }
+       
        /* The moveable restriction is applied also to copy operation */
-       if (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE) {
+       if ((!TNY_IS_FOLDER_STORE (parent)) || (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE)) {
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
                             _("mail_in_ui_folder_move_target_error"));
@@ -1250,6 +1268,8 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                /* Notify the queue */
                modest_mail_operation_notify_end (self);
        } else if (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
                             _("FIXME: parent folder does not accept new folders"));
@@ -1257,8 +1277,9 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                /* Notify the queue */
                modest_mail_operation_notify_end (self);
        } else {
-               helper = g_slice_new0 (XFerFolderAsyncHelper);
-               helper->mail_op = self;
+               /* Pick references for async calls */
+               g_object_ref (folder);
+               g_object_ref (parent);
 
                /* Move/Copy folder */          
                tny_folder_copy_async (folder,
@@ -1267,10 +1288,52 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                                       delete_original,
                                       transfer_folder_cb,
                                       transfer_folder_status_cb,
-                                      helper);
+                                      self);
        }
 }
 
+void
+modest_mail_operation_rename_folder (ModestMailOperation *self,
+                                    TnyFolder *folder,
+                                    const gchar *name)
+{
+       ModestMailOperationPrivate *priv;
+       ModestTnyFolderRules rules;
+
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (TNY_IS_FOLDER_STORE (folder));
+       g_return_if_fail (name);
+       
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+       /* Get account and set it into mail_operation */
+       priv->account = tny_folder_get_account (TNY_FOLDER(folder));
+
+       /* Check folder rules */
+       rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
+       if (rules & MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE) {
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+               g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+                            MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+                            _("FIXME: unable to rename"));
+
+               /* Notify about operation end */
+               modest_mail_operation_notify_end (self);
+       } else {
+               /* Rename. Camel handles folder subscription/unsubscription */
+               TnyFolderStore *into;
+
+               into = tny_folder_get_folder_store (folder);
+               tny_folder_copy_async (folder, into, name, TRUE,
+                                transfer_folder_cb,
+                                transfer_folder_status_cb,
+                                self);
+               if (into)
+                       g_object_unref (into);
+               
+       }
+ }
 
 /* ******************************************************************* */
 /* **************************  MSG  ACTIONS  ************************* */
@@ -1295,6 +1358,9 @@ void modest_mail_operation_get_msg (ModestMailOperation *self,
 
        /* Get message from folder */
        if (folder) {
+               /* Get account and set it into mail_operation */
+               priv->account = tny_folder_get_account (TNY_FOLDER(folder));            
+
                helper = g_slice_new0 (GetMsgAsyncHelper);
                helper->mail_op = self;
                helper->user_callback = user_callback;
@@ -1310,6 +1376,9 @@ void modest_mail_operation_get_msg (ModestMailOperation *self,
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
                             _("Error trying to get a message. No folder found for header"));
+
+               /* Notify the queue */
+               modest_mail_operation_notify_end (self);
        }
 }
 
@@ -1515,6 +1584,10 @@ get_msgs_full_thread (gpointer thr_user_data)
                tny_iterator_next (iter);
        }
 
+       /* Set operation status */
+       if (priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+
        /* Notify about operation end */
        g_idle_add (notify_update_account_queue, info->mail_op);
 
@@ -1531,12 +1604,14 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
                                     gpointer user_data,
                                     GDestroyNotify notify)
 {
+       TnyHeader *header = NULL;
+       TnyFolder *folder = NULL;
        GThread *thread;
        ModestMailOperationPrivate *priv = NULL;
        GetFullMsgsInfo *info = NULL;
        gboolean size_ok = TRUE;
        gint max_size;
-       GError *error = NULL;
+       TnyIterator *iter = NULL;
        
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        
@@ -1546,12 +1621,22 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
        priv->done = 0;
        priv->total = tny_list_get_length(header_list);
 
+       /* Get account and set it into mail_operation */
+       if (tny_list_get_length (header_list) > 1) {
+               iter = tny_list_create_iterator (header_list);          
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               folder = tny_header_get_folder (header);                
+               priv->account = tny_folder_get_account (TNY_FOLDER(folder));
+               g_object_unref (header);
+               g_object_unref (folder);
+       }
+
        /* Get msg size limit */
        max_size  = modest_conf_get_int (modest_runtime_get_conf (), 
                                         MODEST_CONF_MSG_SIZE_LIMIT, 
-                                        &error);
-       if (error) {
-               g_clear_error (&error);
+                                        &(priv->error));
+       if (priv->error) {
+               g_clear_error (&(priv->error));
                max_size = G_MAXINT;
        } else {
                max_size = max_size * KB;
@@ -1559,12 +1644,9 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 
        /* Check message size limits. If there is only one message
           always retrieve it */
-       if (tny_list_get_length (header_list) > 1) {
-               TnyIterator *iter;
-
-               iter = tny_list_create_iterator (header_list);
+       if (iter != NULL) {
                while (!tny_iterator_is_done (iter) && size_ok) {
-                       TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+                       header = TNY_HEADER (tny_iterator_get_current (iter));
                        if (tny_header_get_message_size (header) >= max_size)
                                size_ok = FALSE;
                        g_object_unref (header);
@@ -1584,10 +1666,12 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 
                thread = g_thread_create (get_msgs_full_thread, info, FALSE, NULL);
        } else {
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                /* FIXME: the error msg is different for pop */
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                            MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER,
-                            _("emev_ni_ui_imap_msg_sizelimit_error"));
+                            MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT,
+                            _("emev_ni_ui_imap_msg_size_exceed_error"));
                /* Remove from queue and free resources */
                modest_mail_operation_notify_end (self);
                if (notify)
@@ -1610,6 +1694,9 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
        folder = tny_header_get_folder (header);
 
+       /* Get account and set it into mail_operation */
+       priv->account = tny_folder_get_account (TNY_FOLDER(folder));
+
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
        /* Delete or move to trash */
@@ -1766,6 +1853,8 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
        rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
 
        if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
+               /* Set status failed and set an error */
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
                             _("FIXME: folder does not accept msgs"));
@@ -1789,6 +1878,9 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
        g_object_unref (header);
        g_object_unref (iter);
 
+       /* Get account and set it into mail_operation */
+       priv->account = tny_folder_get_account (src_folder);
+
        /* Transfer messages */
        tny_folder_transfer_msgs_async (src_folder, 
                                        headers, 
@@ -1873,6 +1965,9 @@ modest_mail_operation_refresh_folder  (ModestMailOperation *self,
 
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
+       /* Get account and set it into mail_operation */
+       priv->account = tny_folder_get_account (folder);
+
        /* Refresh the folder. TODO: tinymail could issue a status
           updates before the callback call then this could happen. We
           must review the design */