This is a manual merge of branch drop split view intro trunk.
[modest] / src / maemo / modest-msg-view-window.c
index 41dbf0d..d31351f 100644 (file)
@@ -95,34 +95,30 @@ static void modest_msg_view_window_show_toolbar   (ModestWindow *window,
 static void modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard,
                                                           GdkEvent *event,
                                                           ModestMsgViewWindow *window);
-void modest_msg_view_window_on_row_changed(
-               GtkTreeModel *header_model,
-               GtkTreePath *arg1,
-               GtkTreeIter *arg2,
-               ModestMsgViewWindow *window);
-
-void modest_msg_view_window_on_row_deleted(
-               GtkTreeModel *header_model,
-               GtkTreePath *arg1,
-               ModestMsgViewWindow *window);
-
-void modest_msg_view_window_on_row_inserted(
-               GtkTreeModel *header_model,
-               GtkTreePath *tree_path,
-               GtkTreeIter *tree_iter,
-               ModestMsgViewWindow *window);
-
-void modest_msg_view_window_on_row_reordered(
-               GtkTreeModel *header_model,
-               GtkTreePath *arg1,
-               GtkTreeIter *arg2,
-               gpointer arg3,
-               ModestMsgViewWindow *window);
-
-void modest_msg_view_window_update_model_replaced(
-               ModestHeaderViewObserver *window,
-               GtkTreeModel *model,
-               const gchar *tny_folder_id);
+
+static void modest_msg_view_window_on_row_changed (GtkTreeModel *header_model,
+                                                  GtkTreePath *arg1,
+                                                  GtkTreeIter *arg2,
+                                                  ModestMsgViewWindow *window);
+
+static void modest_msg_view_window_on_row_deleted (GtkTreeModel *header_model,
+                                                  GtkTreePath *arg1,
+                                                  ModestMsgViewWindow *window);
+
+static void modest_msg_view_window_on_row_inserted (GtkTreeModel *header_model,
+                                                   GtkTreePath *tree_path,
+                                                   GtkTreeIter *tree_iter,
+                                                   ModestMsgViewWindow *window);
+
+static void modest_msg_view_window_on_row_reordered (GtkTreeModel *header_model,
+                                                    GtkTreePath *arg1,
+                                                    GtkTreeIter *arg2,
+                                                    gpointer arg3,
+                                                    ModestMsgViewWindow *window);
+
+static void modest_msg_view_window_update_model_replaced (ModestHeaderViewObserver *window,
+                                                         GtkTreeModel *model,
+                                                         const gchar *tny_folder_id);
 
 static void cancel_progressbar  (GtkToolButton *toolbutton,
                                 ModestMsgViewWindow *self);
@@ -157,10 +153,22 @@ static void init_window (ModestMsgViewWindow *obj);
 
 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
 };
 
@@ -307,11 +315,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;
 
