* src/modest-ui-actions.c:
[modest] / src / modest-ui-actions.c
index 9d6c944..2f12ad9 100644 (file)
@@ -49,6 +49,7 @@
 #ifdef MODEST_PLATFORM_MAEMO
 #include "maemo/modest-osso-state-saving.h"
 #include "maemo/modest-maemo-utils.h"
+#include "maemo/modest-hildon-includes.h"
 #endif /* MODEST_PLATFORM_MAEMO */
 
 #include "widgets/modest-ui-constants.h"
@@ -99,6 +100,11 @@ typedef struct _ReplyForwardHelper {
        GtkWidget *parent_window;
 } ReplyForwardHelper;
 
+typedef struct _PasteAsAttachmentHelper {
+       ModestMsgEditWindow *window;
+       GtkWidget *banner;
+} PasteAsAttachmentHelper;
+
 
 /*
  * The do_headers_action uses this kind of functions to perform some
@@ -130,6 +136,9 @@ static void     _on_send_receive_progress_changed (ModestMailOperation  *mail_op
                                                   ModestMailOperationState *state,
                                                   gpointer user_data);
 
+static gboolean
+download_uncached_messages (TnyList *header_list, GtkWindow *win,
+                           gboolean reply_fwd);
 
 
 static void
@@ -314,8 +323,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                mgr = modest_runtime_get_window_mgr ();
                while (!tny_iterator_is_done (iter) && !found) {
                        header = TNY_HEADER (tny_iterator_get_current (iter));
-                       found =  modest_window_mgr_find_registered_header (mgr, header, NULL);
-                       g_object_unref (header);
+                       if (header) {
+                               found =  modest_window_mgr_find_registered_header (mgr, header, NULL);
+                               g_object_unref (header);
+                       }
+
                        tny_iterator_next (iter);
                }
                g_object_unref (iter);
@@ -339,8 +351,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
        if (tny_list_get_length(header_list) == 1) {
                iter = tny_list_create_iterator (header_list);
                header = TNY_HEADER (tny_iterator_get_current (iter));
-               desc = g_strdup_printf ("%s", tny_header_get_subject (header)); 
-               g_object_unref (header);
+               if (header) {
+                       desc = g_strdup_printf ("%s", tny_header_get_subject (header)); 
+                       g_object_unref (header);
+               }
+
                g_object_unref (iter);
        }
        message = g_strdup_printf(ngettext("emev_nc_delete_message", "emev_nc_delete_messages", 
@@ -466,6 +481,7 @@ void
 modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win)
 {
        gboolean ret_value;
+
        g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
 
 /*     if (MODEST_IS_MSG_VIEW_WINDOW (win)) { */
@@ -734,11 +750,12 @@ open_msg_cb (ModestMailOperation *mail_op,
        
        /* Gets folder type (OUTBOX headers will be opened in edit window */
        if (modest_tny_folder_is_local_folder (folder))
-               folder_type = modest_tny_folder_get_local_folder_type (folder);
+               folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
 
        /* If the header is in the drafts folder then open the editor,
           else the message view window */
-       if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+       if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) ||
+           (folder_type == TNY_FOLDER_TYPE_OUTBOX)) {
                /* we cannot edit without a valid account... */
                if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
                        run_account_setup_wizard(parent_win);
@@ -836,11 +853,9 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win)
 {
        ModestWindowMgr *mgr = NULL;
        TnyIterator *iter = NULL;
-       ModestMailOperation *mail_op1 = NULL;
-       ModestMailOperation *mail_op2 = NULL;
+       ModestMailOperation *mail_op = NULL;
        TnyList *not_opened_headers = NULL;
-       TnyList *not_opened_cached_headers = NULL;
-       TnyHeaderFlags flags;
+       TnyHeaderFlags flags = 0;
                
        /* Look if we already have a message view for each header. If
           true, then remove the header from the list of headers to
@@ -848,15 +863,16 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win)
        mgr = modest_runtime_get_window_mgr ();
        iter = tny_list_create_iterator (headers);
        not_opened_headers = tny_simple_list_new ();
-       not_opened_cached_headers = tny_simple_list_new ();
+
        while (!tny_iterator_is_done (iter)) {
 
-               ModestWindow *window;
-               TnyHeader *header;
-               gboolean found;
+               ModestWindow *window = NULL;
+               TnyHeader *header = NULL;
+               gboolean found = FALSE;
                
                header = TNY_HEADER (tny_iterator_get_current (iter));
-               flags = tny_header_get_flags (header);
+               if (header)
+                       flags = tny_header_get_flags (header);
 
                window = NULL;
                found = modest_window_mgr_find_registered_header (mgr, header, &window);
@@ -869,16 +885,14 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win)
                        else
                                /* the header has been registered already, we don't do
                                 * anything but wait for the window to come up*/
-                               g_warning ("debug: header %p already registered, waiting for window",
-                                          header);
+                               g_debug ("header %p already registered, waiting for window", header);
                } else {
-                       if (!(flags & TNY_HEADER_FLAG_CACHED))
-                               tny_list_append (not_opened_headers, G_OBJECT (header));
-                       /* Check if msg has already been retreived */
-                       else
-                               tny_list_append (not_opened_cached_headers, G_OBJECT (header));
+                       tny_list_append (not_opened_headers, G_OBJECT (header));
                }
