* src/modest-mail-operation.c:
[modest] / src / modest-mail-operation.c
index 77e42d6..114cd7b 100644 (file)
@@ -35,6 +35,8 @@
 #include <tny-folder-store-query.h>
 #include <tny-camel-stream.h>
 #include <tny-camel-pop-store-account.h>
+#include <tny-camel-pop-folder.h>
+#include <tny-camel-imap-folder.h>
 #include <tny-simple-list.h>
 #include <tny-send-queue.h>
 #include <tny-status.h>
@@ -70,8 +72,7 @@ static void     get_msg_status_cb (GObject *obj,
                                   TnyStatus *status,  
                                   gpointer user_data);
 
-static void     modest_mail_operation_notify_end (ModestMailOperation *self,
-                                                 gboolean need_lock);
+static void     modest_mail_operation_notify_end (ModestMailOperation *self);
 
 static gboolean did_a_cancel = FALSE;
 
@@ -374,7 +375,7 @@ modest_mail_operation_cancel (ModestMailOperation *self)
        /* This emits progress-changed on which the mail operation queue is
         * listening, so the mail operation is correctly removed from the
         * queue without further explicit calls. */
-       modest_mail_operation_notify_end (self, FALSE);
+       modest_mail_operation_notify_end (self);
        
        return TRUE;
 }
@@ -523,7 +524,7 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
 
        /* TODO: do this in the handler of the "msg-sent"
           signal.Notify about operation end */
-       modest_mail_operation_notify_end (self, FALSE);
+       modest_mail_operation_notify_end (self);
 }
 
 void
@@ -571,6 +572,10 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
        header = tny_msg_get_header (new_msg);
        if (priority_flags != 0)
                tny_header_set_flags (header, priority_flags);
+       if (attachments_list != NULL) {
+               tny_header_set_flags (header, TNY_HEADER_FLAG_ATTACHMENTS);
+       }
+       g_object_unref (G_OBJECT(header));
 
        /* Call mail operation */
        modest_mail_operation_send_mail (self, transport_account, new_msg);
@@ -582,6 +587,7 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
                        /* Note: This can fail (with a warning) if the message is not really already in a folder,
                         * because this function requires it to have a UID. */
                        tny_folder_remove_msg (folder, header, NULL);
+                       tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
                        g_object_unref (header);
                }
        }
@@ -590,7 +596,7 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self,
        g_object_unref (G_OBJECT (new_msg));
 }
 
-void
+TnyMsg*
 modest_mail_operation_save_to_drafts (ModestMailOperation *self,
                                      TnyTransportAccount *transport_account,
                                      TnyMsg *draft_msg,
@@ -606,8 +612,8 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self,
        TnyHeader *header = NULL;
        ModestMailOperationPrivate *priv = NULL;
 
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
+       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), NULL);
+       g_return_val_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account), NULL);
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
@@ -630,6 +636,9 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self,
        /* add priority flags */
        header = tny_msg_get_header (msg);
        tny_header_set_flags (header, priority_flags);
+       if (attachments_list != NULL)
+               tny_header_set_flags (header, TNY_HEADER_FLAG_ATTACHMENTS);
+       g_object_unref (G_OBJECT(header));
 
        folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS);
        if (!folder) {
@@ -644,21 +653,25 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self,
                header = tny_msg_get_header (draft_msg);
                /* Remove the old draft expunging it */
                tny_folder_remove_msg (folder, header, NULL);
-               tny_folder_sync (folder, TRUE, NULL);
+               tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
+               tny_folder_sync (folder, FALSE, &(priv->error));  /* FALSE --> don't expunge */
                g_object_unref (header);
        }
        
-       tny_folder_add_msg (folder, msg, &(priv->error));
+       if (!priv->error)
+               tny_folder_add_msg (folder, msg, &(priv->error));
+
        if (!priv->error)
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+       else
+               priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 
 end:
-       if (msg)
-               g_object_unref (G_OBJECT(msg));
        if (folder)
                g_object_unref (G_OBJECT(folder));
 
-       modest_mail_operation_notify_end (self, FALSE);
+       modest_mail_operation_notify_end (self);
+       return msg;
 }
 
 typedef struct 