@@ -325,10 +365,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),
@@ -337,6 +377,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(
@@ -687,12 +747,13 @@ modest_msg_view_window_finalize (GObject *obj)
 static gboolean
 select_next_valid_row (GtkTreeModel *model,
                       GtkTreeRowReference **row_reference,
-                      gboolean cycle)
+                      gboolean cycle,
+                      gboolean is_outbox)
 {
        GtkTreeIter tmp_iter;
        GtkTreePath *path;
        GtkTreePath *next = NULL;
-       gboolean retval = FALSE;
+       gboolean retval = FALSE, finished;
 
        g_return_val_if_fail (gtk_tree_row_reference_valid (*row_reference), FALSE);
 
@@ -701,24 +762,60 @@ select_next_valid_row (GtkTreeModel *model,
        gtk_tree_row_reference_free (*row_reference);
        *row_reference = NULL;
 
-       if (gtk_tree_model_iter_next (model, &tmp_iter)) {
-               next = gtk_tree_model_get_path (model, &tmp_iter);
-               *row_reference = gtk_tree_row_reference_new (model, next);
-               retval = TRUE;
-       } else if (cycle && gtk_tree_model_get_iter_first (model, &tmp_iter)) {
-               next = gtk_tree_model_get_path (model, &tmp_iter);
-
-               /* Ensure that we are not selecting the same */
-               if (gtk_tree_path_compare (path, next) != 0) {
-                       *row_reference = gtk_tree_row_reference_new (model, next);
-                       retval = TRUE;
+       finished = FALSE;
+       do {
+               TnyHeader *header = NULL;
+
+               if (gtk_tree_model_iter_next (model, &tmp_iter)) {
+                       gtk_tree_model_get (model, &tmp_iter, 
+                                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+                                           &header, -1);
+
+                       if (header) {
+                               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;
+                               }
+                               g_object_unref (header);
+                               header = NULL;
+                       }
+               } else if (cycle && gtk_tree_model_get_iter_first (model, &tmp_iter)) {
+                       next = gtk_tree_model_get_path (model, &tmp_iter);
+                       
+                       /* Ensure that we are not selecting the same */
+                       if (gtk_tree_path_compare (path, next) != 0) {
+                               gtk_tree_model_get (model, &tmp_iter, 
+                                                   TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+                                                   &header, -1);                               
+                               if (header) {
+                                       if (msg_is_visible (header, is_outbox)) {
+                                               *row_reference = gtk_tree_row_reference_new (model, next);
+                                               retval = TRUE;
+                                               finished = TRUE;
+                                       }
+                                       g_object_unref (header);
+                                       header = NULL;
+                               }
+                       } else {
+                               /* If we ended up in the same message
+                                  then there is no valid next
+                                  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
+                          there is no valid next message */
+                       finished = TRUE;
                }
-       }
+       } while (!finished);
 
        /* Free */
        gtk_tree_path_free (path);
-       if (next)
-               gtk_tree_path_free (next);
 
        return retval;
 }
@@ -726,8 +823,8 @@ select_next_valid_row (GtkTreeModel *model,
 /* TODO: This should be in _init(), with the parameters as properties. */
 static void
 modest_msg_view_window_construct (ModestMsgViewWindow *self, 
-                           const gchar *modest_account_name,
-                           const gchar *msg_uid)
+                                 const gchar *modest_account_name,
+                                 const gchar *msg_uid)
 {
        GObject *obj = NULL;
        ModestMsgViewWindowPrivate *priv = NULL;
@@ -789,6 +886,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),
@@ -826,7 +925,6 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self,
        /* Init the clipboard actions dim status */
        modest_msg_view_grab_focus(MODEST_MSG_VIEW (priv->msg_view));
 
-       gtk_widget_show_all (GTK_WIDGET (obj));
        update_window_title (MODEST_MSG_VIEW_WINDOW (obj));
 
 
@@ -871,39 +969,47 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg,
        
        if (header_view != NULL){
                header_folder = modest_header_view_get_folder(header_view);
-               priv->is_outbox = (modest_tny_folder_guess_folder_type (header_folder) == TNY_FOLDER_TYPE_OUTBOX);
-               g_assert(header_folder != NULL);
-               priv->header_folder_id = tny_folder_get_id(header_folder);
-               g_assert(priv->header_folder_id != NULL);
-               g_object_unref(header_folder);
+               /* This could happen if the header folder was
+                  unseleted before opening this msg window (for
+                  example if the user selects an account in the
+                  folder view of the main window */
+               if (header_folder) {
+                       priv->is_outbox = (modest_tny_folder_guess_folder_type (header_folder) == TNY_FOLDER_TYPE_OUTBOX);
+                       priv->header_folder_id = tny_folder_get_id(header_folder);
+                       g_assert(priv->header_folder_id != NULL);
+                       g_object_unref(header_folder);
+               }
        }
 
-       priv->header_model = g_object_ref(model);
+       /* Setup row references and connect signals */
+       priv->header_model = g_object_ref (model);
+
        if (row_reference) {
                priv->row_reference = gtk_tree_row_reference_copy (row_reference);
                priv->next_row_reference = gtk_tree_row_reference_copy (row_reference);
-               select_next_valid_row (model, &(priv->next_row_reference), TRUE);
+               select_next_valid_row (model, &(priv->next_row_reference), TRUE, priv->is_outbox);
        } else {
                priv->row_reference = NULL;
                priv->next_row_reference = NULL;
        }
 
-       priv->row_changed_handler = g_signal_connect(
-                       GTK_TREE_MODEL(model), "row-changed",
-                       G_CALLBACK(modest_msg_view_window_on_row_changed),
-                       window);
-       priv->row_deleted_handler = g_signal_connect(
-                       GTK_TREE_MODEL(model), "row-deleted",
-                       G_CALLBACK(modest_msg_view_window_on_row_deleted),
-                       window);
-       priv->row_inserted_handler = g_signal_connect (
-                       GTK_TREE_MODEL(model), "row-inserted",
-                       G_CALLBACK(modest_msg_view_window_on_row_inserted),
-                       window);
-       priv->rows_reordered_handler = g_signal_connect(
-                       GTK_TREE_MODEL(model), "rows-reordered",
-                       G_CALLBACK(modest_msg_view_window_on_row_reordered),
-                       window);
+       /* Connect signals */
+       priv->row_changed_handler = 
+               g_signal_connect (GTK_TREE_MODEL(model), "row-changed",
+                                 G_CALLBACK(modest_msg_view_window_on_row_changed),
+                                 window);
+       priv->row_deleted_handler = 
+               g_signal_connect (GTK_TREE_MODEL(model), "row-deleted",
+                                 G_CALLBACK(modest_msg_view_window_on_row_deleted),
+                                 window);
+       priv->row_inserted_handler = 
+               g_signal_connect (GTK_TREE_MODEL(model), "row-inserted",
+                                 G_CALLBACK(modest_msg_view_window_on_row_inserted),
+                                 window);
+       priv->rows_reordered_handler = 
+               g_signal_connect(GTK_TREE_MODEL(model), "rows-reordered",
+                                G_CALLBACK(modest_msg_view_window_on_row_reordered),
+                                window);
 
        if (header_view != NULL){
                modest_header_view_add_observer(header_view,
@@ -946,8 +1052,13 @@ modest_msg_view_window_new_for_search_result (TnyMsg *msg,
        tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
        
        update_window_title (window);
+       gtk_widget_show_all (GTK_WIDGET (window));
        modest_msg_view_window_update_priority (window);
 
+       /* 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);
 }
@@ -971,6 +1082,8 @@ modest_msg_view_window_new_for_attachment (TnyMsg *msg,
        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));
+
        /* Check dimming rules */
        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj));
        modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (obj));
@@ -979,21 +1092,32 @@ modest_msg_view_window_new_for_attachment (TnyMsg *msg,
        return MODEST_WINDOW(obj);
 }
 
-void modest_msg_view_window_on_row_changed(
-               GtkTreeModel *header_model,
-               GtkTreePath *arg1,
-               GtkTreeIter *arg2,
-               ModestMsgViewWindow *window){
-       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+static void
+modest_msg_view_window_on_row_changed (GtkTreeModel *header_model,
+                                      GtkTreePath *arg1,
+                                      GtkTreeIter *arg2,
+                                      ModestMsgViewWindow *window)
+{
+       check_dimming_rules_after_change (window);
+}
+
+static void 
+modest_msg_view_window_on_row_deleted(GtkTreeModel *header_model,
+                                     GtkTreePath *arg1,
+                                     ModestMsgViewWindow *window)
+{
+       check_dimming_rules_after_change (window);
 }
+       /* The window could have dissapeared */
 
-void modest_msg_view_window_on_row_deleted(
-               GtkTreeModel *header_model,
-               GtkTreePath *arg1,
-               ModestMsgViewWindow *window){
+static void
+check_dimming_rules_after_change (ModestMsgViewWindow *window)
+{
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
 }
 
+
 /* On insertions we check if the folder still has the message we are
  * showing or do not. If do not, we do nothing. Which means we are still
  * not attached to any header folder and thus next/prev buttons are
@@ -1005,90 +1129,122 @@ void modest_msg_view_window_on_row_deleted(
  * inserted into the model again for example if it is removed by the
  * imap server and the header view is refreshed.)
  */
-void modest_msg_view_window_on_row_inserted(
-               GtkTreeModel *new_model,
-               GtkTreePath *tree_path,
-               GtkTreeIter *tree_iter,
-               ModestMsgViewWindow *window){
+static void 
+modest_msg_view_window_on_row_inserted (GtkTreeModel *model,
+                                       GtkTreePath *tree_path,
+                                       GtkTreeIter *tree_iter,
+                                       ModestMsgViewWindow *window)
+{
        ModestMsgViewWindowPrivate *priv = NULL; 
        TnyHeader *header = NULL;
-       gchar *uid = NULL;
 
        g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
-
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
-       
-       /* If we already has a model attached then the message shown by
-        * msg-view is in it, and thus we do not need any actions but
-        * to check the dimming rules.*/
-       if(priv->header_model != NULL){
-               if (priv->row_reference) {
-                       gtk_tree_row_reference_free(priv->next_row_reference);
-                       priv->next_row_reference = gtk_tree_row_reference_copy(
-                               priv->row_reference);
-                       select_next_valid_row (priv->header_model,
-                                              &(priv->next_row_reference), FALSE);
-               }
-               modest_ui_actions_check_toolbar_dimming_rules (
-                               MODEST_WINDOW (window));
-               return;
-       }
 
+       g_assert (model == priv->header_model);
+       
        /* Check if the newly inserted message is the same we are actually
         * showing. IF not, we should remain detached from the header model
-        * and thus prev and next toolbarbuttons should remain dimmed. */
-       gtk_tree_model_get (new_model, tree_iter, 
-                       TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1);
-       uid = modest_tny_folder_get_header_unique_id(header);
-       if(!g_str_equal(priv->msg_uid, uid)){
+        * and thus prev and next toolbar buttons should remain dimmed. */
+       gtk_tree_model_get (model, tree_iter, 
+                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+                           &header, -1);
+
+       if (TNY_IS_HEADER (header)) {
+               gchar *uid = NULL;
+
+               uid = modest_tny_folder_get_header_unique_id (header);
+               if (!g_str_equal(priv->msg_uid, uid)) {
+                       check_dimming_rules_after_change (window);
+                       g_free(uid);
+                       g_object_unref (G_OBJECT(header));
+                       return;
+               }
                g_free(uid);
                g_object_unref(G_OBJECT(header));
-               header = NULL;
-               return;
        }
-       if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN))
-               tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
-       g_object_unref(G_OBJECT(header));
-       header = NULL;
-       g_free(uid);
+
+       if (priv->row_reference) {
+               gtk_tree_row_reference_free (priv->row_reference); 
+       }
 
        /* Setup row_reference for the actual msg. */
-       priv->row_reference = gtk_tree_row_reference_new(
-                       new_model, tree_path);
-       if(priv->row_reference == NULL){
+       priv->row_reference = gtk_tree_row_reference_new (priv->header_model, tree_path);
+       if (priv->row_reference == NULL) {
                g_warning("No reference for msg header item.");
                return;
        }
 
-       /* Attach new_model and connect some callback to it to become able
-        * to detect changes in header-view. */
-       priv->header_model = g_object_ref(new_model);
-       g_signal_connect (new_model, "row-changed",
-                       G_CALLBACK (modest_msg_view_window_on_row_changed),
-                       window);
-       g_signal_connect (new_model, "row-deleted",
-                       G_CALLBACK (modest_msg_view_window_on_row_deleted),
-                       window);
-       g_signal_connect (new_model, "rows-reordered",
-                       G_CALLBACK (modest_msg_view_window_on_row_reordered),
-                       window);
-
        /* Now set up next_row_reference. */
-       priv->next_row_reference = gtk_tree_row_reference_copy(
-                       priv->row_reference);
-       select_next_valid_row (priv->header_model,
-                       &(priv->next_row_reference), FALSE);
+       if (priv->next_row_reference) {
+               gtk_tree_row_reference_free (priv->next_row_reference); 
+       }
 
-       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+       priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
+       select_next_valid_row (priv->header_model,
+                              &(priv->next_row_reference), FALSE, priv->is_outbox);
+
+       /* Connect the remaining callbacks to become able to detect
+        * changes in header-view. */
+       priv->row_changed_handler = 
+               g_signal_connect (priv->header_model, "row-changed",
+                                 G_CALLBACK (modest_msg_view_window_on_row_changed),
+                                 window);
+       priv->row_deleted_handler = 
+               g_signal_connect (priv->header_model, "row-deleted",
+                                 G_CALLBACK (modest_msg_view_window_on_row_deleted),
+                                 window);
+       priv->rows_reordered_handler = 
+               g_signal_connect (priv->header_model, "rows-reordered",
+                                 G_CALLBACK (modest_msg_view_window_on_row_reordered),
+                                 window);
+
+       check_dimming_rules_after_change (window);      
 }
 
-void modest_msg_view_window_on_row_reordered(
-               GtkTreeModel *header_model,
-               GtkTreePath *arg1,
-               GtkTreeIter *arg2,
-               gpointer arg3,
-               ModestMsgViewWindow *window){
-       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+static void 
+modest_msg_view_window_on_row_reordered (GtkTreeModel *header_model,
+                                        GtkTreePath *arg1,
+                                        GtkTreeIter *arg2,
+                                        gpointer arg3,
+                                        ModestMsgViewWindow *window)
+{
+       ModestMsgViewWindowPrivate *priv = NULL; 
+       gboolean already_changed = FALSE;
+
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(window);
+
+       /* If the current row was reordered select the proper next
+          valid row. The same if the next row reference changes */
+       if (priv->row_reference && 
+           gtk_tree_row_reference_valid (priv->row_reference)) {
+               GtkTreePath *path;
+               path = gtk_tree_row_reference_get_path (priv->row_reference);
+               if (gtk_tree_path_compare (path, arg1) == 0) {
+                       if (priv->next_row_reference) {
+                               gtk_tree_row_reference_free (priv->next_row_reference);
+                       }
+                       priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
+                       select_next_valid_row (header_model, &(priv->next_row_reference), FALSE, priv->is_outbox);
+                       already_changed = TRUE;
+               }
+               gtk_tree_path_free (path);
+       }
+       if (!already_changed &&
+           priv->next_row_reference &&
+           gtk_tree_row_reference_valid (priv->next_row_reference)) {
+               GtkTreePath *path;
+               path = gtk_tree_row_reference_get_path (priv->next_row_reference);
+               if (gtk_tree_path_compare (path, arg1) == 0) {
+                       if (priv->next_row_reference) {
+                               gtk_tree_row_reference_free (priv->next_row_reference);
+                       }
+                       priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
+                       select_next_valid_row (header_model, &(priv->next_row_reference), FALSE, priv->is_outbox);
+               }
+               gtk_tree_path_free (path);
+       }
+       check_dimming_rules_after_change (window);
 }
 
 /* The modest_msg_view_window_update_model_replaced implements update
@@ -1100,10 +1256,11 @@ void modest_msg_view_window_on_row_reordered(
  * the new model. In this case the view will be detached from it's
  * header folder. From this point the next/prev buttons are dimmed.
  */
-void modest_msg_view_window_update_model_replaced(
-               ModestHeaderViewObserver *observer,
-               GtkTreeModel *model,
-               const gchar *tny_folder_id){
+static void 
+modest_msg_view_window_update_model_replaced (ModestHeaderViewObserver *observer,
+                                             GtkTreeModel *model,
+                                             const gchar *tny_folder_id)
+{
        ModestMsgViewWindowPrivate *priv = NULL; 
        ModestMsgViewWindow *window = NULL;
 
@@ -1117,53 +1274,61 @@ void modest_msg_view_window_update_model_replaced(
         * not care about it's model (msg list). Else if the
         * header-view shows the folder the msg shown by us is in, we
         * shall replace our model reference and make some check. */
-       if(tny_folder_id == NULL || !g_str_equal(tny_folder_id, priv->header_folder_id))
+       if(model == NULL || tny_folder_id == NULL || 
+          (priv->header_folder_id && !g_str_equal(tny_folder_id, priv->header_folder_id)))
                return;
-       
+
        /* Model is changed(replaced), so we should forget the old
         * one. Because there might be other references and there
         * might be some change on the model even if we unreferenced
         * it, we need to disconnect our signals here. */
-       if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
-                                          priv->row_changed_handler))
-               g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
-                                            priv->row_changed_handler);
-       priv->row_changed_handler = 0;
-       if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
-                                          priv->row_deleted_handler))
-               g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
-                                            priv->row_deleted_handler);
-       priv->row_deleted_handler = 0;
-       if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
-                                          priv->row_inserted_handler))
-               g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
-                                            priv->row_inserted_handler);
-       priv->row_inserted_handler = 0;
-       if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
-                                          priv->rows_reordered_handler))
-               g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
-                                            priv->rows_reordered_handler);
-       priv->rows_reordered_handler = 0;
-       g_object_unref(priv->header_model);
-       priv->header_model = NULL;
-       if (priv->row_reference)
-               gtk_tree_row_reference_free (priv->row_reference);
-       priv->row_reference = NULL;
-       if (priv->next_row_reference)
-               gtk_tree_row_reference_free (priv->next_row_reference);
-       priv->next_row_reference = NULL;
+       if (priv->header_model) {
+               if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
+                                                 priv->row_changed_handler))
+                       g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
+                                                   priv->row_changed_handler);
+               if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
+                                                 priv->row_deleted_handler))
+                       g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
+                                                   priv->row_deleted_handler);
+               if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
+                                                 priv->row_inserted_handler))
+                       g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
+                                                   priv->row_inserted_handler);
+               if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
+                                                 priv->rows_reordered_handler))
+                       g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
+                                                   priv->rows_reordered_handler);
 
