Dbus open message faster user feedback (WIP 1)
[modest] / src / maemo / modest-msg-view-window.c
index 05ae61e..2114334 100644 (file)
@@ -155,9 +155,20 @@ static gboolean msg_is_visible (TnyHeader *header, gboolean check_outbox);
 
 static void check_dimming_rules_after_change (ModestMsgViewWindow *window);
 
+static gboolean on_fetch_image (ModestMsgView *msgview,
+                               const gchar *uri,
+                               TnyStream *stream,
+                               ModestMsgViewWindow *window);
+
+static gboolean modest_msg_view_window_scroll_child (ModestMsgViewWindow *self,
+                                                    GtkScrollType scroll_type,
+                                                    gboolean horizontal,
+                                                    gpointer userdata);
+
 /* list my signals */
 enum {
        MSG_CHANGED_SIGNAL,
+       SCROLL_CHILD_SIGNAL,
        LAST_SIGNAL
 };
 
@@ -226,6 +237,7 @@ struct _ModestMsgViewWindowPrivate {
        guint progress_bar_timeout;
 
        gchar *msg_uid;
+       TnyMimePart *other_body;
        
        GSList *sighandlers;
 };
@@ -304,11 +316,43 @@ restore_settings (ModestMsgViewWindow *self)
                                      MODEST_CONF_MSG_VIEW_WINDOW_KEY);
 }
 
+static gboolean modest_msg_view_window_scroll_child (ModestMsgViewWindow *self,
+                                                    GtkScrollType scroll_type,
+                                                    gboolean horizontal,
+                                                    gpointer userdata)
+{
+       ModestMsgViewWindowPrivate *priv;
+       gboolean return_value;
+
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
+       g_signal_emit_by_name (priv->main_scroll, "scroll-child", scroll_type, horizontal, &return_value);
+       return return_value;
+}
+
+static void
+add_scroll_binding (GtkBindingSet *binding_set,
+                   guint keyval,
+                   GtkScrollType scroll)
+{
+       guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left;
+       
+       gtk_binding_entry_add_signal (binding_set, keyval, 0,
+                                     "scroll_child", 2,
+                                     GTK_TYPE_SCROLL_TYPE, scroll,
+                                     G_TYPE_BOOLEAN, FALSE);
+       gtk_binding_entry_add_signal (binding_set, keypad_keyval, 0,
+                                     "scroll_child", 2,
+                                     GTK_TYPE_SCROLL_TYPE, scroll,
+                                     G_TYPE_BOOLEAN, FALSE);
+}
+
 static void
 modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass)
 {
        GObjectClass *gobject_class;
        ModestWindowClass *modest_window_class;
+       GtkBindingSet *binding_set;
+
        gobject_class = (GObjectClass*) klass;
        modest_window_class = (ModestWindowClass *) klass;
 
@@ -322,10 +366,10 @@ modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass)
        modest_window_class->show_toolbar_func = modest_msg_view_window_show_toolbar;
        modest_window_class->disconnect_signals_func = modest_msg_view_window_disconnect_signals;
 
-       g_type_class_add_private (gobject_class, sizeof(ModestMsgViewWindowPrivate));
-
        modest_window_class->save_state_func = save_state;
 
+       klass->scroll_child = modest_msg_view_window_scroll_child;
+
        signals[MSG_CHANGED_SIGNAL] =
                g_signal_new ("msg-changed",
                              G_TYPE_FROM_CLASS (gobject_class),
@@ -334,6 +378,26 @@ modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass)
                              NULL, NULL,
                              modest_marshal_VOID__POINTER_POINTER,
                              G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