@@ -672,6 +685,7 @@ typedef struct
        gchar *account_name;
        UpdateAccountCallback callback;
        gpointer user_data;
+       gint new_headers;
 } UpdateAccountInfo;
 
 /***** I N T E R N A L    F O L D E R    O B S E R V E R *****/
@@ -795,8 +809,6 @@ recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all
 static gboolean
 idle_notify_progress (gpointer data)
 {
-       gdk_threads_enter ();
-
        ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
        ModestMailOperationState *state;
 
@@ -804,8 +816,6 @@ idle_notify_progress (gpointer data)
        g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
        g_slice_free (ModestMailOperationState, state);
        
-       gdk_threads_leave ();
-
        return TRUE;
 }
 
@@ -817,8 +827,6 @@ idle_notify_progress (gpointer data)
 static gboolean
 idle_notify_progress_once (gpointer data)
 {
-       gdk_threads_enter ();
-
        ModestPair *pair;
 
        pair = (ModestPair *) data;
@@ -829,8 +837,6 @@ idle_notify_progress_once (gpointer data)
        g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second);
        g_object_unref (pair->first);
 
-       gdk_threads_leave ();
-
        return FALSE;
 }
 
@@ -847,7 +853,7 @@ idle_notify_update_account_queue (gpointer data)
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op);
 
        /* Do not need to block, the notify end will do it for us */    
-       modest_mail_operation_notify_end (mail_op, TRUE);
+       modest_mail_operation_notify_end (mail_op);
        g_object_unref (mail_op);
 
        return FALSE;
@@ -893,6 +899,27 @@ set_last_updated_idle (gpointer data)
        return FALSE;
 }
 
+static gboolean
+idle_update_account_cb (gpointer data)
+{
+       UpdateAccountInfo *idle_info;
+
+       idle_info = (UpdateAccountInfo *) data;
+
+       gdk_threads_enter ();
+       idle_info->callback (idle_info->mail_op,
+                            idle_info->new_headers,
+                            idle_info->user_data);
+       gdk_threads_leave ();
+
+       /* Frees */
+       g_object_unref (idle_info->mail_op);
+       g_free (idle_info);
+
+       return FALSE;
+}
+
+
 static gpointer
 update_account_thread (gpointer thr_user_data)
 {
@@ -947,7 +974,7 @@ update_account_thread (gpointer thr_user_data)
           Gtk+. We use a timeout in order to provide more status
           information, because the sync tinymail call does not
           provide it for the moment */
-       gint timeout = g_timeout_add (250, idle_notify_progress, info->mail_op);
+       gint timeout = g_timeout_add (100, idle_notify_progress, info->mail_op);
 
        /* Refresh folders */
        new_headers = g_ptr_array_new ();
@@ -1100,20 +1127,23 @@ update_account_thread (gpointer thr_user_data)
        }
 
  out:
+
+       if (info->callback) {
+               UpdateAccountInfo *idle_info;
+
+               /* This thread is not in the main lock */
+               idle_info = g_malloc0 (sizeof (UpdateAccountInfo));
+               idle_info->mail_op = g_object_ref (info->mail_op);
+               idle_info->new_headers = (new_headers) ? new_headers->len : 0;
+               idle_info->callback = info->callback;
+               g_idle_add (idle_update_account_cb, idle_info);
+       }
+
        /* Notify about operation end. Note that the info could be
           freed before this idle happens, but the mail operation will
           be still alive */
        g_idle_add (idle_notify_update_account_queue, g_object_ref (info->mail_op));
 
-       if (info->callback) {
-               /* This thread is not in the main lock */
-               gdk_threads_enter ();
-               info->callback (info->mail_op, 
-                               (new_headers) ? new_headers->len : 0, 
-                               info->user_data);
-               gdk_threads_leave ();
-       }
-       
        /* Frees */
        g_object_unref (query);
        g_object_unref (all_folders);