-       modest_ui_actions_check_toolbar_dimming_rules(MODEST_WINDOW(window));
+               /* Frees */
+               if (priv->row_reference)
+                       gtk_tree_row_reference_free (priv->row_reference);
+               if (priv->next_row_reference)
+                       gtk_tree_row_reference_free (priv->next_row_reference);
+               g_object_unref(priv->header_model);
+
+               /* Initialize */
+               priv->row_changed_handler = 0;
+               priv->row_deleted_handler = 0;
+               priv->row_inserted_handler = 0;
+               priv->rows_reordered_handler = 0;
+               priv->next_row_reference = NULL;
+               priv->row_reference = NULL;
+               priv->header_model = NULL;
+       }
 
-       g_assert(model != NULL);
+       priv->header_model = g_object_ref (model);
 
        /* Also we must connect to the new model for row insertions.
         * Only for insertions now. We will need other ones only after
         * the msg is show by msg-view is added to the new model. */
-       priv->row_inserted_handler = g_signal_connect (
-                       model, "row-inserted",
-                       G_CALLBACK(modest_msg_view_window_on_row_inserted),
-                       window);
+       priv->row_inserted_handler =
+               g_signal_connect (priv->header_model, "row-inserted",
+                                 G_CALLBACK(modest_msg_view_window_on_row_inserted),
+                                 window);
+
+       modest_ui_actions_check_menu_dimming_rules(MODEST_WINDOW(window));
+       modest_ui_actions_check_toolbar_dimming_rules(MODEST_WINDOW(window));
 }
 
 gboolean 