+
+       signals[SCROLL_CHILD_SIGNAL] =
+               g_signal_new ("scroll-child",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                             G_STRUCT_OFFSET (ModestMsgViewWindowClass, scroll_child),
+                             NULL, NULL,
+                             modest_marshal_BOOLEAN__ENUM_BOOLEAN,
+                             G_TYPE_BOOLEAN, 2, GTK_TYPE_SCROLL_TYPE, G_TYPE_BOOLEAN);
+
+       binding_set = gtk_binding_set_by_class (klass);
+       add_scroll_binding (binding_set, GDK_Up, GTK_SCROLL_STEP_UP);
+       add_scroll_binding (binding_set, GDK_Down, GTK_SCROLL_STEP_DOWN);
+       add_scroll_binding (binding_set, GDK_Page_Up, GTK_SCROLL_PAGE_UP);
+       add_scroll_binding (binding_set, GDK_Page_Down, GTK_SCROLL_PAGE_DOWN);
+       add_scroll_binding (binding_set, GDK_Home, GTK_SCROLL_START);
+       add_scroll_binding (binding_set, GDK_End, GTK_SCROLL_END);
+
+       g_type_class_add_private (gobject_class, sizeof(ModestMsgViewWindowPrivate));
+
 }
 
 static void modest_header_view_observer_init(
@@ -415,6 +479,7 @@ modest_msg_view_window_init (ModestMsgViewWindow *obj)
        priv->purge_timeout = 0;
        priv->remove_attachment_banner = NULL;
        priv->msg_uid = NULL;
+       priv->other_body = NULL;
        
        priv->sighandlers = NULL;
        
@@ -642,6 +707,11 @@ modest_msg_view_window_finalize (GObject *obj)
           call this function before */
        modest_msg_view_window_disconnect_signals (MODEST_WINDOW (obj));
 
+       if (priv->other_body != NULL) {
+               g_object_unref (priv->other_body);
+               priv->other_body = NULL;
+       }
+
        if (priv->header_model != NULL) {
                g_object_unref (priv->header_model);
                priv->header_model = NULL;
@@ -712,6 +782,7 @@ select_next_valid_row (GtkTreeModel *model,
                                if (msg_is_visible (header, is_outbox)) {
                                        next = gtk_tree_model_get_path (model, &tmp_iter);
                                        *row_reference = gtk_tree_row_reference_new (model, next);
+                                       gtk_tree_path_free (next);
                                        retval = TRUE;
                                        finished = TRUE;
                                }
@@ -741,6 +812,7 @@ select_next_valid_row (GtkTreeModel *model,
                                   message */
                                finished = TRUE;
                        }
+                       gtk_tree_path_free (next);
                } else {
                        /* If there are no more messages and we don't
                           want to start again in the first one then
@@ -751,8 +823,6 @@ select_next_valid_row (GtkTreeModel *model,
 
        /* Free */
        gtk_tree_path_free (path);
-       if (next)
-               gtk_tree_path_free (next);
 
        return retval;
 }
@@ -823,6 +893,8 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self,
                          G_CALLBACK (modest_ui_actions_on_msg_recpt_activated), obj);
        g_signal_connect (G_OBJECT(priv->msg_view), "link_contextual",
                          G_CALLBACK (modest_ui_actions_on_msg_link_contextual), obj);
+       g_signal_connect (G_OBJECT (priv->msg_view), "fetch_image",
+                         G_CALLBACK (on_fetch_image), obj);
 
        g_signal_connect (G_OBJECT (obj), "key-release-event",
                          G_CALLBACK (modest_msg_view_window_key_event),
@@ -865,10 +937,91 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self,
 
 }
 
+ModestWindow *
+modest_msg_view_window_new_from_uid (const gchar *modest_account_name,
+                                    const gchar *mailbox,
+                                    const gchar *msg_uid)
+{
+       ModestMsgViewWindow *window = NULL;
+       ModestMsgViewWindowPrivate *priv = NULL;
+       TnyFolder *folder = NULL;
+       ModestWindowMgr *mgr = NULL;
+       gboolean is_merge;
+       TnyAccount *account = NULL;
+
+       mgr = modest_runtime_get_window_mgr ();
+       window = MODEST_MSG_VIEW_WINDOW (modest_window_mgr_get_msg_view_window (mgr));
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL);
+
+       modest_msg_view_window_construct (window, modest_account_name, mailbox, msg_uid);
+
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+
+
+
+       is_merge = g_str_has_prefix (msg_uid, "merge:");
+
+       /* Get the account */
+       if (!is_merge)
+               account = tny_account_store_find_account (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
+                                                         msg_uid);
+
+       
+       if (is_merge || account) {
+               OpenMsgPerformerInfo *info;
+               TnyFolder *folder = NULL;
+
+               /* Try to get the message, if it's already downloaded
+                  we don't need to connect */
+               if (account) {
+                       folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), msg_uid, NULL);
+               } else {
+                       ModestTnyAccountStore *account_store;
+                       ModestTnyLocalFoldersAccount *local_folders_account;
+
+                       account_store = modest_runtime_get_account_store ();
+                       local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
+                               modest_tny_account_store_get_local_folders_account (account_store));
+                       folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
+                       g_object_unref (local_folders_account);
+               }
+               if (folder) {
+                       TnyDevice *device;
+                       gboolean device_online;
+
+                       device = modest_runtime_get_device();
+                       device_online = tny_device_is_online (device);
+                       if (device_online) {
+                               message_reader (window, priv, NULL, msg_uid, folder, NULL);
+                       } else {
+                               TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL);
+                               if (msg) {
+                                       tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
+                                       g_object_unref (msg);
+                               } else {
+                                       message_reader (window, priv, NULL, msg_uid, folder, NULL);
+                               }
+                       }
+                       g_object_unref (folder);
+               }
+
+       }
+
+       /* Check dimming rules */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
+
+       return MODEST_WINDOW(window);
+}
+
+
+
 /* FIXME: parameter checks */
 ModestWindow *
 modest_msg_view_window_new_with_header_model (TnyMsg *msg, 
                                              const gchar *modest_account_name,
+                                             const gchar *mailbox, /*ignored */
                                              const gchar *msg_uid,
                                              GtkTreeModel *model, 
                                              GtkTreeRowReference *row_reference)
@@ -967,6 +1120,7 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg,
 ModestWindow *
 modest_msg_view_window_new_for_search_result (TnyMsg *msg, 
                                              const gchar *modest_account_name,
+                                             const gchar *mailbox, /*ignored*/
                                              const gchar *msg_uid)
 {
        ModestMsgViewWindow *window = NULL;
@@ -998,10 +1152,23 @@ modest_msg_view_window_new_for_search_result (TnyMsg *msg,
        return MODEST_WINDOW(window);
 }
 
+gboolean
+modest_msg_view_window_is_other_body (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv = NULL;
+
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE);
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+       return (priv->other_body != NULL);
+}
+
 ModestWindow *