-               g_object_unref (header);
+
+               if (header)
+                       g_object_unref (header);
+
                tny_iterator_next (iter);
        }
        g_object_unref (iter);
@@ -888,14 +902,25 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win)
         * make a connection. It's generally easier to do this here (in the mainloop) 
         * than later in a thread:
         */
-       if (tny_list_get_length (not_opened_cached_headers) > 0) {
-               gboolean connected = modest_platform_connect_and_wait (GTK_WINDOW (win), NULL);
-               
-               /* Don't go further if a connection would be necessary but none is available: */
-               if (!connected) {
+       if (tny_list_get_length (not_opened_headers) > 0) {
+               TnyIterator *iter;
+               gboolean found = FALSE;
+
+               iter = tny_list_create_iterator (not_opened_headers);
+               while (!tny_iterator_is_done (iter) && !found) {
+                       TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+                       if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED))
+                               found = TRUE;
+                       else
+                               tny_iterator_next (iter);
+
+                       g_object_unref (header);
+               }
+               g_object_unref (iter);
+
+               if (found && !modest_platform_connect_and_wait (GTK_WINDOW (win), NULL)) {
                        g_object_unref (not_opened_headers);
-                       g_object_unref (not_opened_cached_headers);
-                       return;
+                       return;                 
                }
        }
        
@@ -903,35 +928,25 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win)
        TnyIterator *iter_not_opened = tny_list_create_iterator (not_opened_headers);
        while (!tny_iterator_is_done (iter_not_opened)) {
                TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_not_opened));
-               modest_window_mgr_register_header (mgr, header);
-               g_object_unref (header);
+               if (header) {
+                       modest_window_mgr_register_header (mgr, header);
+                       g_object_unref (header);
+               }
                
                tny_iterator_next (iter_not_opened);
        }
        g_object_unref (iter_not_opened);
        iter_not_opened = NULL;
        
-       TnyIterator *iter_cached = tny_list_create_iterator (not_opened_cached_headers);
-       while (!tny_iterator_is_done (iter_cached)) {
-               TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_cached));
-               modest_window_mgr_register_header (mgr, header);
-               g_object_unref (header);
-               
-               tny_iterator_next (iter_cached);
-       }
-       g_object_unref (iter_cached);
-       iter_cached = NULL;
-       
-       
-       /* Open each uncached message */
+       /* Open each message */
        if (tny_list_get_length (not_opened_headers) > 0) {
-               mail_op1 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+               mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
                                                                         G_OBJECT (win), 
                                                                         modest_ui_actions_get_msgs_full_error_handler, 
                                                                         NULL);
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op1);
+               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
                if (tny_list_get_length (not_opened_headers) > 1) {
-                       modest_mail_operation_get_msgs_full (mail_op1, 
+                       modest_mail_operation_get_msgs_full (mail_op, 
                                                             not_opened_headers, 
                                                             open_msg_cb, 
                                                             NULL, 
@@ -939,45 +954,16 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win)
                } else {
                        TnyIterator *iter = tny_list_create_iterator (not_opened_headers);
                        TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
-                       modest_mail_operation_get_msg (mail_op1, header, open_msg_cb, NULL);
-                       g_object_unref (header);
-                       g_object_unref (iter);
-               }
-       }
-
-       /* Open each cached message */
-       if (tny_list_get_length (not_opened_cached_headers) > 0) {
-               mail_op2 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-                                                                        G_OBJECT (win), 
-                                                                        modest_ui_actions_get_msgs_full_error_handler, 
-                                                                        NULL);
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op2);
-               if (tny_list_get_length (not_opened_cached_headers) > 1) {
-                       modest_mail_operation_get_msgs_full (mail_op2, 
-                                                            not_opened_headers, 
-                                                            open_msg_cb, 
-                                                            NULL, 
-                                                            NULL);
-               } else {
-                       TnyIterator *iter = tny_list_create_iterator (not_opened_cached_headers);
-                       TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
-                       modest_mail_operation_get_msg (mail_op2, header, open_msg_cb, NULL);
+                       modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL);
                        g_object_unref (header);
                        g_object_unref (iter);
                }