@@ -1260,6 +1425,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 */
@@ -1276,10 +1442,14 @@ modest_msg_view_window_find_toolbar_close (GtkWidget *widget,
 {
        GtkToggleAction *toggle;
        ModestWindowPrivate *parent_priv;
+       ModestMsgViewWindowPrivate *priv;
+
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj);
        parent_priv = MODEST_WINDOW_GET_PRIVATE (obj);
        
        toggle = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage"));
        gtk_toggle_action_set_active (toggle, FALSE);
+       modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
 }
 
 static void
@@ -1314,6 +1484,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
                        priv->last_search = NULL;
                } else {
                        modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
+                       hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
                }
        } else {
                if (!modest_isearch_view_search_next (MODEST_ISEARCH_VIEW (priv->msg_view))) {
@@ -1322,6 +1493,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
                        priv->last_search = NULL;
                } else {
                        modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
+                       hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
                }
        }
        
@@ -1442,10 +1614,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) {
@@ -1470,9 +1642,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;
                }
@@ -1496,6 +1668,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;
@@ -1544,9 +1719,16 @@ modest_msg_view_window_is_search_result (ModestMsgViewWindow *window)
 static gboolean
 msg_is_visible (TnyHeader *header, gboolean check_outbox)
 {
-       return (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) &&
-               ( (!check_outbox) || (modest_tny_all_send_queues_get_msg_status (header) != MODEST_TNY_SEND_QUEUE_FAILED)) ;
-       
+       if ((tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED))
+               return FALSE;
+       if (!check_outbox) {
+               return TRUE;
+       } else {
+               ModestTnySendQueueStatus status;
+               status = modest_tny_all_send_queues_get_msg_status (header);
+               return ((status != MODEST_TNY_SEND_QUEUE_FAILED) &&
+                       (status != MODEST_TNY_SEND_QUEUE_SENDING));
+       }
 }
 
 gboolean