@@ -1155,7 +1185,7 @@ modest_mail_operation_update_account (ModestMailOperation *self,
         * if necessary:
         * TODO: Is there some way to trigger this for every attempt to 
         * use the network? */
-       if (!modest_platform_connect_and_wait(NULL))
+       if (!modest_platform_connect_and_wait (NULL))
                goto error;
 
        /* Get the Modest account */
@@ -1225,7 +1255,7 @@ modest_mail_operation_update_account (ModestMailOperation *self,
        priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
        if (callback) 
                callback (self, 0, user_data);
-       modest_mail_operation_notify_end (self, FALSE);
+       modest_mail_operation_notify_end (self);
        return FALSE;
 }
 
@@ -1260,6 +1290,13 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
                }
        }
 
+       if (!strcmp (name, " ") || strchr (name, '/')) {
+               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"));
+       }
+
        if (!priv->error) {
                /* Create the folder */
                new_folder = tny_folder_store_create_folder (parent, name, &(priv->error));
@@ -1269,7 +1306,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
        }
 
        /* Notify about operation end */
-       modest_mail_operation_notify_end (self, FALSE);
+       modest_mail_operation_notify_end (self);
 
        return new_folder;
 }
@@ -1310,7 +1347,8 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
                                                                      TNY_FOLDER_TYPE_TRASH);
                /* TODO: error_handling */
                 modest_mail_operation_xfer_folder (self, folder,
-                                                   TNY_FOLDER_STORE (trash_folder), TRUE);
+                                                   TNY_FOLDER_STORE (trash_folder), 
+                                                   TRUE, NULL, NULL);
        } else {
                TnyFolderStore *parent = tny_folder_get_folder_store (folder);
 
@@ -1324,7 +1362,7 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
 
  end:
        /* Notify about operation end */
-       modest_mail_operation_notify_end (self, FALSE);
+       modest_mail_operation_notify_end (self);
 }
 
 static void
@@ -1335,15 +1373,16 @@ transfer_folder_status_cb (GObject *obj,
        ModestMailOperation *self;
        ModestMailOperationPrivate *priv;
        ModestMailOperationState *state;
+       XFerMsgAsyncHelper *helper;
 
        g_return_if_fail (status != NULL);
        g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_COPY_FOLDER);
 
-       self = MODEST_MAIL_OPERATION (user_data);
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+       helper = (XFerMsgAsyncHelper *) user_data;
+       g_return_if_fail (helper != NULL);       
 
-       if ((status->position == 1) && (status->of_total == 100))
-               return;
+       self = helper->mail_op;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
        priv->done = status->position;
        priv->total = status->of_total;
@@ -1362,12 +1401,15 @@ transfer_folder_cb (TnyFolder *folder,
                    GError **err, 
                    gpointer user_data)
 {
+       XFerMsgAsyncHelper *helper;
        ModestMailOperation *self = NULL;
        ModestMailOperationPrivate *priv = NULL;
 
-       self = MODEST_MAIL_OPERATION (user_data);
+       helper = (XFerMsgAsyncHelper *) user_data;
+       g_return_if_fail (helper != NULL);       
 
-       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       self = helper->mail_op;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
        if (*err) {
                priv->error = g_error_copy (*err);
@@ -1384,28 +1426,37 @@ transfer_folder_cb (TnyFolder *folder,
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
        }
                
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (self);
+
+       /* If user defined callback function was defined, call it */
+       if (helper->user_callback) {
+               gdk_threads_enter ();
+               helper->user_callback (priv->source, helper->user_data);
+               gdk_threads_leave ();
+       }
+
        /* Free */
+       g_object_unref (helper->mail_op);
+       g_slice_free   (XFerMsgAsyncHelper, helper);
        g_object_unref (folder);
        g_object_unref (into);
-       if (new_folder != NULL)
-               g_object_unref (new_folder);
-
-       /* Notify about operation end */
-       modest_mail_operation_notify_end (self, TRUE);
 }
 
 void
 modest_mail_operation_xfer_folder (ModestMailOperation *self,
                                   TnyFolder *folder,
                                   TnyFolderStore *parent,
-                                  gboolean delete_original)
+                                  gboolean delete_original,
+                                  XferMsgsAsynUserCallback user_callback,
+                                  gpointer user_data)
 {
        ModestMailOperationPrivate *priv = NULL;
-       ModestTnyFolderRules parent_rules, rules;
+       ModestTnyFolderRules parent_rules = 0, rules; 
+       XFerMsgAsyncHelper *helper = NULL;
 
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_FOLDER (folder));
-       g_return_if_fail (TNY_IS_FOLDER (parent));
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
@@ -1415,14 +1466,12 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 
        /* 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)) {
-               
-       }
+       if (TNY_IS_FOLDER (parent))
+               parent_rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
        
        /* The moveable restriction is applied also to copy operation */
        if ((!TNY_IS_FOLDER_STORE (parent)) || (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE)) {
+               printf("DEBUG: %s: Not allowing the move.\n", __FUNCTION__);
                /* Set status failed and set an error */
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
@@ -1430,8 +1479,9 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                             _("mail_in_ui_folder_move_target_error"));
 
                /* Notify the queue */