+               g_object_unref (mail_op);
        }
 
        /* Clean */
        if (not_opened_headers != NULL)
                g_object_unref (not_opened_headers);
-       if (not_opened_cached_headers != NULL)
-               g_object_unref (not_opened_cached_headers);
-       if (iter != NULL) 
-               g_object_unref (iter);
-       if (mail_op1 != NULL)
-               g_object_unref (mail_op1);
-       if (mail_op2 != NULL) 
-               g_object_unref (mail_op2);
 }
 
 void
@@ -1117,7 +1103,8 @@ cleanup:
  * of them are currently downloaded
  */
 static gboolean
-download_uncached_messages (TnyList *header_list, GtkWindow *win,
+download_uncached_messages (TnyList *header_list, 
+                           GtkWindow *win,
                            gboolean reply_fwd)
 {
        TnyIterator *iter;
@@ -1127,16 +1114,14 @@ download_uncached_messages (TnyList *header_list, GtkWindow *win,
        iter = tny_list_create_iterator (header_list);
        while (!tny_iterator_is_done (iter)) {
                TnyHeader *header;
-               TnyHeaderFlags flags;
 
                header = TNY_HEADER (tny_iterator_get_current (iter));
-               flags = tny_header_get_flags (header);
-               /* TODO: is this the right flag?, it seems that some
-                  headers that have been previously downloaded do not
-                  come with it */
-               if (! (flags & TNY_HEADER_FLAG_CACHED))
-                       uncached_messages ++;
-               g_object_unref (header);
+               if (header) {
+                       if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED))
+                               uncached_messages ++;
+                       g_object_unref (header);
+               }
+
                tny_iterator_next (iter);
        }
        g_object_unref (iter);
@@ -1250,17 +1235,21 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                header = TNY_HEADER (tny_iterator_get_current (iter));
                g_object_unref (iter);
 
-               modest_mail_operation_get_msg (mail_op,
+               if (header) {
+                       modest_mail_operation_get_msg (mail_op,
                                               header,
                                               reply_forward_cb,
                                               rf_helper);
 
-/*             modest_mail_operation_get_msgs_full (mail_op,  */
+/*                     modest_mail_operation_get_msgs_full (mail_op,  */
 /*                                                  header_list,  */
 /*                                                  reply_forward_cb,  */
 /*                                                  rf_helper,  */
 /*                                                  free_reply_forward_helper); */
 
+                       g_object_unref (header);
+               }
+
                /* Clean */
                g_object_unref(mail_op);
        }
@@ -1511,22 +1500,11 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win)
        account_names = NULL;
 }
 
-/*
- * Handler of the click on Send&Receive button in the main toolbar
- */
-void
-modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
+void 
+modest_do_refresh_current_folder(ModestWindow *win)
 {
-       /* Check if accounts exist */
-       gboolean accounts_exist = 
-               modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
-       
-       /* If not, allow the user to create an account before trying to send/receive. */
-       if (!accounts_exist)
-               modest_ui_actions_on_accounts (NULL, win);
-
        /* Refresh currently selected folder. Note that if we only
-          want to retrive the headers, then the refresh only will
+          want to retreive the headers, then the refresh only will
           invoke a poke_status over all folders, i.e., only the
           total/unread count will be updated */
        if (MODEST_IS_MAIN_WINDOW (win)) {
@@ -1558,6 +1536,24 @@ modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
                if (folder_store)
                        g_object_unref (folder_store);
        }
+}
+
+
+/*
+ * Handler of the click on Send&Receive button in the main toolbar
+ */
+void
+modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
+{
+       /* Check if accounts exist */
+       gboolean accounts_exist = 
+               modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
+       
+       /* If not, allow the user to create an account before trying to send/receive. */
+       if (!accounts_exist)
+               modest_ui_actions_on_accounts (NULL, win);
+
+       modest_do_refresh_current_folder (win);
        
        /* Refresh the active account */
        modest_ui_actions_do_send_receive (NULL, win);
@@ -1813,7 +1809,8 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp
 
                gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
                if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-//                     modest_platform_connect_and_wait ();
+                       /* TODO: Comment about why is this commented out: */
+                       /* modest_platform_connect_and_wait (); */
                }
        }
        gtk_widget_destroy (dialog);