@@ -1556,7 +1738,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);
@@ -1565,18 +1746,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;
@@ -1619,15 +1795,22 @@ message_reader_performer (gboolean canceled,
                goto frees;
        }
 
+       /* Register the header - it'll be unregistered in the callback */
+       modest_window_mgr_register_header (modest_runtime_get_window_mgr (), info->header, NULL);
+
        /* New mail operation */
        mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
-                                                                modest_ui_actions_get_msgs_full_error_handler, 
+                                                                modest_ui_actions_disk_operations_error_handler, 
                                                                 NULL, NULL);
                                
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_get_msg (mail_op, info->header, view_msg_cb, info->row_reference);
+       modest_mail_operation_get_msg (mail_op, info->header, TRUE, view_msg_cb, info->row_reference);
        g_object_unref (mail_op);
 
+       /* Update dimming rules */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (parent_window));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (parent_window));
+
  frees:
        /* Frees. The row_reference will be freed by the view_msg_cb callback */
        g_object_unref (info->header);
@@ -1738,7 +1921,7 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
        if (!gtk_tree_row_reference_valid (priv->next_row_reference)) {
                if (gtk_tree_row_reference_valid (priv->row_reference)) {
                        priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
-                       select_next_valid_row (priv->header_model, &(priv->next_row_reference), FALSE);
+                       select_next_valid_row (priv->header_model, &(priv->next_row_reference), FALSE, priv->is_outbox);
                }
        }
        if (priv->next_row_reference)