-modest_msg_view_window_new_for_attachment (TnyMsg *msg, 
-                           const gchar *modest_account_name,
-                           const gchar *msg_uid)
+modest_msg_view_window_new_with_other_body (TnyMsg *msg, 
+                                           TnyMimePart *other_body,
+                                           const gchar *modest_account_name,
+                                           const gchar *mailbox, /* ignored */
+                                           const gchar *msg_uid)
 {
        GObject *obj = NULL;
        ModestMsgViewWindowPrivate *priv;       
@@ -1014,7 +1181,12 @@ modest_msg_view_window_new_for_attachment (TnyMsg *msg,
        modest_msg_view_window_construct (MODEST_MSG_VIEW_WINDOW (obj), 
                modest_account_name, msg_uid);
 
-       tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
+       if (other_body) {
+               priv->other_body = g_object_ref (other_body);
+               modest_msg_view_set_msg_with_other_body (MODEST_MSG_VIEW (priv->msg_view), msg, other_body);
+       } else {
+               tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
+       }
        update_window_title (MODEST_MSG_VIEW_WINDOW (obj));
 
        gtk_widget_show_all (GTK_WIDGET (obj));
@@ -1027,6 +1199,16 @@ modest_msg_view_window_new_for_attachment (TnyMsg *msg,
        return MODEST_WINDOW(obj);
 }
 
+ModestWindow *
+modest_msg_view_window_new_for_attachment (TnyMsg *msg, 
+                                          const gchar *modest_account_name,
+                                          const gchar *mailbox, /* ignored */
+                                          const gchar *msg_uid)
+{
+       return modest_msg_view_window_new_with_other_body (msg, NULL, modest_account_name, mailbox, msg_uid);
+
+}
+
 static void
 modest_msg_view_window_on_row_changed (GtkTreeModel *header_model,
                                       GtkTreePath *arg1,
@@ -1043,34 +1225,13 @@ modest_msg_view_window_on_row_deleted(GtkTreeModel *header_model,
 {
        check_dimming_rules_after_change (window);
 }
-
-static gboolean
-check_dimming_rules_after_change_in_idle (gpointer data)
-{
        /* The window could have dissapeared */
-       if (MODEST_IS_WINDOW (data)) {
-               ModestWindow *win = MODEST_WINDOW (data);
-               gdk_threads_enter ();
-               modest_ui_actions_check_menu_dimming_rules (win);
-               modest_ui_actions_check_toolbar_dimming_rules (win);
-               gdk_threads_leave ();
-       }
-
-       return FALSE;
-}
 
 static void
 check_dimming_rules_after_change (ModestMsgViewWindow *window)
 {
-       static guint dimming_delayer = 0;
-
-       if (dimming_delayer > 0)
-               g_source_remove (dimming_delayer);
-
-       /* We're expecting a lot of changes at the same time so don't
-          need to check dimming rules for every change that
-          happens */
-       dimming_delayer = g_timeout_add (100, check_dimming_rules_after_change_in_idle, window);
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
 }
 
 
@@ -1381,6 +1542,7 @@ modest_msg_view_window_toggle_find_toolbar (GtkToggleAction *toggle,
                hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
        } else {
                gtk_widget_hide (priv->find_toolbar);
+               modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
        }
 
        /* update the toggle buttons status */
@@ -1423,7 +1585,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
 
        if ((current_search == NULL) || (strcmp (current_search, "") == 0)) {
                g_free (current_search);
-               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ecdg_ib_find_rep_enter_text"));
+               hildon_banner_show_information (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
                return;
        }
 
@@ -1434,7 +1596,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
                result = modest_isearch_view_search (MODEST_ISEARCH_VIEW (priv->msg_view),
                                                     priv->last_search);
                if (!result) {
-                       hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_no_matches"));
+                       hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_no_matches"));
                        g_free (priv->last_search);
                        priv->last_search = NULL;
                } else {
@@ -1443,7 +1605,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
                }
        } else {
                if (!modest_isearch_view_search_next (MODEST_ISEARCH_VIEW (priv->msg_view))) {
-                       hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_search_complete"));
+                       hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_search_complete"));
                        g_free (priv->last_search);
                        priv->last_search = NULL;
                } else {
@@ -1502,7 +1664,7 @@ modest_msg_view_window_zoom_plus (ModestWindow *window)
        group = gtk_radio_action_get_group (zoom_radio_action);
 
        if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (group->data))) {
-               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_max_zoom_level_reached"));
+               hildon_banner_show_information (NULL, NULL, _CS("ckct_ib_max_zoom_level_reached"));
                return FALSE;
        }
 
@@ -1534,7 +1696,8 @@ modest_msg_view_window_zoom_minus (ModestWindow *window)
                                gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->next->data), TRUE);
                                return TRUE;
                        } else {
-                         hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_min_zoom_level_reached"));
+                         hildon_banner_show_information (NULL, NULL, 
+                                                         _CS("ckct_ib_min_zoom_level_reached"));
                                return FALSE;
                        }
                        break;
@@ -1569,10 +1732,10 @@ modest_msg_view_window_key_event (GtkWidget *window,
            event->keyval == GDK_Page_Down || event->keyval == GDK_KP_Page_Down ||
            event->keyval == GDK_Home || event->keyval == GDK_KP_Home ||
            event->keyval == GDK_End || event->keyval == GDK_KP_End) {
-               ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
-               gboolean return_value;
+               /* ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); */
+               /* gboolean return_value; */
 
-               if (event->type == GDK_KEY_RELEASE) {
+               if (event->type == GDK_KEY_PRESS) {
                        GtkScrollType scroll_type;
                        
                        switch (event->keyval) {
@@ -1597,9 +1760,9 @@ modest_msg_view_window_key_event (GtkWidget *window,
                        default: scroll_type = GTK_SCROLL_NONE;
                        }
                        
-                       g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", 
-                                              scroll_type, FALSE, &return_value);
-                       return TRUE;
+                       /* g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child",  */
+                       /*                     scroll_type, FALSE, &return_value); */
+                       return FALSE;
                } else {
                        return FALSE;
                }
@@ -1623,6 +1786,9 @@ modest_msg_view_window_last_message_selected (ModestMsgViewWindow *window)
        if (!priv->header_model || !priv->row_reference)
                return TRUE;
 
+       if (!gtk_tree_row_reference_valid (priv->row_reference))
+               return TRUE;
+
        path = gtk_tree_row_reference_get_path (priv->row_reference);
        if (path == NULL)
                return TRUE;
@@ -1690,7 +1856,6 @@ modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window)
        ModestMsgViewWindowPrivate *priv;
        gboolean is_first_selected;
        GtkTreeIter tmp_iter;
-/*     gchar * path_string;*/
 
        g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), TRUE);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
@@ -1699,18 +1864,13 @@ modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window)
        if (!priv->header_model || !priv->row_reference)
                return TRUE;
 
+       if (!gtk_tree_row_reference_valid (priv->row_reference))
+               return TRUE;
+
        path = gtk_tree_row_reference_get_path (priv->row_reference);
        if (!path)
                return TRUE;
 
-/*     path_string = gtk_tree_path_to_string (path);
-       is_first_selected = strcmp (path_string, "0");
-
-       g_free (path_string);
-       gtk_tree_path_free (path);
-
-       return is_first_selected;*/
-
        is_first_selected = TRUE;
        while (is_first_selected) {
                TnyHeader *header;
@@ -1735,6 +1895,8 @@ modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window)
 
 typedef struct {
        TnyHeader *header;
+       gchar *msg_uid;
+       TnyFolder *folder;
        GtkTreeRowReference *row_reference;
 } MsgReaderInfo;
 
@@ -1762,7 +1924,10 @@ message_reader_performer (gboolean canceled,
                                                                 NULL, NULL);
                                
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_get_msg (mail_op, info->header, TRUE, view_msg_cb, info->row_reference);
+       if (info->header)
+               modest_mail_operation_get_msg (mail_op, info->header, TRUE, view_msg_cb, info->row_reference);
+       else
+               modest_mail_operation_find_msg (mail_op, info->folder, info->uid, TRUE, view_msg_cb);
        g_object_unref (mail_op);
 
        /* Update dimming rules */
@@ -1771,6 +1936,7 @@ message_reader_performer (gboolean canceled,
 
  frees:
        /* Frees. The row_reference will be freed by the view_msg_cb callback */
+       g_free (info->uid);
        g_object_unref (info->header);
        g_slice_free (MsgReaderInfo, info);
 }