-               modest_mail_operation_notify_end (self, FALSE);
-       } else if (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
+               modest_mail_operation_notify_end (self);
+       } else if (TNY_IS_FOLDER (parent) && 
+                  (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,
@@ -1439,12 +1489,20 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                             _("FIXME: parent folder does not accept new folders"));
 
                /* Notify the queue */
-               modest_mail_operation_notify_end (self, FALSE);
+               modest_mail_operation_notify_end (self);
        } else {
                /* Pick references for async calls */
                g_object_ref (folder);
                g_object_ref (parent);
 
+               /* Create the helper */
+               helper = g_slice_new0 (XFerMsgAsyncHelper);
+               helper->mail_op = g_object_ref(self);
+               helper->dest_folder = NULL;
+               helper->headers = NULL;
+               helper->user_callback = user_callback;
+               helper->user_data = user_data;
+               
                /* Move/Copy folder */          
                tny_folder_copy_async (folder,
                                       parent,
@@ -1452,7 +1510,8 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                                       delete_original,
                                       transfer_folder_cb,
                                       transfer_folder_status_cb,
-                                      self);
+                                      helper);
+/*                                    self); */
        }
 }
 
@@ -1463,6 +1522,7 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
 {
        ModestMailOperationPrivate *priv;
        ModestTnyFolderRules rules;
+       XFerMsgAsyncHelper *helper;
 
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_FOLDER_STORE (folder));
@@ -1483,19 +1543,34 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
                             _("FIXME: unable to rename"));
 
                /* Notify about operation end */
-               modest_mail_operation_notify_end (self, FALSE);
+               modest_mail_operation_notify_end (self);
+       } else if (!strcmp (name, " ") || strchr (name, '/')) {
+               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;
 
+               /* Create the helper */
+               helper = g_slice_new0 (XFerMsgAsyncHelper);
+               helper->mail_op = g_object_ref(self);
+               helper->dest_folder = NULL;
+               helper->headers = NULL;
+               helper->user_callback = NULL;
+               helper->user_data = NULL;
+
+               /* Rename. Camel handles folder subscription/unsubscription */
                into = tny_folder_get_folder_store (folder);
                tny_folder_copy_async (folder, into, name, TRUE,
                                 transfer_folder_cb,
                                 transfer_folder_status_cb,
-                                self);
+                                helper);
+/*                              self); */
                if (into)
-                       g_object_unref (into);
-               
+                       g_object_unref (into);          
        }
  }
 
@@ -1531,6 +1606,11 @@ void modest_mail_operation_get_msg (ModestMailOperation *self,
                helper->user_data = user_data;
                helper->header = g_object_ref (header);
 
+               // The callback's reference so that the mail op is not
+               // finalized until the async operation is completed even if
+               // the user canceled the request meanwhile.
+               g_object_ref (G_OBJECT (helper->mail_op));
+
                tny_folder_get_msg_async (folder, header, get_msg_cb, get_msg_status_cb, helper);
 
                g_object_unref (G_OBJECT (folder));
@@ -1542,7 +1622,7 @@ void modest_mail_operation_get_msg (ModestMailOperation *self,
                             _("Error trying to get a message. No folder found for header"));
 
                /* Notify the queue */
-               modest_mail_operation_notify_end (self, FALSE);
+               modest_mail_operation_notify_end (self);
        }
 }
 
@@ -1567,35 +1647,33 @@ get_msg_cb (TnyFolder *folder,
        if (*error) {
                priv->error = g_error_copy (*error);
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-               goto out;
-       }
-       if (cancelled) {
+       } else if (cancelled) {
                priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
                             _("Error trying to refresh the contents of %s"),
                             tny_folder_get_name (folder));
-               goto out;
+       } else {
+               priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
        }
 