@@ -1766,7 +1949,7 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
        /* Free */
        g_object_unref (header);
 
-       return retval;          
+       return retval;
 }
 
 gboolean        
@@ -1824,6 +2007,9 @@ view_msg_cb (ModestMailOperation *mail_op,
        ModestMsgViewWindowPrivate *priv = NULL;
        GtkTreeRowReference *row_reference = NULL;
 
+       /* Unregister the header (it was registered before creating the mail operation) */
+       modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), header);
+
        row_reference = (GtkTreeRowReference *) user_data;
        if (canceled) {
                gtk_tree_row_reference_free (row_reference);
@@ -1849,7 +2035,7 @@ view_msg_cb (ModestMailOperation *mail_op,
                        gtk_tree_row_reference_free (priv->next_row_reference);
                }
                priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
-               select_next_valid_row (priv->header_model, &(priv->next_row_reference), TRUE);
+               select_next_valid_row (priv->header_model, &(priv->next_row_reference), TRUE, priv->is_outbox);
        }
 
        /* Mark header as read */
@@ -2204,7 +2390,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 (
@@ -2231,11 +2417,10 @@ 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);
+                       modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data),
+                                                                mail_op);
                        tmp = g_slist_next (tmp);
                }
 
@@ -2303,14 +2488,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));
@@ -2352,49 +2592,44 @@ 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)||
+           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 {
@@ -2424,10 +2659,11 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart
                        msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (mime_part), account, 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);
 }
 