@@ -1792,17 +1958,16 @@ static gboolean
 message_reader (ModestMsgViewWindow *window,
                ModestMsgViewWindowPrivate *priv,
                TnyHeader *header,
+               const gchar *msg_uid,
+               TnyFolder *folder,
                GtkTreeRowReference *row_reference)
 {
        gboolean already_showing = FALSE;
        ModestWindow *msg_window = NULL;
        ModestWindowMgr *mgr;
        TnyAccount *account;
-       TnyFolder *folder;
        MsgReaderInfo *info;
 
-       g_return_val_if_fail (row_reference != NULL, FALSE);
-
        mgr = modest_runtime_get_window_mgr ();
        already_showing = modest_window_mgr_find_registered_header (mgr, header, &msg_window);
        if (already_showing && (msg_window != MODEST_WINDOW (window))) {
@@ -1814,7 +1979,7 @@ message_reader (ModestMsgViewWindow *window,
        }
 
        /* Msg download completed */
-       if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)) {
+       if (!header || !(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)) {
                /* Ask the user if he wants to download the message if
                   we're not online */
                if (!tny_device_is_online (modest_runtime_get_device())) {
@@ -1824,11 +1989,21 @@ message_reader (ModestMsgViewWindow *window,
                                                                            _("mcen_nc_get_msg"));
                        if (response == GTK_RESPONSE_CANCEL)
                                return FALSE;
-               
-                       folder = tny_header_get_folder (header);
+
+                       if (header)
+                               folder = tny_header_get_folder (header);
+                       else
+                               g_object_ref (folder);
                        info = g_slice_new (MsgReaderInfo);
-                       info->header = g_object_ref (header);
-                       info->row_reference = gtk_tree_row_reference_copy (row_reference);
+                       info->msg_uid = g_strdup (msg_uid);
+                       if (header)
+                               info->header = g_object_ref (header);
+                       else
+                               info->header = NULL;
+                       if (row_reference)
+                               info->row_reference = gtk_tree_row_reference_copy (row_reference);
+                       else
+                               info->row_reference = NULL;
 
                        /* Offer the connection dialog if necessary */
                        modest_platform_connect_if_remote_and_perform ((GtkWindow *) window, 
@@ -1840,12 +2015,22 @@ message_reader (ModestMsgViewWindow *window,
                        return TRUE;
                }
        }
-       
-       folder = tny_header_get_folder (header);
+
+       if (header)
+               folder = tny_header_get_folder (header);
+       else
+               g_object_ref (folder);
        account = tny_folder_get_account (folder);
        info = g_slice_new (MsgReaderInfo);
-       info->header = g_object_ref (header);
-       info->row_reference = gtk_tree_row_reference_copy (row_reference);
+       info->msg_uid = g_strdup (msg_uid);
+       if (header)
+               info->header = g_object_ref (header);
+       else
+               info->header = NULL;
+       if (row_reference)
+               info->row_reference = gtk_tree_row_reference_copy (row_reference);
+       else
+               row_reference = NULL;
        
        message_reader_performer (FALSE, NULL, (GtkWindow *) window, account, info);
        g_object_unref (account);
@@ -1899,7 +2084,7 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
                            &header, -1);
        
        /* Read the message & show it */
-       if (!message_reader (window, priv, header, row_reference)) {
+       if (!message_reader (window, priv, header, NULL, NULL, row_reference)) {
                retval = FALSE;
        }
        gtk_tree_row_reference_free (row_reference);
@@ -1940,7 +2125,7 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window)
                                GtkTreeRowReference *row_reference;
                                row_reference = gtk_tree_row_reference_new (priv->header_model, path);
                                /* Read the message & show it */
-                               retval = message_reader (window, priv, header, row_reference);
+                               retval = message_reader (window, priv, header, NULL, NULL, row_reference);
                                gtk_tree_row_reference_free (row_reference);
                        } else {
                                finished = FALSE;
@@ -1970,13 +2155,15 @@ view_msg_cb (ModestMailOperation *mail_op,
 
        row_reference = (GtkTreeRowReference *) user_data;
        if (canceled) {
-               gtk_tree_row_reference_free (row_reference);
+               if (row_reference)
+                       gtk_tree_row_reference_free (row_reference);
                return;
        }
        
        /* If there was any error */
        if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) {
-               gtk_tree_row_reference_free (row_reference);                    
+               if (row_reference)
+                       gtk_tree_row_reference_free (row_reference);                    
                return;
        }
 
@@ -2020,7 +2207,8 @@ view_msg_cb (ModestMailOperation *mail_op,
 
        /* Frees */
        g_object_unref (self);
-       gtk_tree_row_reference_free (row_reference);            
+       if (row_reference)
+               gtk_tree_row_reference_free (row_reference);
 }
 
 TnyFolderType
@@ -2348,7 +2536,7 @@ on_mail_operation_started (ModestMailOperation *mail_op,
        tmp = priv->progress_widgets;
        source = modest_mail_operation_get_source(mail_op);
        if (G_OBJECT (self) == source) {
-               if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE || op_type == MODEST_MAIL_OPERATION_TYPE_OPEN ) {
+               if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE ) {
                        set_toolbar_transfer_mode(self);
                        while (tmp) {
                                modest_progress_object_add_operation (
@@ -2375,7 +2563,7 @@ on_mail_operation_finished (ModestMailOperation *mail_op,
        op_type = modest_mail_operation_get_type_operation (mail_op);
        tmp = priv->progress_widgets;
        
-       if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE || op_type == MODEST_MAIL_OPERATION_TYPE_OPEN ) {
+       if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE ) {
                while (tmp) {
                        modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data),
                                                                 mail_op);
@@ -2446,14 +2634,69 @@ modest_msg_view_window_get_attachments (ModestMsgViewWindow *win)
        return selected_attachments;
 }
 
+typedef struct {
+       gchar *filepath;
+       GtkWidget *banner;
+       guint banner_idle_id;
+} DecodeAsyncHelper;
+
+static gboolean
+decode_async_banner_idle (gpointer user_data)
+{
+       DecodeAsyncHelper *helper = (DecodeAsyncHelper *) user_data;
+
+       helper->banner_idle_id = 0;
+       helper->banner = hildon_banner_show_animation (NULL, NULL, _("mail_me_opening"));
+       g_object_ref (helper->banner);
+
+       return FALSE;
+}
+
+static void
+on_decode_to_stream_async_handler (TnyMimePart *mime_part, 
+                                  gboolean cancelled, 
+                                  TnyStream *stream, 
+                                  GError *err, 
+                                  gpointer user_data)
+{
+       DecodeAsyncHelper *helper = (DecodeAsyncHelper *) user_data;
+
+       if (helper->banner_idle_id > 0) {
+               g_source_remove (helper->banner_idle_id);
+               helper->banner_idle_id = 0;
+       }
+       if (helper->banner) {
+               gtk_widget_destroy (helper->banner);
+       }
+       if (cancelled || err) {
+               modest_platform_information_banner (NULL, NULL, 
+                                                   _("mail_ib_file_operation_failed"));
+               goto free;
+       }
+
+       /* make the file read-only */
+       g_chmod(helper->filepath, 0444);
+       
+       /* Activate the file */
+       modest_platform_activate_file (helper->filepath, modest_tny_mime_part_get_content_type (mime_part));
+
+ free:
+       /* Frees */
+       g_free (helper->filepath);
+       g_object_unref (helper->banner);
+       g_slice_free (DecodeAsyncHelper, helper);
+}
+
 void
-modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart *mime_part)
+modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, 
+                                       TnyMimePart *mime_part)
 {
        ModestMsgViewWindowPrivate *priv;
        const gchar *msg_uid;
        gchar *attachment_uid = NULL;
        gint attachment_index = 0;
        TnyList *attachments;
+       TnyMimePart *window_msg;
 
        g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
        g_return_if_fail (TNY_IS_MIME_PART (mime_part) || (mime_part == NULL));
@@ -2482,7 +2725,8 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart
                        mime_part = (TnyMimePart *) tny_iterator_get_current (iter);
                        g_object_unref (iter);
                }
-               g_object_unref (selected_attachments);
+               if (selected_attachments)
+                 g_object_unref (selected_attachments);
 
                if (error)
                        return;
@@ -2495,51 +2739,82 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart
                return;
        }
 
-       if (!modest_tny_mime_part_is_msg (mime_part)) {
+       /* we also check for mime_part == priv->msg, as this means it's a direct attachment
+        * shown as attachment, so it should behave as a file */
+       window_msg = TNY_MIME_PART (tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view)));
+       if ((!modest_tny_mime_part_is_msg (mime_part) && tny_mime_part_get_filename (mime_part)) ||
+           mime_part == window_msg) {
                gchar *filepath = NULL;
                const gchar *att_filename = tny_mime_part_get_filename (mime_part);
-               const gchar *content_type;
                gboolean show_error_banner = FALSE;
-               GError *err;
                TnyFsStream *temp_stream = NULL;
                temp_stream = modest_utils_create_temp_stream (att_filename, attachment_uid,
                                                               &filepath);
                
                if (temp_stream != NULL) {
-                       content_type = tny_mime_part_get_content_type (mime_part);
-                       if (tny_mime_part_decode_to_stream (mime_part, TNY_STREAM (temp_stream), &err) >= 0) {
-                               /* make the file read-only */
-                               if (g_chmod(filepath, 0444) != 0)
-                                       g_warning ("%s: failed to set file '%s' to read-only: %s",
-                                                       __FUNCTION__, filepath, strerror(errno));
-
-                               modest_platform_activate_file (filepath, content_type);
-                       } else {
-                               /* error while saving attachment, maybe cerm_device_memory_full */
-                               show_error_banner = TRUE;
-                               if (err != NULL) {
-                                       g_warning ("%s: tny_mime_part_decode_to_stream failed (%s)", __FUNCTION__, err->message);
-                                       g_error_free (err);
-                               }
-                       }
+                       DecodeAsyncHelper *helper = g_slice_new (DecodeAsyncHelper);
+                       helper->filepath = g_strdup (filepath);
+                       helper->banner = NULL;
+                       helper->banner_idle_id = g_timeout_add (1000, decode_async_banner_idle, helper);
+                       tny_mime_part_decode_to_stream_async (mime_part, TNY_STREAM (temp_stream), 
+                                                             on_decode_to_stream_async_handler, 
+                                                             NULL, 
+                                                             helper);
                        g_object_unref (temp_stream);
-                       g_free (filepath);
                        /* NOTE: files in the temporary area will be automatically
                         * cleaned after some time if they are no longer in use */
                } else {
-                       if (filepath != NULL) {
+                       if (filepath) {
+                               const gchar *content_type;
                                /* the file may already exist but it isn't writable,
                                 * let's try to open it anyway */
-                               content_type = tny_mime_part_get_content_type (mime_part);
+                               content_type = modest_tny_mime_part_get_content_type (mime_part);
                                modest_platform_activate_file (filepath, content_type);
-                               g_free (filepath);
                        } else {
                                g_warning ("%s: modest_utils_create_temp_stream failed", __FUNCTION__);
                                show_error_banner = TRUE;
                        }
                }
+               if (filepath)
+                       g_free (filepath);
                if (show_error_banner)
                        modest_platform_information_banner (NULL, NULL, _("mail_ib_file_operation_failed"));
+       } else if (!modest_tny_mime_part_is_msg (mime_part)) {
+               ModestWindowMgr *mgr;
+               ModestWindow *msg_win = NULL;
+               TnyMsg *current_msg;
+               gboolean found;
+               TnyHeader *header;
+
+               current_msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (window));
+               mgr = modest_runtime_get_window_mgr ();
+               header = tny_msg_get_header (TNY_MSG (current_msg));
+               found = modest_window_mgr_find_registered_message_uid (mgr,
+                                                                      attachment_uid,
+                                                                      &msg_win);
+               
+               if (found) {
+                       g_debug ("window for this body is already being created");
+               } else {
+
+                       /* it's not found, so create a new window for it */
+                       modest_window_mgr_register_header (mgr, header, attachment_uid); /* register the uid before building the window */
+                       gchar *account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (window)));
+                       const gchar *mailbox = modest_window_get_active_mailbox (MODEST_WINDOW (window));
+                       if (!account)
+                               account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
+                       
+                       msg_win = modest_msg_view_window_new_with_other_body (TNY_MSG (current_msg), TNY_MIME_PART (mime_part),
+                                                                             account, mailbox, attachment_uid);
+                       
+                       modest_window_set_zoom (MODEST_WINDOW (msg_win),
+                                               modest_window_get_zoom (MODEST_WINDOW (window)));
+                       if (modest_window_mgr_register_window (mgr, msg_win, MODEST_WINDOW (window)))
+                               gtk_widget_show_all (GTK_WIDGET (msg_win));
+                       else
+                               gtk_widget_destroy (GTK_WIDGET (msg_win));
+               }
+               g_object_unref (current_msg);           
        } else {
                /* message attachment */
                TnyHeader *header = NULL;
@@ -2557,20 +2832,22 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart
                        else 
                                /* if it's found, but there is no msg_win, it's probably in the process of being created;
                                 * thus, we don't do anything */
-                               g_warning ("window for is already being created");
+                               g_debug ("window for is already being created");
                } else { 
                        /* it's not found, so create a new window for it */
                        modest_window_mgr_register_header (mgr, header, attachment_uid); /* register the uid before building the window */
                        gchar *account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (window)));
                        if (!account)
                                account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