-       priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-
-       /* If user defined callback function was defined, call it */
+       /* If user defined callback function was defined, call it even
+          if the operation failed*/
        if (helper->user_callback) {
                /* This callback is called into an iddle by tinymail,
                   and idles are not in the main lock */
                gdk_threads_enter ();
                helper->user_callback (self, helper->header, msg, helper->user_data);
-               gdk_threads_leave ();
+               gdk_threads_leave ();   
        }
 
- out:
        /* Free */
+       g_object_unref (helper->mail_op);
        g_object_unref (helper->header);
        g_slice_free (GetMsgAsyncHelper, helper);
                
        /* Notify about operation end */
-       modest_mail_operation_notify_end (self, TRUE);
+       modest_mail_operation_notify_end (self);
 }
 
 static void     
@@ -1617,7 +1695,7 @@ get_msg_status_cb (GObject *obj,
        self = helper->mail_op;
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       if ((status->position == 1) && (status->of_total == 100))
+       if(priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
                return;
 
        priv->done = 1;
@@ -1851,7 +1929,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
                             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, FALSE);
+               modest_mail_operation_notify_end (self);
                if (notify)
                        notify (user_data);
        }
@@ -1859,9 +1937,8 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 
 
 void 
-modest_mail_operation_remove_msg (ModestMailOperation *self,
-                                 TnyHeader *header,
-                                 gboolean remove_to_trash)
+modest_mail_operation_remove_msg (ModestMailOperation *self,  TnyHeader *header,
+                                 gboolean remove_to_trash /*ignored*/)
 {
        TnyFolder *folder;
        ModestMailOperationPrivate *priv;
@@ -1869,6 +1946,9 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_HEADER (header));
 
+       if (remove_to_trash)
+               g_warning ("remove to trash is not implemented");
+
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
        folder = tny_header_get_folder (header);
 
@@ -1877,44 +1957,21 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
 
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
-       /* Delete or move to trash */
-       if (remove_to_trash) {
-               TnyFolder *trash_folder;
-               TnyStoreAccount *store_account;
-
-               store_account = TNY_STORE_ACCOUNT (modest_tny_folder_get_account (folder));
-               trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(store_account),
-                                                                     TNY_FOLDER_TYPE_TRASH);
-               if (trash_folder) {
-                       TnyList *headers;
 
-                       /* Create list */
-                       headers = tny_simple_list_new ();
-                       tny_list_append (headers, G_OBJECT (header));
-                       g_object_unref (header);
-
-                       /* Move to trash */
-                       modest_mail_operation_xfer_msgs (self, headers, trash_folder, TRUE, NULL, NULL);
-                       g_object_unref (headers);
-/*                     g_object_unref (trash_folder); */
-               } else {
-                       ModestMailOperationPrivate *priv;
-
-                       /* Set status failed and set an error */
-                       priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-                       priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-                       g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-                                    MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
-                                    _("Error trying to delete a message. Trash folder not found"));
-               }
-
-               g_object_unref (G_OBJECT (store_account));
-       } else {
-               tny_folder_remove_msg (folder, header, &(priv->error));
-               if (!priv->error)
-                       tny_folder_sync(folder, TRUE, &(priv->error));
+       tny_folder_remove_msg (folder, header, &(priv->error));
+       if (!priv->error) {
+               tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
+
+               if (TNY_IS_CAMEL_IMAP_FOLDER (folder))
+                       tny_folder_sync(folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */
+               else if (TNY_IS_CAMEL_POP_FOLDER (folder))
+                       tny_folder_sync(folder, TRUE, &(priv->error)); /* TRUE --> expunge */
+               else
+                       /* lcoal folders */
+                       tny_folder_sync(folder, TRUE, &(priv->error)); /* TRUE --> expunge */
        }
-
+       
+       
        /* Set status */
        if (!priv->error)
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
@@ -1925,7 +1982,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
        g_object_unref (G_OBJECT (folder));
 
        /* Notify about operation end */
-       modest_mail_operation_notify_end (self, FALSE);
+       modest_mail_operation_notify_end (self);
 }
 
 static void
@@ -1948,9 +2005,6 @@ transfer_msgs_status_cb (GObject *obj,
        self = helper->mail_op;
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
-       if ((status->position == 1) && (status->of_total == 100))
-               return;
-
        priv->done = status->position;
        priv->total = status->of_total;
 
@@ -1987,6 +2041,9 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
        }
 
+       /* Notify about operation end */
+       modest_mail_operation_notify_end (self);
+
        /* If user defined callback function was defined, call it */
        if (helper->user_callback) {
                gdk_threads_enter ();
@@ -2001,8 +2058,6 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer
        g_slice_free   (XFerMsgAsyncHelper, helper);
        g_object_unref (folder);
 
-       /* Notify about operation end */
-       modest_mail_operation_notify_end (self, TRUE);
 }
 
 void
@@ -2019,6 +2074,9 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
        XFerMsgAsyncHelper *helper;
        TnyHeader *header;
        ModestTnyFolderRules rules;
+       const gchar *id1 = NULL;
+       const gchar *id2 = NULL;
+       gboolean same_folder = FALSE;
 
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_LIST (headers));
@@ -2036,9 +2094,35 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
                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"));