@@ -1933,7 +1930,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
 
-       if (!modest_msg_edit_window_check_names (edit_window))
+       if (!modest_msg_edit_window_check_names (edit_window, TRUE))
                return;
        
        /* Offer the connection dialog, if necessary: */        
@@ -2164,7 +2161,7 @@ modest_ui_actions_on_attach_file (GtkAction *action,
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
        g_return_if_fail (GTK_IS_ACTION (action));
 
-       modest_msg_edit_window_attach_file (window);
+       modest_msg_edit_window_offer_attach_file (window);
 }
 
 void 
@@ -2439,6 +2436,27 @@ modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainW
        delete_folder (main_window, TRUE);
 }
 
+
+static void
+show_error (GtkWidget *parent_widget, const gchar* text)
+{
+       hildon_banner_show_information(parent_widget, NULL, text);
+       
+#if 0
+       GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text)); */
+       /*
+         GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window,
+         (GtkDialogFlags)0,
+         GTK_MESSAGE_ERROR,
+         GTK_BUTTONS_OK,
+         text ));
+       */
+                
+       gtk_dialog_run (dialog);
+       gtk_widget_destroy (GTK_WIDGET (dialog));
+#endif
+}
+
 void
 modest_ui_actions_on_password_requested (TnyAccountStore *account_store, 
                                         const gchar* server_account_name,
@@ -2596,6 +2614,8 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                        *cancel   = FALSE;
                        
        } else {
+               show_error(GTK_WIDGET (main_window), _("mail_ib_login_cancelled"));
+               
                if (username)
                        *username = NULL;
                        
@@ -2623,18 +2643,21 @@ modest_ui_actions_on_cut (GtkAction *action,
                          ModestWindow *window)
 {
        GtkWidget *focused_widget;
+       GtkClipboard *clipboard;
 
+       clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
        focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
        if (GTK_IS_EDITABLE (focused_widget)) {
                gtk_editable_cut_clipboard (GTK_EDITABLE(focused_widget));
+               gtk_clipboard_set_can_store (clipboard, NULL, 0);
+               gtk_clipboard_store (clipboard);
        } else if (GTK_IS_TEXT_VIEW (focused_widget)) {
                GtkTextBuffer *buffer;
-               GtkClipboard *clipboard;
 
-               clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
                buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
                gtk_text_buffer_cut_clipboard (buffer, clipboard, TRUE);
                gtk_clipboard_set_can_store (clipboard, NULL, 0);
+               gtk_clipboard_store (clipboard);
        } else if (MODEST_IS_HEADER_VIEW (focused_widget)) {
                modest_header_view_cut_selection (MODEST_HEADER_VIEW (focused_widget));
        } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
@@ -2654,28 +2677,40 @@ modest_ui_actions_on_copy (GtkAction *action,
 
        if (GTK_IS_LABEL (focused_widget)) {
                gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1);
+               gtk_clipboard_set_can_store (clipboard, NULL, 0);
+               gtk_clipboard_store (clipboard);
        } else if (GTK_IS_EDITABLE (focused_widget)) {
                gtk_editable_copy_clipboard (GTK_EDITABLE(focused_widget));
+               gtk_clipboard_set_can_store (clipboard, NULL, 0);
+               gtk_clipboard_store (clipboard);
        } else if (GTK_IS_HTML (focused_widget)) {
                gtk_html_copy (GTK_HTML (focused_widget));
+               gtk_clipboard_set_can_store (clipboard, NULL, 0);
+               gtk_clipboard_store (clipboard);
        } else if (GTK_IS_TEXT_VIEW (focused_widget)) {
                GtkTextBuffer *buffer;
                buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
                gtk_text_buffer_copy_clipboard (buffer, clipboard);
                gtk_clipboard_set_can_store (clipboard, NULL, 0);
+               gtk_clipboard_store (clipboard);
        } else if (MODEST_IS_HEADER_VIEW (focused_widget)) {
                TnyList *header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (focused_widget));
                TnyIterator *iter = tny_list_create_iterator (header_list);
                TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
-               TnyFolder *folder = tny_header_get_folder (header);
-               TnyAccount *account = tny_folder_get_account (folder);
-               const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account));
-               /* If it's POP then ask */
-               gboolean ask = (modest_protocol_info_get_transport_store_protocol (proto_str) == 
-                      MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE;
-               g_object_unref (account);
-               g_object_unref (folder);
-               g_object_unref (header);
+               
+               gboolean ask = FALSE;
+               if (header) {
+                       TnyFolder *folder = tny_header_get_folder (header);
+                       TnyAccount *account = tny_folder_get_account (folder);
+                       const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account));
+                       /* If it's POP then ask */
+                       ask = (modest_protocol_info_get_transport_store_protocol (proto_str) == 
+                               MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE;
+                       g_object_unref (account);
+                       g_object_unref (folder);
+                       g_object_unref (header);
+               }
+
                g_object_unref (iter);
                
                /* Check that the messages have been previously downloaded */