-                       msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (mime_part), account, attachment_uid);
+                       msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (mime_part), account, 
+                                                                            NULL, attachment_uid);
                        modest_window_set_zoom (MODEST_WINDOW (msg_win), 
                                                modest_window_get_zoom (MODEST_WINDOW (window)));
-                       modest_window_mgr_register_window (mgr, msg_win);
+                       modest_window_mgr_register_window (mgr, msg_win, MODEST_WINDOW (window));
                        gtk_widget_show_all (GTK_WIDGET (msg_win));
                }
        }
+       g_object_unref (window_msg);
        g_object_unref (mime_part);
 }
 
@@ -2590,7 +2867,7 @@ typedef struct
 static void save_mime_part_info_free (SaveMimePartInfo *info, gboolean with_struct);
 static gboolean idle_save_mime_part_show_result (SaveMimePartInfo *info);
 static gpointer save_mime_part_to_file (SaveMimePartInfo *info);
-static void save_mime_parts_to_file_with_checks (SaveMimePartInfo *info);
+static void save_mime_parts_to_file_with_checks (GtkWindow *parent, SaveMimePartInfo *info);
 
 static void 
 save_mime_part_info_free (SaveMimePartInfo *info, gboolean with_struct)
@@ -2625,10 +2902,11 @@ idle_save_mime_part_show_result (SaveMimePartInfo *info)
                if (info->result == GNOME_VFS_OK) {
                        hildon_banner_show_information (NULL, NULL, _CS("sfil_ib_saved"));
                } else if (info->result == GNOME_VFS_ERROR_NO_SPACE) {
-                       hildon_banner_show_information (NULL, NULL, dgettext("ke-recv", 
-                                                                            "cerm_device_memory_full"));
+                       hildon_banner_show_information (NULL, NULL, 
+                                                       _KR("cerm_device_memory_full"));
                } else {
-                       hildon_banner_show_information (NULL, NULL, _("mail_ib_file_operation_failed"));
+                       hildon_banner_show_information (NULL, NULL, 
+                                                       _("mail_ib_file_operation_failed"));
                }
                gdk_threads_leave (); /* CHECKED */
        }