@@ -2502,8 +2738,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));
@@ -2511,6 +2750,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);
        }
 
@@ -2554,17 +2794,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, dgettext("hildon-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 (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;
-       gboolean canceled = FALSE;
-       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);
@@ -2577,6 +2878,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;
@@ -2584,17 +2886,22 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
                iter = tny_list_create_iterator (mime_parts);
                TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter);
                g_object_unref (iter);
-               if (!modest_tny_mime_part_is_msg (mime_part) && tny_mime_part_is_attachment (mime_part)) {
-                       filename = tny_mime_part_get_filename (mime_part);
+               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 = g_strdup (tny_mime_part_get_filename (mime_part));
                } else {
+                       /* TODO: show any error? */
                        g_warning ("Tried to save a non-file attachment");
-                       canceled = TRUE;
+                       g_object_unref (mime_parts);
+                       return;
                }
                g_object_unref (mime_part);
        } else {
                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);
@@ -2605,61 +2912,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;
 
-                       iter = tny_list_create_iterator (mime_parts);
-                       while (!tny_iterator_is_done (iter)) {
-                               TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (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);
 
-                               if ((tny_mime_part_is_attachment (mime_part)) && 
-                                   (tny_mime_part_get_filename (mime_part) != NULL)) {
-                                       SaveMimePartPair *pair;
-                                       
-                                       pair = g_slice_new0 (SaveMimePartPair);
-                                       if (save_multiple_str) {
-                                               pair->filename = 
-                                                       g_build_filename (chooser_uri,
-                                                                         tny_mime_part_get_filename (mime_part), NULL);
-                                       } 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
@@ -2694,7 +2965,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);
@@ -2723,7 +2993,7 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean
 
        n_attachments = tny_list_get_length (mime_parts);
        if (n_attachments == 1) {
-               const gchar *filename;
+               gchar *filename;
                TnyMimePart *part;
 
                iter = tny_list_create_iterator (mime_parts);
@@ -2732,14 +3002,15 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean
                if (modest_tny_mime_part_is_msg (part)) {
                        TnyHeader *header;
                        header = tny_msg_get_header (TNY_MSG (part));
-                       filename = tny_header_get_subject (header);
+                       filename = tny_header_dup_subject (header);
                        g_object_unref (header);
                        if (filename == NULL)
-                               filename = _("mail_va_no_subject");
+                               filename = g_strdup (_("mail_va_no_subject"));
                } else {
-                       filename = tny_mime_part_get_filename (TNY_MIME_PART (part));
+                       filename = g_strdup (tny_mime_part_get_filename (TNY_MIME_PART (part)));
                }
                confirmation_message = g_strdup_printf (_("mcen_nc_purge_file_text"), filename);
+               g_free (filename);
                g_object_unref (part);
        } else {
                confirmation_message = g_strdup_printf (ngettext("mcen_nc_purge_file_text", 
@@ -2756,10 +3027,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)) {
@@ -2767,7 +3034,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);
        }
@@ -2802,18 +3068,21 @@ update_window_title (ModestMsgViewWindow *window)
        ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
        TnyMsg *msg = NULL;
        TnyHeader *header = NULL;
-       const gchar *subject = NULL;
+       gchar *subject = NULL;
        
        msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view));
 
        if (msg != NULL) {
                header = tny_msg_get_header (msg);
-               subject = tny_header_get_subject (header);
+               subject = tny_header_dup_subject (header);
+               g_object_unref (header);
                g_object_unref (msg);
        }
 
-       if ((subject == NULL)||(subject[0] == '\0'))
-               subject = _("mail_va_no_subject");
+       if ((subject == NULL)||(subject[0] == '\0')) {
+               g_free (subject);
+               subject = g_strdup (_("mail_va_no_subject"));
+       }
 
        gtk_window_set_title (GTK_WINDOW (window), subject);
 }
@@ -2826,3 +3095,124 @@ 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_message ("REFRESH VIEW");
+       if (GTK_WIDGET_DRAWABLE (fidata->msg_view)) {
+               g_message ("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));
+}
+
+