+                            _("ckct_ib_unable_to_paste_here"));
+               /* Notify the queue */
+               modest_mail_operation_notify_end (self);
+               return;
+       }
+               
+       /* Get source folder */
+       iter = tny_list_create_iterator (headers);
+       header = TNY_HEADER (tny_iterator_get_current (iter));
+       src_folder = tny_header_get_folder (header);
+       g_object_unref (header);
+       g_object_unref (iter);
+
+       /* Check folder source and destination */
+       id1 = tny_folder_get_id (src_folder);
+       id2 = tny_folder_get_id (TNY_FOLDER(folder));
+       same_folder = !g_ascii_strcasecmp (id1, id2);
+       if (same_folder) {
+               /* 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,
+                            _("mcen_ib_unable_to_copy_samefolder"));
+               
                /* Notify the queue */
-               modest_mail_operation_notify_end (self, FALSE);
+               modest_mail_operation_notify_end (self);
+               
+               /* Free */
+               g_object_unref (src_folder);            
                return;
        }
 
@@ -2050,13 +2134,6 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
        helper->user_callback = user_callback;
        helper->user_data = user_data;
 
-       /* Get source folder */
-       iter = tny_list_create_iterator (headers);
-       header = TNY_HEADER (tny_iterator_get_current (iter));
-       src_folder = tny_header_get_folder (header);
-       g_object_unref (header);
-       g_object_unref (iter);
-
        /* Get account and set it into mail_operation */
        priv->account = modest_tny_folder_get_account (src_folder);
 
@@ -2106,7 +2183,7 @@ on_refresh_folder (TnyFolder   *folder,
        /* Call user defined callback, if it exists */
        if (helper->user_callback) {
                gdk_threads_enter ();
-               helper->user_callback (priv->source, folder, helper->user_data);
+               helper->user_callback (self, folder, helper->user_data);
                gdk_threads_leave ();
        }
 
@@ -2116,7 +2193,7 @@ on_refresh_folder (TnyFolder   *folder,
        g_object_unref (folder);
 
        /* Notify about operation end */
-       modest_mail_operation_notify_end (self, TRUE);
+       modest_mail_operation_notify_end (self);
 }
 
 static void
@@ -2190,8 +2267,7 @@ modest_mail_operation_refresh_folder  (ModestMailOperation *self,
  * callback).
  */
 static void
-modest_mail_operation_notify_end (ModestMailOperation *self,
-                                 gboolean need_lock)
+modest_mail_operation_notify_end (ModestMailOperation *self)
 {
        ModestMailOperationState *state;
        ModestMailOperationPrivate *priv = NULL;
@@ -2215,10 +2291,6 @@ modest_mail_operation_notify_end (ModestMailOperation *self,
        
        /* Notify the observers about the mail opertation end */
        state = modest_mail_operation_clone_state (self);
-       if (need_lock)
-               gdk_threads_enter ();
        g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
-       if (need_lock)
-               gdk_threads_leave ();
        g_slice_free (ModestMailOperationState, state);
 }