@@ -2645,8 +2923,11 @@ save_mime_part_to_file (SaveMimePartInfo *info)
 
        info->result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0644);
        if (info->result == GNOME_VFS_OK) {
+               GError *error = NULL;
                stream = tny_vfs_stream_new (handle);
-               if (tny_mime_part_decode_to_stream (pair->part, stream, NULL) < 0) {
+               if (tny_mime_part_decode_to_stream (pair->part, stream, &error) < 0) {
+                       g_warning ("modest: could not save attachment %s: %d (%s)\n", pair->filename, error?error->code:-1, error?error->message:"Unknown error");
+                       
                        info->result = GNOME_VFS_ERROR_IO;
                }
                g_object_unref (G_OBJECT (stream));
@@ -2654,6 +2935,7 @@ save_mime_part_to_file (SaveMimePartInfo *info)
                g_slice_free (SaveMimePartPair, pair);
                info->pairs = g_list_delete_link (info->pairs, info->pairs);
        } else {
+               g_warning ("modest: could not create save attachment %s: %s\n", pair->filename, gnome_vfs_result_to_string (info->result));
                save_mime_part_info_free (info, FALSE);
        }
 
@@ -2662,7 +2944,7 @@ save_mime_part_to_file (SaveMimePartInfo *info)
 }
 
 static void
-save_mime_parts_to_file_with_checks (SaveMimePartInfo *info)
+save_mime_parts_to_file_with_checks (GtkWindow *parent, SaveMimePartInfo *info)
 {
        gboolean is_ok = TRUE;
         gint replaced_files = 0;
@@ -2676,14 +2958,12 @@ save_mime_parts_to_file_with_checks (SaveMimePartInfo *info)
                 }
         }
        if (replaced_files) {
-               GtkWidget *confirm_overwrite_dialog;
+               gint response;
                 const gchar *message = (replaced_files == 1) ?
                         _FM("docm_nc_replace_file") : _FM("docm_nc_replace_multiple");
-                confirm_overwrite_dialog = hildon_note_new_confirmation (NULL, message);
-               if (gtk_dialog_run (GTK_DIALOG (confirm_overwrite_dialog)) != GTK_RESPONSE_OK) {
+                response = modest_platform_run_confirmation_dialog (parent, message);
+               if (response != GTK_RESPONSE_OK)
                        is_ok = FALSE;
-               }
-               gtk_widget_destroy (confirm_overwrite_dialog);
        }
 
        if (!is_ok) {
@@ -2697,16 +2977,78 @@ save_mime_parts_to_file_with_checks (SaveMimePartInfo *info)
 
 }
 