@@ -2735,6 +2770,32 @@ paste_msgs_cb (const GObject *object, gpointer user_data)
        gtk_widget_destroy (GTK_WIDGET(user_data));
 }
 
+static void
+paste_as_attachment_free (gpointer data)
+{
+       PasteAsAttachmentHelper *helper = (PasteAsAttachmentHelper *) data;
+
+       gtk_widget_destroy (helper->banner);
+       g_object_unref (helper->banner);
+       g_free (helper);
+}
+
+static void
+paste_msg_as_attachment_cb (ModestMailOperation *mail_op,
+                           TnyHeader *header,
+                           TnyMsg *msg,
+                           gpointer userdata)
+{
+       PasteAsAttachmentHelper *helper = (PasteAsAttachmentHelper *) userdata;
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (helper->window));
+
+       if (msg == NULL)
+               return;
+
+       modest_msg_edit_window_add_part (MODEST_MSG_EDIT_WINDOW (helper->window), TNY_MIME_PART (msg));
+       
+}
+
 void
 modest_ui_actions_on_paste (GtkAction *action,
                            ModestWindow *window)
@@ -2747,12 +2808,41 @@ modest_ui_actions_on_paste (GtkAction *action,
        if (GTK_IS_EDITABLE (focused_widget)) {
                gtk_editable_paste_clipboard (GTK_EDITABLE(focused_widget));
        } else if (GTK_IS_TEXT_VIEW (focused_widget)) {
-               GtkTextBuffer *buffer;
-               GtkClipboard *clipboard;
+               ModestEmailClipboard *e_clipboard = NULL;
+               e_clipboard = modest_runtime_get_email_clipboard ();
+               if (modest_email_clipboard_cleared (e_clipboard)) {
+                       GtkTextBuffer *buffer;
+                       GtkClipboard *clipboard;
+
+                       clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+                       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
+                       gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
+               } else if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
+                       ModestMailOperation *mail_op;
+                       TnyFolder *src_folder;
+                       TnyList *data;
+                       gboolean delete;
+                       PasteAsAttachmentHelper *helper = g_new0 (PasteAsAttachmentHelper, 1);
+                       helper->window = MODEST_MSG_EDIT_WINDOW (window);
+                       helper->banner = modest_platform_animation_banner (GTK_WIDGET (window), NULL,
+                                                                          _CS("ckct_nw_pasting"));
+                       modest_email_clipboard_get_data (e_clipboard, &src_folder, &data, &delete);
+                       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+                                                            G_OBJECT (window));
+                       if (helper->banner != NULL) {
+                               g_object_ref (G_OBJECT (helper->banner));
+                               gtk_window_set_modal (GTK_WINDOW (helper->banner), FALSE);
+                               gtk_widget_show (GTK_WIDGET (helper->banner));
+                       }
 
-               clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-               buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
-               gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
+                       if (data != NULL) {
+                               modest_mail_operation_get_msgs_full (mail_op, 
+                                                                    data,
+                                                                    (GetMsgAsyncUserCallback) paste_msg_as_attachment_cb,
+                                                                    helper,
+                                                                    paste_as_attachment_free);
+                       }
+               }
        } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
                ModestEmailClipboard *clipboard = NULL;
                TnyFolder *src_folder = NULL;