+static void
+save_attachments_response (GtkDialog *dialog,
+                          gint       arg1,
+                          gpointer   user_data)  
+{
+       TnyList *mime_parts;
+       gchar *chooser_uri;
+       GList *files_to_save = NULL;
+
+       mime_parts = TNY_LIST (user_data);
+
+       if (arg1 != GTK_RESPONSE_OK)
+               goto end;
+
+       chooser_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+
+       if (!modest_utils_folder_writable (chooser_uri)) {
+               hildon_banner_show_information 
+                       (NULL, NULL, _FM("sfil_ib_readonly_location"));
+       } else {
+               TnyIterator *iter;
+
+               iter = tny_list_create_iterator (mime_parts);
+               while (!tny_iterator_is_done (iter)) {
+                       TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter);
+
+                       if ((modest_tny_mime_part_is_attachment_for_modest (mime_part)) &&
+                           !tny_mime_part_is_purged (mime_part) &&
+                           (tny_mime_part_get_filename (mime_part) != NULL)) {
+                               SaveMimePartPair *pair;
+
+                               pair = g_slice_new0 (SaveMimePartPair);
+
+                               if (tny_list_get_length (mime_parts) > 1) {
+                                       gchar *escaped = 
+                                               gnome_vfs_escape_slashes (tny_mime_part_get_filename (mime_part));
+                                       pair->filename = g_build_filename (chooser_uri, escaped, NULL);
+                                       g_free (escaped);
+                               } else {
+                                       pair->filename = g_strdup (chooser_uri);
+                               }
+                               pair->part = mime_part;
+                               files_to_save = g_list_prepend (files_to_save, pair);
+                       }
+                       tny_iterator_next (iter);
+               }
+               g_object_unref (iter);
+       }
+       g_free (chooser_uri);
+
+       if (files_to_save != NULL) {
+               SaveMimePartInfo *info = g_slice_new0 (SaveMimePartInfo);
+               info->pairs = files_to_save;
+               info->result = TRUE;
+               save_mime_parts_to_file_with_checks ((GtkWindow*) dialog, info);
+       }
+
+ end:
+       /* Free and close the dialog */
+       g_object_unref (mime_parts);
+       gtk_widget_destroy (GTK_WIDGET (dialog));
+}
 
 void
 modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *mime_parts)
 {
        ModestMsgViewWindowPrivate *priv;
-       GList *files_to_save = NULL;
        GtkWidget *save_dialog = NULL;
        gchar *folder = NULL;
-       const gchar *filename = NULL;
+       gchar *filename = NULL;
        gchar *save_multiple_str = NULL;
+       TnyMsg *window_msg;
 
        g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
@@ -2719,6 +3061,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
                g_object_ref (mime_parts);
        }
 
+       window_msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view));
        /* prepare dialog */
        if (tny_list_get_length (mime_parts) == 1) {
                TnyIterator *iter;
@@ -2729,7 +3072,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
                if (!modest_tny_mime_part_is_msg (mime_part) && 
                    modest_tny_mime_part_is_attachment_for_modest (mime_part) &&
                    !tny_mime_part_is_purged (mime_part)) {
-                       filename = tny_mime_part_get_filename (mime_part);
+                       filename = g_strdup (tny_mime_part_get_filename (mime_part));
                } else {
                        /* TODO: show any error? */
                        g_warning ("Tried to save a non-file attachment");
@@ -2741,6 +3084,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
                save_multiple_str = g_strdup_printf (_FM("sfil_va_number_of_objects_attachments"), 
                                                     tny_list_get_length (mime_parts));
        }
+       g_object_unref (window_msg);
        
        save_dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), 
                                                      GTK_FILE_CHOOSER_ACTION_SAVE);
@@ -2751,64 +3095,25 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
        g_free (folder);
 
        /* set filename */
-       if (filename != NULL)
+       if (filename) {
                gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (save_dialog), 
                                                   filename);
+               g_free (filename);
+       }
 
        /* if multiple, set multiple string */
        if (save_multiple_str) {
                g_object_set (G_OBJECT (save_dialog), "save-multiple", save_multiple_str, NULL);
                gtk_window_set_title (GTK_WINDOW (save_dialog), _FM("sfil_ti_save_objects_files"));
        }
-               
-       /* show dialog */
-       if (gtk_dialog_run (GTK_DIALOG (save_dialog)) == GTK_RESPONSE_OK) {
-               gchar *chooser_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (save_dialog));
 
-               if (!modest_utils_folder_writable (chooser_uri)) {
-                       hildon_banner_show_information 
-                               (NULL, NULL, dgettext("hildon-fm", "sfil_ib_readonly_location"));
-               } else {
-                       TnyIterator *iter;
+       /* We must run this asynchronously, because the hildon dialog
+          performs a gtk_dialog_run by itself which leads to gdk
+          deadlocks */
+       g_signal_connect (save_dialog, "response", 
+                         G_CALLBACK (save_attachments_response), mime_parts);
 
-                       iter = tny_list_create_iterator (mime_parts);
-                       while (!tny_iterator_is_done (iter)) {
-                               TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter);
-
-                               if ((modest_tny_mime_part_is_attachment_for_modest (mime_part)) &&
-                                   !tny_mime_part_is_purged (mime_part) &&
-                                   (tny_mime_part_get_filename (mime_part) != NULL)) {
-                                       SaveMimePartPair *pair;
-                                       
-                                       pair = g_slice_new0 (SaveMimePartPair);
-                                       if (save_multiple_str) {
-                                               gchar *escaped = gnome_vfs_escape_slashes (
-                                                       tny_mime_part_get_filename (mime_part));
-                                               pair->filename = g_build_filename (chooser_uri, escaped, NULL);
-                                               g_free (escaped);
-                                       } else {
-                                               pair->filename = g_strdup (chooser_uri);
-                                       }
-                                       pair->part = mime_part;
-                                       files_to_save = g_list_prepend (files_to_save, pair);
-                               }
-                               tny_iterator_next (iter);
-                       }
-                       g_object_unref (iter);
-               }
-               g_free (chooser_uri);
-       }
-
-       gtk_widget_destroy (save_dialog);
-
-       g_object_unref (mime_parts);
-
-       if (files_to_save != NULL) {
-               SaveMimePartInfo *info = g_slice_new0 (SaveMimePartInfo);
-               info->pairs = files_to_save;
-               info->result = TRUE;
-               save_mime_parts_to_file_with_checks (info);
-       }
+       gtk_widget_show_all (save_dialog);
 }
 
 static gboolean
@@ -2843,7 +3148,6 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean
        gint n_attachments;
        TnyMsg *msg;
        TnyIterator *iter;
-/*     TnyFolder *folder; */
 
        g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
@@ -2906,10 +3210,6 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean
        }
 
        priv->purge_timeout = g_timeout_add (2000, show_remove_attachment_information, window);
-/*     folder = tny_msg_get_folder (msg); */
-/*     tny_msg_uncache_attachments (msg); */
-/*     tny_folder_refresh (folder, NULL); */
-/*     g_object_unref (folder); */
        
        iter = tny_list_create_iterator (mime_parts);
        while (!tny_iterator_is_done (iter)) {
@@ -2917,7 +3217,6 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean
 
                part = (TnyMimePart *) tny_iterator_get_current (iter);
                tny_mime_part_set_purged (TNY_MIME_PART (part));
-/*             modest_msg_view_remove_attachment (MODEST_MSG_VIEW (priv->msg_view), node->data); */
                g_object_unref (part);
                tny_iterator_next (iter);
        }
@@ -2956,7 +3255,15 @@ update_window_title (ModestMsgViewWindow *window)
        
        msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view));
 
-       if (msg != NULL) {
+       if (priv->other_body) {
+               gchar *description;
+
+               description = modest_tny_mime_part_get_header_value (priv->other_body, "Content-Description");
+               if (description) {
+                       g_strstrip (description);
+                       subject = description;
+               }
+       } else if (msg != NULL) {
                header = tny_msg_get_header (msg);
                subject = tny_header_dup_subject (header);
                g_object_unref (header);
@@ -2979,3 +3286,161 @@ static void on_move_focus (GtkWidget *widget,
        g_signal_stop_emission_by_name (G_OBJECT (widget), "move-focus");
 }
 
+static TnyStream *
+fetch_image_open_stream (TnyStreamCache *self, gint64 *expected_size, gchar *uri)
+{
+       GnomeVFSResult result;
+       GnomeVFSHandle *handle = NULL;
+       GnomeVFSFileInfo *info = NULL;
+       TnyStream *stream;
+
+       result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+       if (result != GNOME_VFS_OK) {
+               *expected_size = 0;
+               return NULL;
+       }
+       
+       info = gnome_vfs_file_info_new ();
+       result = gnome_vfs_get_file_info_from_handle (handle, info, GNOME_VFS_FILE_INFO_DEFAULT);
+       if (result != GNOME_VFS_OK || ! (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE)) {
+               /* We put a "safe" default size for going to cache */
+               *expected_size = (300*1024);
+       } else {
+               *expected_size = info->size;
+       }
+       gnome_vfs_file_info_unref (info);
+
+       stream = tny_vfs_stream_new (handle);
+
+       return stream;
+
+}
+
+typedef struct {
+       gchar *uri;
+       gchar *cache_id;
+       TnyStream *output_stream;
+       GtkWidget *msg_view;
+} FetchImageData;
+
+gboolean
+on_fetch_image_idle_refresh_view (gpointer userdata)
+{
+
+       FetchImageData *fidata = (FetchImageData *) userdata;
+       g_debug ("REFRESH VIEW");
+       if (GTK_WIDGET_DRAWABLE (fidata->msg_view)) {
+               g_debug ("QUEUING DRAW");
+               gtk_widget_queue_draw (fidata->msg_view);
+       }
+       g_object_unref (fidata->msg_view);
+       g_slice_free (FetchImageData, fidata);
+       return FALSE;
+}
+
+static gpointer
+on_fetch_image_thread (gpointer userdata)
+{
+       FetchImageData *fidata = (FetchImageData *) userdata;
+       TnyStreamCache *cache;
+       TnyStream *cache_stream;
+
+       cache = modest_runtime_get_images_cache ();
+       cache_stream = tny_stream_cache_get_stream (cache, fidata->cache_id, (TnyStreamCacheOpenStreamFetcher) fetch_image_open_stream, (gpointer) fidata->uri);
+       g_free (fidata->cache_id);
+       g_free (fidata->uri);
+
+       if (cache_stream != NULL) {
+               tny_stream_write_to_stream (cache_stream, fidata->output_stream);
+               tny_stream_close (cache_stream);
+               g_object_unref (cache_stream);
+       }
+
+       tny_stream_close (fidata->output_stream);
+       g_object_unref (fidata->output_stream);
+
+
+       gdk_threads_enter ();
+       g_idle_add (on_fetch_image_idle_refresh_view, fidata);
+       gdk_threads_leave ();
+
+       return NULL;
+}
+
+static gboolean
+on_fetch_image (ModestMsgView *msgview,
+               const gchar *uri,
+               TnyStream *stream,
+               ModestMsgViewWindow *window)
+{
+       const gchar *current_account;
+       ModestMsgViewWindowPrivate *priv;
+       FetchImageData *fidata;
+
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+
+       current_account = modest_window_get_active_account (MODEST_WINDOW (window));
+
+       fidata = g_slice_new0 (FetchImageData);
+       fidata->msg_view = g_object_ref (msgview);
+       fidata->uri = g_strdup (uri);
+       fidata->cache_id = modest_images_cache_get_id (current_account, uri);
+       fidata->output_stream = g_object_ref (stream);
+
+       if (g_thread_create (on_fetch_image_thread, fidata, FALSE, NULL) == NULL) {
+               g_object_unref (fidata->output_stream);
+               g_free (fidata->cache_id);
+               g_free (fidata->uri);
+               g_object_unref (fidata->msg_view);
+               g_slice_free (FetchImageData, fidata);
+               tny_stream_close (stream);
+               return FALSE;
+       }
+
+       return TRUE;;
+}
+
+void
+modest_msg_view_window_add_to_contacts (ModestMsgViewWindow *self)
+{
+       modest_ui_actions_on_add_to_contacts (NULL, MODEST_WINDOW (self));
+}
+
+
+void
+modest_msg_view_window_fetch_images (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv;
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+       modest_msg_view_request_fetch_images (MODEST_MSG_VIEW (priv->msg_view));
+}
+
+gboolean 
+modest_msg_view_window_has_blocked_external_images (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv;
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE);
+
+       return modest_msg_view_has_blocked_external_images (MODEST_MSG_VIEW (priv->msg_view));
+}
+
+void 
+modest_msg_view_window_reload (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv;
+       TnyHeader *header;
+
+       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self));
+
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+       header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (self));     
+
+       if (!message_reader (self, priv, header, NULL, NULL, priv->row_reference)) {
+               g_warning ("Shouldn't happen, trying to reload a message failed");
+       }
+
+       g_object_unref (header);
+}