@@ -3030,8 +3120,10 @@ modest_ui_actions_on_details (GtkAction *action,
                iter = tny_list_create_iterator (headers_list);
 
                header = TNY_HEADER (tny_iterator_get_current (iter));
-               headers_action_show_details (header, win, NULL);
-               g_object_unref (header);
+               if (header) {
+                       headers_action_show_details (header, win, NULL);
+                       g_object_unref (header);
+               }
 
                g_object_unref (iter);
                g_object_unref (headers_list);
@@ -3153,7 +3245,7 @@ void
 modest_ui_actions_on_check_names (GtkAction *action, ModestMsgEditWindow *window)
 {
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
-       modest_msg_edit_window_check_names (window);
+       modest_msg_edit_window_check_names (window, FALSE);
 }
 
 static void
@@ -3232,12 +3324,16 @@ has_retrieved_msgs (TnyList *list)
        iter = tny_list_create_iterator (list);
        while (tny_iterator_is_done (iter) && !found) {
                TnyHeader *header;
-               TnyHeaderFlags flags;
+               TnyHeaderFlags flags = 0;
 
                header = TNY_HEADER (tny_iterator_get_current (iter));
-               flags = tny_header_get_flags (header);
-               if (!(flags & TNY_HEADER_FLAG_PARTIAL))
-                       found = TRUE;
+               if (header) {
+                       flags = tny_header_get_flags (header);
+                       if (!(flags & TNY_HEADER_FLAG_PARTIAL))
+                               found = TRUE;
+
+                       g_object_unref (header);
+               }
 
                if (!found)
                        tny_iterator_next (iter);
@@ -3262,15 +3358,18 @@ msgs_move_to_confirmation (GtkWindow *win,
 
        /* If the destination is a local folder */
        if (modest_tny_folder_is_local_folder (dest_folder)) {
-               TnyFolder *src_folder;
-               TnyIterator *iter;
-               TnyHeader *header;
+               TnyFolder *src_folder = NULL;
+               TnyIterator *iter = NULL;
+               TnyHeader *header = NULL;
 
                /* 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);
+               if (header) {
+                       src_folder = tny_header_get_folder (header);
+                       g_object_unref (header);
+               }
+
                g_object_unref (iter);
 
                /* if no src_folder, message may be an attahcment */
@@ -3291,8 +3390,10 @@ msgs_move_to_confirmation (GtkWindow *win,
                        response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
                                                                            (const gchar *) message);
                }
+               
                g_object_unref (src_folder);
        }
+       
        return response;
 }
 
@@ -3385,12 +3486,16 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op,
        while (!tny_iterator_is_done (iter)) {
                TnyMimePart *part;
                part = TNY_MIME_PART (tny_iterator_get_current (iter));
-               if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)) {
+               if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))) {
                        if (tny_mime_part_is_purged (part))
                                some_purged = TRUE;
                        else
                                pending_purges++;
                }
+
+               if (part)
+                       g_object_unref (part);
+
                tny_iterator_next (iter);
        }
 
@@ -3405,8 +3510,12 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op,
                                TnyMimePart *part;
                                
                                part = TNY_MIME_PART (tny_iterator_get_current (iter));
-                               if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))
+                               if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)))
                                        tny_mime_part_set_purged (part);
+
+                               if (part)
+                                       g_object_unref (part);
+
                                tny_iterator_next (iter);
                        }
                        
@@ -3422,7 +3531,14 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op,
                TnyMimePart *part;
                        
                part = TNY_MIME_PART (tny_iterator_get_current (iter));
-               g_object_unref (part);
+               if (part) {
+                       /* One for the reference given by tny_iterator_get_current(): */
+                       g_object_unref (part);
+
+                       /* TODO: Is this meant to remove the attachment by doing another unref()? 
+                        * Otherwise, this seems useless. */
+               }
+
                tny_iterator_next (iter);
        }
        modest_window_mgr_unregister_header (mgr, header);
@@ -3694,10 +3810,10 @@ do_headers_action (ModestWindow *win,
                   HeadersFunc func,
                   gpointer user_data)
 {
-       TnyList *headers_list;
-       TnyIterator *iter;
-       TnyHeader *header;
-       TnyFolder *folder;
+       TnyList *headers_list = NULL;
+       TnyIterator *iter = NULL;
+       TnyHeader *header = NULL;
+       TnyFolder *folder = NULL;
 
        /* Get headers */
        headers_list = get_selected_headers (win);
@@ -3707,8 +3823,10 @@ do_headers_action (ModestWindow *win,
        /* Get the folder */
        iter = tny_list_create_iterator (headers_list);
        header = TNY_HEADER (tny_iterator_get_current (iter));
-       folder = tny_header_get_folder (header);
-       g_object_unref (header);
+       if (header) {
+               folder = tny_header_get_folder (header);
+               g_object_unref (header);
+       }
 
        /* Call the function for each header */
        while (!tny_iterator_is_done (iter)) {