Reverted again the gdk_threads_enter/leave sentences:
[modest] / src / maemo / modest-msg-view-window.c
index b25498e..29e67b6 100644 (file)
 #include <tny-account-store.h>
 #include <tny-simple-list.h>
 #include <tny-header.h>
+#include <tny-vfs-stream.h>
+#include "modest-platform.h"
+#include <modest-maemo-utils.h>
 #include <modest-tny-msg.h>
 #include <modest-msg-view-window.h>
+#include <modest-attachments-view.h>
 #include <modest-main-window-ui.h>
+#include "modest-msg-view-window-ui-dimming.h"
 #include <modest-widget-memory.h>
 #include <modest-runtime.h>
 #include <modest-window-priv.h>
 #include <modest-tny-folder.h>
-#include <hildon-widgets/hildon-find-toolbar.h>
-#include <hildon-widgets/hildon-defines.h>
-#include <hildon-widgets/hildon-banner.h>
+#include <modest-text-utils.h>
+#include <modest-account-mgr-helpers.h>
+#include "modest-progress-bar-widget.h"
+#include "modest-defs.h"
+#include "modest-hildon-includes.h"
 #include <gtkhtml/gtkhtml-search.h>
+#include "modest-ui-dimming-manager.h"
 #include <gdk/gdkkeysyms.h>
 
+#define DEFAULT_FOLDER "MyDocs/.documents"
+
 static void  modest_msg_view_window_class_init   (ModestMsgViewWindowClass *klass);
 static void  modest_msg_view_window_init         (ModestMsgViewWindow *obj);
 static void  modest_msg_view_window_finalize     (GObject *obj);
@@ -57,22 +67,43 @@ static void  modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
 static void  modest_msg_view_window_set_zoom (ModestWindow *window,
                                              gdouble zoom);
 static gdouble modest_msg_view_window_get_zoom (ModestWindow *window);
-static void modest_msg_view_window_zoom_minus (GtkAction *action, ModestWindow *window);
-static void modest_msg_view_window_zoom_plus (GtkAction *action, ModestWindow *window);
+static gboolean modest_msg_view_window_zoom_minus (ModestWindow *window);
+static gboolean modest_msg_view_window_zoom_plus (ModestWindow *window);
 static gboolean modest_msg_view_window_key_release_event (GtkWidget *window,
                                                          GdkEventKey *event,
                                                          gpointer userdata);
+static gboolean modest_msg_view_window_window_state_event (GtkWidget *widget, 
+                                                          GdkEventWindowState *event, 
+                                                          gpointer userdata);
 static void modest_msg_view_window_scroll_up (ModestWindow *window);
 static void modest_msg_view_window_scroll_down (ModestWindow *window);
-static void modest_msg_view_window_toggle_fullscreen (GtkAction *action, ModestWindow *window);
-static gboolean modest_msg_view_window_is_last_message (ModestMsgViewWindow *window);
-static gboolean modest_msg_view_window_is_first_message (ModestMsgViewWindow *window);
-static TnyFolderType modest_msg_view_window_get_folder_type (ModestMsgViewWindow *window);
-static void modest_msg_view_window_update_dimmed (ModestMsgViewWindow *window);
 static void modest_msg_view_window_update_priority (ModestMsgViewWindow *window);
 
+static void modest_msg_view_window_show_toolbar   (ModestWindow *window,
+                                                  gboolean show_toolbar);
+
+static void modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard,
+                                                          GdkEvent *event,
+                                                          ModestMsgViewWindow *window);
+
+static void cancel_progressbar (GtkToolButton *toolbutton,
+                               ModestMsgViewWindow *self);
+
+static void         on_queue_changed                     (ModestMailOperationQueue *queue,
+                                                         ModestMailOperation *mail_op,
+                                                         ModestMailOperationQueueNotification type,
+                                                         ModestMsgViewWindow *self);
+
+static void view_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, gpointer user_data);
+
+static void set_toolbar_mode (ModestMsgViewWindow *self, 
+                             ModestToolBarModes mode);
+
+static gboolean set_toolbar_transfer_mode     (ModestMsgViewWindow *self); 
 
 
+static void update_window_title (ModestMsgViewWindow *window);
+
 
 /* list my signals */
 enum {
@@ -83,6 +114,7 @@ enum {
 
 static const GtkToggleActionEntry msg_view_toggle_action_entries [] = {
        { "FindInMessage",    GTK_STOCK_FIND,    N_("qgn_toolb_gene_find"), NULL, NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE },
+       { "ToolsFindInMessage", NULL, N_("mcen_me_viewer_find"), NULL, NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE },
 };
 
 static const GtkRadioActionEntry msg_view_zoom_action_entries [] = {
@@ -94,24 +126,37 @@ static const GtkRadioActionEntry msg_view_zoom_action_entries [] = {
        { "Zoom200", NULL, N_("mcen_me_viewer_200"), NULL, NULL, 200 }
 };
 
-static const GtkActionEntry modest_msg_view_action_entries [] = {
-       { "ZoomPlus", NULL, N_("Zoom +"), "F7", NULL, G_CALLBACK (modest_msg_view_window_zoom_plus) },
-       { "ZoomMinus", NULL, N_("Zoom -"), "F8", NULL, G_CALLBACK (modest_msg_view_window_zoom_minus) },
-       { "ToggleFullscreen", NULL, N_("Toggle fullscreen"), "F6", NULL, G_CALLBACK (modest_msg_view_window_toggle_fullscreen) },
-};
-
 typedef struct _ModestMsgViewWindowPrivate ModestMsgViewWindowPrivate;
 struct _ModestMsgViewWindowPrivate {
 
-       GtkWidget   *toolbar;
-       GtkWidget   *menubar;
        GtkWidget   *msg_view;
        GtkWidget   *main_scroll;
        GtkWidget   *find_toolbar;
        gchar       *last_search;
 
+       /* Progress observers */
+       GtkWidget        *progress_bar;
+       GSList           *progress_widgets;
+
+       /* Tollbar items */
+       GtkWidget   *progress_toolitem;
+       GtkWidget   *cancel_toolitem;
+       GtkWidget   *prev_toolitem;
+       GtkWidget   *next_toolitem;
+       ModestToolBarModes current_toolbar_mode;
+
+       /* Optimized view enabled */
+       gboolean optimized_view;
+
        GtkTreeModel *header_model;
-       GtkTreeIter   iter;
+       GtkTreeRowReference *row_reference;
+
+       guint clipboard_change_handler;
+       guint queue_change_handler;
+
+       guint progress_bar_timeout;
+
+       gchar *msg_uid;
 };
 
 #define MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -148,6 +193,23 @@ modest_msg_view_window_get_type (void)
 }
 
 static void
+save_state (ModestWindow *self)
+{
+       modest_widget_memory_save (modest_runtime_get_conf (),
+                                  G_OBJECT(self), 
+                                  MODEST_CONF_MSG_VIEW_WINDOW_KEY);
+}
+
+
+static void
+restore_settings (ModestMsgViewWindow *self)
+{
+       modest_widget_memory_restore (modest_runtime_get_conf (),
+                                     G_OBJECT(self), 
+                                     MODEST_CONF_MSG_VIEW_WINDOW_KEY);
+}
+
+static void
 modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass)
 {
        GObjectClass *gobject_class;
@@ -160,8 +222,13 @@ modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass)
 
        modest_window_class->set_zoom_func = modest_msg_view_window_set_zoom;
        modest_window_class->get_zoom_func = modest_msg_view_window_get_zoom;
+       modest_window_class->zoom_minus_func = modest_msg_view_window_zoom_minus;
+       modest_window_class->zoom_plus_func = modest_msg_view_window_zoom_plus;
+       modest_window_class->show_toolbar_func = modest_msg_view_window_show_toolbar;
 
        g_type_class_add_private (gobject_class, sizeof(ModestMsgViewWindowPrivate));
+
+       modest_window_class->save_state_func = save_state;
 }
 
 static void
@@ -170,28 +237,125 @@ modest_msg_view_window_init (ModestMsgViewWindow *obj)
        ModestMsgViewWindowPrivate *priv;
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj);
 
-       priv->toolbar       = NULL;
-       priv->menubar       = NULL;
        priv->msg_view      = NULL;
-
        priv->header_model  = NULL;
-}
+       priv->clipboard_change_handler = 0;
+       priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL;
 
-static void
-save_settings (ModestMsgViewWindow *self)
-{
-       modest_widget_memory_save (modest_runtime_get_conf (),
-                                   G_OBJECT(self), "modest-msg-view-window");
+       priv->optimized_view  = FALSE;
+       priv->progress_bar_timeout = 0;
+       priv->msg_uid = NULL;
 }
 
 
-static void
-restore_settings (ModestMsgViewWindow *self)
+static gboolean
+set_toolbar_transfer_mode (ModestMsgViewWindow *self)
 {
-       modest_widget_memory_restore (modest_runtime_get_conf (),
-                                     G_OBJECT(self), "modest-msg-view-window");
+       ModestMsgViewWindowPrivate *priv = NULL;
+       
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE);
+
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
+
+       set_toolbar_mode (self, TOOLBAR_MODE_TRANSFER);
+       
+       if (priv->progress_bar_timeout > 0) {
+               g_source_remove (priv->progress_bar_timeout);
+               priv->progress_bar_timeout = 0;
+       }
+       
+       return FALSE;
 }
 
+static void 
+set_toolbar_mode (ModestMsgViewWindow *self, 
+                 ModestToolBarModes mode)
+{
+       ModestWindowPrivate *parent_priv;
+       ModestMsgViewWindowPrivate *priv;
+       GtkWidget *widget = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self));
+
+       parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
+                       
+       /* Sets current toolbar mode */
+       priv->current_toolbar_mode = mode;
+
+       /* Get toolbar widget */
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
+
+       switch (mode) {
+       case TOOLBAR_MODE_NORMAL:               
+               gtk_widget_set_sensitive (widget, TRUE);
+/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply"); */
+/*             gtk_action_set_sensitive (widget, TRUE); */
+/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarDeleteMessage"); */
+/*             gtk_action_set_sensitive (widget, TRUE); */
+/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageMoveTo"); */
+/*             gtk_action_set_sensitive (widget, TRUE); */
+/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage"); */
+/*             gtk_action_set_sensitive (widget, TRUE); */
+
+               if (priv->prev_toolitem)
+                       gtk_widget_show (priv->prev_toolitem);
+               
+               if (priv->next_toolitem)
+                       gtk_widget_show (priv->next_toolitem);
+                       
+               if (priv->progress_toolitem)
+                       gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE);
+               if (priv->progress_bar)
+                       gtk_widget_hide (priv->progress_bar);
+                       
+               if (priv->cancel_toolitem)
+                       gtk_widget_hide (priv->cancel_toolitem);
+
+               /* Hide toolbar if optimized view is enabled */
+               if (priv->optimized_view) {
+                       gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE);
+                       gtk_widget_hide (GTK_WIDGET(parent_priv->toolbar));
+               }
+
+               break;
+       case TOOLBAR_MODE_TRANSFER:
+               gtk_widget_set_sensitive (widget, FALSE);
+/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply"); */
+/*             gtk_action_set_sensitive (widget, FALSE); */
+/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarDeleteMessage"); */
+/*             gtk_action_set_sensitive (widget, FALSE); */
+/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageMoveTo"); */
+/*             gtk_action_set_sensitive (widget, FALSE); */
+/*             widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage"); */
+/*             gtk_action_set_sensitive (widget, FALSE); */
+
+               if (priv->prev_toolitem)
+                       gtk_widget_hide (priv->prev_toolitem);
+               
+               if (priv->next_toolitem)
+                       gtk_widget_hide (priv->next_toolitem);
+               
+               if (priv->progress_toolitem)
+                       gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
+               if (priv->progress_bar)
+                       gtk_widget_show (priv->progress_bar);
+                       
+               if (priv->cancel_toolitem)
+                       gtk_widget_show (priv->cancel_toolitem);
+
+               /* Show toolbar if it's hiden (optimized view ) */
+               if (priv->optimized_view) {
+                       gtk_widget_set_no_show_all (parent_priv->toolbar, FALSE);
+                       gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
+               }
+
+               break;
+       default:
+               g_return_if_reached ();
+       }
+
+}
 
 
 static GtkWidget *
@@ -219,52 +383,6 @@ menubar_to_menu (GtkUIManager *ui_manager)
        return main_menu;
 }
 
-static GtkWidget*
-get_toolbar (ModestMsgViewWindow *self)
-{
-       GtkWidget *toolbar, *reply_button, *menu;
-       ModestWindowPrivate *parent_priv;
-       GtkWidget *button;
-
-       parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
-       toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
-       reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply");
-
-       menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolbarReplyCSM");
-       gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
-
-       button = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageNew");
-       gtk_tool_item_set_expand (GTK_TOOL_ITEM (button), TRUE);
-       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (button), TRUE);
-
-       button = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply");
-       gtk_tool_item_set_expand (GTK_TOOL_ITEM (button), TRUE);
-       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (button), TRUE);
-
-       button = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageMoveTo");
-       gtk_tool_item_set_expand (GTK_TOOL_ITEM (button), TRUE);
-       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (button), TRUE);
-
-       button = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarDeleteMessage");
-       gtk_tool_item_set_expand (GTK_TOOL_ITEM (button), TRUE);
-       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (button), TRUE);
-
-       button = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageBack");
-       gtk_tool_item_set_expand (GTK_TOOL_ITEM (button), TRUE);
-       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (button), TRUE);
-
-       button = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageForward");
-       gtk_tool_item_set_expand (GTK_TOOL_ITEM (button), TRUE);
-       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (button), TRUE);
-
-       button = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FindInMessage");
-       gtk_tool_item_set_expand (GTK_TOOL_ITEM (button), TRUE);
-       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (button), TRUE);
-
-       return toolbar;
-}
-
-
 static void
 init_window (ModestMsgViewWindow *obj, TnyMsg *msg)
 {
@@ -279,16 +397,11 @@ init_window (ModestMsgViewWindow *obj, TnyMsg *msg)
        modest_msg_view_set_shadow_type (MODEST_MSG_VIEW (priv->msg_view), GTK_SHADOW_NONE);
        main_vbox = gtk_vbox_new  (FALSE, 6);
 
-       /* Toolbar / Menubar */
-       
+       /* Menubar */
        parent_priv->menubar = menubar_to_menu (parent_priv->ui_manager);
        gtk_widget_show_all (GTK_WIDGET(parent_priv->menubar));
        hildon_window_set_menu    (HILDON_WINDOW(obj), GTK_MENU(parent_priv->menubar));
 
-       parent_priv->toolbar = get_toolbar (obj);
-       gtk_widget_show_all (GTK_WIDGET(parent_priv->toolbar));
-       hildon_window_add_toolbar (HILDON_WINDOW(obj), GTK_TOOLBAR(parent_priv->toolbar));
-
        priv->main_scroll = gtk_scrolled_window_new (NULL, NULL);
        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->main_scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->main_scroll), GTK_SHADOW_NONE);
@@ -302,8 +415,10 @@ init_window (ModestMsgViewWindow *obj, TnyMsg *msg)
        g_signal_connect (G_OBJECT (priv->find_toolbar), "close", G_CALLBACK (modest_msg_view_window_find_toolbar_close), obj);
        g_signal_connect (G_OBJECT (priv->find_toolbar), "search", G_CALLBACK (modest_msg_view_window_find_toolbar_search), obj);
        
+       priv->clipboard_change_handler = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change", G_CALLBACK (modest_msg_view_window_clipboard_owner_change), obj);
        gtk_widget_show_all (GTK_WIDGET(main_vbox));
        gtk_box_pack_end (GTK_BOX (main_vbox), priv->find_toolbar, FALSE, FALSE, 0);
+
 }      
 
 
@@ -313,11 +428,36 @@ modest_msg_view_window_finalize (GObject *obj)
        ModestMsgViewWindowPrivate *priv;
 
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj);
+       if (priv->clipboard_change_handler > 0) {
+               g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_PRIMARY), priv->clipboard_change_handler);
+               priv->clipboard_change_handler = 0;
+       }
+       if (priv->queue_change_handler > 0) {
+               g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), priv->queue_change_handler);
+               priv->queue_change_handler = 0;
+       }
        if (priv->header_model != NULL) {
                g_object_unref (priv->header_model);
                priv->header_model = NULL;
        }
 
+       /* disconnet operations queue observer */
+       
+       if (priv->progress_bar_timeout > 0) {
+               g_source_remove (priv->progress_bar_timeout);
+               priv->progress_bar_timeout = 0;
+       }
+
+       if (priv->row_reference) {
+               gtk_tree_row_reference_free (priv->row_reference);
+               priv->row_reference = NULL;
+       }
+
+       if (priv->msg_uid) {
+               g_free (priv->msg_uid);
+               priv->msg_uid = NULL;
+       }
+
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -326,66 +466,80 @@ modest_msg_view_window_finalize (GObject *obj)
 static gboolean
 on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgViewWindow *self)
 {
-       save_settings (self);
+       modest_window_save_state (MODEST_WINDOW (self));
        return FALSE;
 }
 
 ModestWindow *
-modest_msg_view_window_new_with_header_model (TnyMsg *msg, const gchar *account_name,
-                                             GtkTreeModel *model, GtkTreeIter iter)
+modest_msg_view_window_new_with_header_model (TnyMsg *msg, 
+                                             const gchar *account_name,
+                                             const gchar *msg_uid,
+                                             GtkTreeModel *model, 
+                                             GtkTreeRowReference *row_reference)
 {
        ModestMsgViewWindow *window = NULL;
        ModestMsgViewWindowPrivate *priv = NULL;
 
-       window = MODEST_MSG_VIEW_WINDOW(modest_msg_view_window_new (msg, account_name));
+       window = MODEST_MSG_VIEW_WINDOW(modest_msg_view_window_new (msg, account_name, msg_uid));
        g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL);
 
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 
        g_object_ref (model);
        priv->header_model = model;
-       priv->iter = iter;
+       priv->row_reference = gtk_tree_row_reference_copy (row_reference);
 
        modest_msg_view_window_update_priority (window);
 
-       modest_msg_view_window_update_dimmed (window);
+       /* Check toolbar dimming rules */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
 
        return MODEST_WINDOW(window);
 }
 
 
 ModestWindow *
-modest_msg_view_window_new (TnyMsg *msg, const gchar *account_name)
+modest_msg_view_window_new (TnyMsg *msg, 
+                           const gchar *account_name,
+                           const gchar *msg_uid)
 {
-       GObject *obj;
-       ModestMsgViewWindowPrivate *priv;
-       ModestWindowPrivate *parent_priv;
-       GtkActionGroup *action_group;
+       ModestMsgViewWindow *self = NULL;
+       GObject *obj = NULL;
+       ModestMsgViewWindowPrivate *priv = NULL;
+       ModestWindowPrivate *parent_priv = NULL;
+       ModestDimmingRulesGroup *menu_rules_group = NULL;
+       ModestDimmingRulesGroup *toolbar_rules_group = NULL;
+       GtkActionGroup *action_group = NULL;
        GError *error = NULL;
+       GdkPixbuf *window_icon = NULL;
 
        g_return_val_if_fail (msg, NULL);
        
        obj = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj);
        parent_priv = MODEST_WINDOW_GET_PRIVATE(obj);
-       
+       self = MODEST_MSG_VIEW_WINDOW (obj);
+
+       priv->msg_uid = g_strdup (msg_uid);
+
        parent_priv->ui_manager = gtk_ui_manager_new();
+       parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new();
+
        action_group = gtk_action_group_new ("ModestMsgViewWindowActions");
        gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
 
+       menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules");
+       toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules");
+
        /* Add common actions */
        gtk_action_group_add_actions (action_group,
                                      modest_action_entries,
                                      G_N_ELEMENTS (modest_action_entries),
                                      obj);
-       gtk_action_group_add_actions (action_group,
-                                     modest_msg_view_action_entries,
-                                     G_N_ELEMENTS (modest_msg_view_action_entries),
-                                     obj);
        gtk_action_group_add_toggle_actions (action_group,
-                                     modest_toggle_action_entries,
-                                     G_N_ELEMENTS (modest_toggle_action_entries),
-                                     obj);
+                                            modest_toggle_action_entries,
+                                            G_N_ELEMENTS (modest_toggle_action_entries),
+                                            obj);
        gtk_action_group_add_toggle_actions (action_group,
                                             msg_view_toggle_action_entries,
                                             G_N_ELEMENTS (msg_view_toggle_action_entries),
@@ -410,6 +564,22 @@ modest_msg_view_window_new (TnyMsg *msg, const gchar *account_name)
        }
        /* ****** */
 
+       /* Add common dimming rules */
+       modest_dimming_rules_group_add_rules (menu_rules_group, 
+                                             modest_msg_view_menu_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_view_menu_dimming_entries),
+                                             self);
+       modest_dimming_rules_group_add_rules (toolbar_rules_group, 
+                                             modest_msg_view_toolbar_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_view_toolbar_dimming_entries),
+                                             self);
+
+       /* Insert dimming rules group for this window */
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group);
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group);
+       g_object_unref (menu_rules_group);
+       g_object_unref (toolbar_rules_group);
+
        /* Add accelerators */
        gtk_window_add_accel_group (GTK_WINDOW (obj), 
                                    gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
@@ -418,9 +588,6 @@ modest_msg_view_window_new (TnyMsg *msg, const gchar *account_name)
        init_window (MODEST_MSG_VIEW_WINDOW(obj), msg);
        restore_settings (MODEST_MSG_VIEW_WINDOW(obj));
        
-       gtk_window_set_title (GTK_WINDOW(obj), "Modest");
-       gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
-
        g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj);
 
        g_signal_connect (G_OBJECT(priv->msg_view), "link_clicked",
@@ -438,18 +605,79 @@ modest_msg_view_window_new (TnyMsg *msg, const gchar *account_name)
                          G_CALLBACK (modest_msg_view_window_key_release_event),
                          NULL);
 
+       g_signal_connect (G_OBJECT (obj), "window-state-event",
+                         G_CALLBACK (modest_msg_view_window_window_state_event),
+                         NULL);
+
+       /* Mail Operation Queue */
+       priv->queue_change_handler = g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
+                                                      "queue-changed",
+                                                      G_CALLBACK (on_queue_changed),
+                                                      obj);
+
        modest_window_set_active_account (MODEST_WINDOW(obj), account_name);
 
        priv->last_search = NULL;
 
-       modest_msg_view_window_update_dimmed (MODEST_MSG_VIEW_WINDOW (obj));
 
-       gtk_widget_grab_focus (priv->msg_view);
+       /* Set window icon */
+       window_icon = modest_platform_get_icon (MODEST_APP_MSG_VIEW_ICON);
+       gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
+
+       /* Init the clipboard actions dim status */
+       modest_msg_view_grab_focus(MODEST_MSG_VIEW (priv->msg_view));
+
+       update_window_title (MODEST_MSG_VIEW_WINDOW (obj));
+
+       /* Check toolbar dimming rules */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj));
 
        return MODEST_WINDOW(obj);
 }
 
 
+gboolean 
+modest_msg_view_window_toolbar_on_transfer_mode     (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->current_toolbar_mode == TOOLBAR_MODE_TRANSFER;
+}
+
+TnyHeader*
+modest_msg_view_window_get_header (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv= NULL; 
+       TnyMsg *msg = NULL;
+       TnyHeader *header = NULL;
+       GtkTreeIter iter;
+
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), NULL);
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+       /* Message is not obtained from a treemodel (Attachment ?) */
+       if (priv->header_model == NULL) {
+               msg = modest_msg_view_window_get_message (self);
+               header = tny_msg_get_header (msg);
+               g_object_unref (msg);
+               return header;
+       }
+
+       /* Get current message iter */
+       gtk_tree_model_get_iter (priv->header_model, 
+                                &iter, 
+                                gtk_tree_row_reference_get_path (priv->row_reference));
+
+       /* Get current message header */
+       gtk_tree_model_get (priv->header_model, &iter, 
+                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+                           &header, -1);
+
+       return header;
+}
 
 TnyMsg*
 modest_msg_view_window_get_message (ModestMsgViewWindow *self)
@@ -466,19 +694,59 @@ modest_msg_view_window_get_message (ModestMsgViewWindow *self)
        return modest_msg_view_get_message (msg_view);
 }
 
+const gchar*
+modest_msg_view_window_get_message_uid (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+       return (const gchar*) priv->msg_uid;
+}
+
+static void
+toggle_action_set_active_block_notify (GtkToggleAction *action,
+                                      gboolean value)
+{
+       GSList *proxies = NULL;
+
+       for (proxies = gtk_action_get_proxies (GTK_ACTION (action));
+            proxies != NULL; proxies = g_slist_next (proxies)) {
+               GtkWidget *widget = (GtkWidget *) proxies->data;
+               gtk_action_block_activate_from (GTK_ACTION (action), widget);
+       }
+
+       gtk_toggle_action_set_active (action, value);
+
+       for (proxies = gtk_action_get_proxies (GTK_ACTION (action));
+            proxies != NULL; proxies = g_slist_next (proxies)) {
+               GtkWidget *widget = (GtkWidget *) proxies->data;
+               gtk_action_unblock_activate_from (GTK_ACTION (action), widget);
+       }
+}
+
+
 static void 
 modest_msg_view_window_toggle_find_toolbar (GtkToggleAction *toggle,
                                            gpointer data)
 {
        ModestMsgViewWindow *window = MODEST_MSG_VIEW_WINDOW (data);
        ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       gboolean is_active;
+       GtkAction *action;
+
+       is_active = gtk_toggle_action_get_active (toggle);
 
-       if (gtk_toggle_action_get_active (toggle)) {
+       if (is_active) {
                gtk_widget_show (priv->find_toolbar);
+               hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
        } else {
                gtk_widget_hide (priv->find_toolbar);
        }
 
+       /* update the toggle buttons status */
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage");
+       toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), is_active);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsFindInMessageMenu");
+       toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), is_active);
        
 }
 
@@ -503,8 +771,9 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
 
        g_object_get (G_OBJECT (widget), "prefix", &current_search, NULL);
 
-       if ((current_search == NULL) && (strcmp (current_search, "") == 0)) {
+       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"));
                return;
        }
 
@@ -514,8 +783,15 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
                priv->last_search = g_strdup (current_search);
                result = modest_msg_view_search (MODEST_MSG_VIEW (priv->msg_view),
                                                 priv->last_search);
+               if (!result) {
+                       hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_no_matches"));
+               } 
        } else {
-               modest_msg_view_search_next (MODEST_MSG_VIEW (priv->msg_view));
+               if (!modest_msg_view_search_next (MODEST_MSG_VIEW (priv->msg_view))) {
+                       hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_search_complete"));
+                       g_free (priv->last_search);
+                       priv->last_search = NULL;
+               }
        }
        
        g_free (current_search);
@@ -545,8 +821,8 @@ modest_msg_view_window_get_zoom (ModestWindow *window)
        return modest_msg_view_get_zoom (MODEST_MSG_VIEW (priv->msg_view));
 }
 
-static void
-modest_msg_view_window_zoom_plus (GtkAction *action, ModestWindow *window)
+static gboolean
+modest_msg_view_window_zoom_plus (ModestWindow *window)
 {
        ModestWindowPrivate *parent_priv;
        GtkRadioAction *zoom_radio_action;
@@ -559,20 +835,21 @@ modest_msg_view_window_zoom_plus (GtkAction *action, 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, _("mcen_ib_max_zoom_level"));
-               return;
+               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_max_zoom_level_reached"));
+               return FALSE;
        }
 
        for (node = group; node != NULL; node = g_slist_next (node)) {
                if ((node->next != NULL) && gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (node->next->data))) {
                        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->data), TRUE);
-                       return;
+                       return TRUE;
                }
        }
+       return FALSE;
 }
 
-static void
-modest_msg_view_window_zoom_minus (GtkAction *action, ModestWindow *window)
+static gboolean
+modest_msg_view_window_zoom_minus (ModestWindow *window)
 {
        ModestWindowPrivate *parent_priv;
        GtkRadioAction *zoom_radio_action;
@@ -586,13 +863,17 @@ modest_msg_view_window_zoom_minus (GtkAction *action, ModestWindow *window)
 
        for (node = group; node != NULL; node = g_slist_next (node)) {
                if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (node->data))) {
-                       if (node->next != NULL)
+                       if (node->next != NULL) {
                                gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->next->data), TRUE);
-                       else
-                               hildon_banner_show_information (NULL, NULL, _("mcen_ib_min_zoom_level"));
+                               return TRUE;
+                       } else {
+                         hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_min_zoom_level_reached"));
+                               return FALSE;
+                       }
                        break;
                }
        }
+       return FALSE;
 }
 
 static gboolean
@@ -637,8 +918,8 @@ modest_msg_view_window_scroll_down (ModestWindow *window)
        g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", GTK_SCROLL_STEP_DOWN, FALSE);
 }
 
-static gboolean 
-modest_msg_view_window_is_last_message (ModestMsgViewWindow *window)
+gboolean
+modest_msg_view_window_last_message_selected (ModestMsgViewWindow *window)
 {
        GtkTreePath *path;
        ModestMsgViewWindowPrivate *priv;
@@ -649,7 +930,7 @@ modest_msg_view_window_is_last_message (ModestMsgViewWindow *window)
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 
        if (priv->header_model) {
-               path = gtk_tree_model_get_path (priv->header_model, &priv->iter);
+               path = gtk_tree_row_reference_get_path (priv->row_reference);
                if (!path)
                        return TRUE;
                while (!has_next) {
@@ -662,8 +943,7 @@ modest_msg_view_window_is_last_message (ModestMsgViewWindow *window)
                        if (!(tny_header_get_flags(header)&TNY_HEADER_FLAG_DELETED)) {
                                has_next = TRUE;
                                break;
-                       }
-                       
+                       }       
                }
                gtk_tree_path_free (path);
                return !has_next;
@@ -673,8 +953,19 @@ modest_msg_view_window_is_last_message (ModestMsgViewWindow *window)
        
 }
 
-static gboolean 
-modest_msg_view_window_is_first_message (ModestMsgViewWindow *window)
+gboolean
+modest_msg_view_window_has_headers_model (ModestMsgViewWindow *window)
+{
+       ModestMsgViewWindowPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), TRUE);
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+
+       return priv->header_model != NULL;
+}
+
+gboolean
+modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window)
 {
        GtkTreePath *path;
        ModestMsgViewWindowPrivate *priv;
@@ -686,7 +977,7 @@ modest_msg_view_window_is_first_message (ModestMsgViewWindow *window)
 
        if (priv->header_model) {
                gchar * path_string;
-               path = gtk_tree_model_get_path (priv->header_model, &priv->iter);
+               path = gtk_tree_row_reference_get_path (priv->row_reference);
                if (!path)
                        return TRUE;
 
@@ -719,7 +1010,6 @@ modest_msg_view_window_is_first_message (ModestMsgViewWindow *window)
                        }
                        g_free (path_string);
                }
-               gtk_tree_path_free (path);
                return result;
        } else {
                return TRUE;
@@ -730,102 +1020,209 @@ modest_msg_view_window_is_first_message (ModestMsgViewWindow *window)
 gboolean        
 modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
 {
+       TnyHeaderFlags flags;
+       ModestMailOperation *mail_op = NULL;
        ModestMsgViewWindowPrivate *priv;
        GtkTreeIter tmp_iter;
-       gboolean has_next = FALSE;
 
        g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 
        if (priv->header_model) {
-               tmp_iter = priv->iter;
+               gtk_tree_model_get_iter (priv->header_model,
+                                        &tmp_iter,
+                                        gtk_tree_row_reference_get_path (priv->row_reference));
                while (gtk_tree_model_iter_next (priv->header_model, &tmp_iter)) {
                        TnyHeader *header;
-                       TnyFolder *folder;
-                       TnyMsg *msg;
+                       GtkTreePath *path;
 
-                       priv->iter = tmp_iter;
-                       gtk_tree_model_get (priv->header_model, &(priv->iter), TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                       gtk_tree_model_get (priv->header_model, &tmp_iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
                                            &header, -1);
                        if (!header)
                                break;
                        if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)
                                continue;
 
-                       folder = tny_header_get_folder (header);
-                       if (!folder)
-                               break;
-                       msg = tny_folder_get_msg (folder, header, NULL);
-                       if (!msg) {
-                               g_object_unref (folder);
-                               break;
-                       }
-                       has_next = TRUE;
-                       modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg);
-                       modest_msg_view_window_update_dimmed (window);
-                       modest_msg_view_window_update_priority (window);
-                       gtk_widget_grab_focus (priv->msg_view);
+                       /* Update the row reference */
+                       gtk_tree_row_reference_free (priv->row_reference);
+                       path = gtk_tree_model_get_path (priv->header_model, &tmp_iter);
+                       priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path);
+                       gtk_tree_path_free (path);
 
-                       g_object_unref (msg);
-                       break;
+                       /* Mark as read */
+                       flags = tny_header_get_flags (header);
+                       if (!(flags & TNY_HEADER_FLAG_SEEN))
+                               tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+
+                       /* Msg download completed */
+                       if (flags & TNY_HEADER_FLAG_CACHED)
+                               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_OPEN, G_OBJECT(window));
+                       else
+                               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window));
+                               
+                       /* New mail operation */
+                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+                       modest_mail_operation_get_msg (mail_op, header, view_msg_cb, NULL);
+                       g_object_unref (mail_op);
+
+                       /* Update toolbar dimming rules */
+                       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+
+                       return TRUE;
                }
+       }
+       return FALSE;           
+}
 
-               return has_next;
-       } else {
+gboolean 
+modest_msg_view_window_select_first_message (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv = NULL;
+       ModestMailOperation *mail_op = NULL;
+       TnyHeader *header = NULL;
+       TnyHeaderFlags flags;
+       GtkTreePath *path = NULL;
+       GtkTreeIter iter;
+
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE);
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+       /* Check that the model is not empty */
+       if (!gtk_tree_model_get_iter_first (priv->header_model, &iter))
                return FALSE;
+
+       /* Get the header */
+       gtk_tree_model_get (priv->header_model, 
+                           &iter, 
+                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                           &header, -1);
+       
+       g_return_val_if_fail (TNY_IS_HEADER (header), FALSE);
+       if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED) {
+               g_object_unref (header);
+               return modest_msg_view_window_select_next_message (self);
        }
-}
+       
+       /* Update the row reference */
+       gtk_tree_row_reference_free (priv->row_reference);
+       path = gtk_tree_path_new_first ();
+       priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path);
+       gtk_tree_path_free (path);
+
+       /* Mark as read */
+       flags = tny_header_get_flags (header);
+       if (!(flags & TNY_HEADER_FLAG_SEEN))
+               tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+       
+       /* Msg download completed */
+       if (flags & TNY_HEADER_FLAG_CACHED)
+               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_OPEN, G_OBJECT(self));
+       else 
+               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(self));
+       
+       /* New mail operation */
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+       modest_mail_operation_get_msg (mail_op, header, view_msg_cb, NULL);
+       g_object_unref (mail_op);
+
+       /* Update toolbar dimming rules */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
+       
+       /* Free */
+       g_object_unref (header);
 
+       return TRUE;
+}
 gboolean        
 modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window)
 {
-       ModestMsgViewWindowPrivate *priv;
+       TnyHeaderFlags flags;
+       ModestMsgViewWindowPrivate *priv = NULL;
+       GtkTreePath *path;
+       ModestMailOperation *mail_op = NULL;
 
        g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 
-       if (priv->header_model) {
-               GtkTreePath *path;
-               gboolean has_prev = FALSE;
-
-               path = gtk_tree_model_get_path (priv->header_model, &(priv->iter));
-               while (gtk_tree_path_prev (path)) {
-                       TnyHeader *header;
-                       TnyFolder *folder;
-                       TnyMsg *msg;
+       /* Return inmediatly if there is no header model */
+       if (!priv->header_model)
+               return FALSE;
 
-                       gtk_tree_model_get_iter (priv->header_model, &(priv->iter), path);
-                       gtk_tree_model_get (priv->header_model, &(priv->iter), TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
-                                           &header, -1);
-                       if (!header)
-                               break;
-                       if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)
-                               continue;
-                       folder = tny_header_get_folder (header);
-                       if (!folder)
-                               break;
-                       msg = tny_folder_get_msg (folder, header, NULL);
-                       if (!msg) {
-                               g_object_unref (folder);
-                               break;
-                       }
-                       has_prev = TRUE;
-                       modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg);
-                       modest_msg_view_window_update_dimmed (window);
-                       modest_msg_view_window_update_priority (window);
-                       gtk_widget_grab_focus (priv->msg_view);
+       path = gtk_tree_row_reference_get_path (priv->row_reference);
+       while (gtk_tree_path_prev (path)) {
+               TnyHeader *header;
+               GtkTreeIter iter;
 
-                       g_object_unref (msg);
+               gtk_tree_model_get_iter (priv->header_model, &iter, path);
+               gtk_tree_model_get (priv->header_model, &iter, 
+                                   TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                                   &header, -1);
+               if (!header)
                        break;
+               if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED) {
+                       g_object_unref (header);
+                       continue;
                }
-               gtk_tree_path_free (path);
-               return has_prev;
-       } else {
-               return FALSE;
+
+               /* Update the row reference */
+               gtk_tree_row_reference_free (priv->row_reference);
+               priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path);
+                       
+               /* Mark as read */
+               flags = tny_header_get_flags (header);
+               if (!(flags & TNY_HEADER_FLAG_SEEN))
+                       tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+               
+               /* Msg download completed */
+               if (flags & TNY_HEADER_FLAG_CACHED)
+                       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_OPEN, G_OBJECT(window));
+               else
+                       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window));
+               
+               /* New mail operation */
+               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+               modest_mail_operation_get_msg (mail_op, header, view_msg_cb, NULL);             
+
+               /* Update toolbar dimming rules */
+               modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+
+               g_object_unref (header);
+
+               return TRUE;
        }
+
+       return FALSE;
 }
 
-static TnyFolderType
+static void
+view_msg_cb (ModestMailOperation *mail_op, 
+            TnyHeader *header, 
+            TnyMsg *msg, 
+            gpointer user_data)
+{
+       ModestMsgViewWindow *self = NULL;
+       ModestMsgViewWindowPrivate *priv = NULL;
+
+       g_return_if_fail (TNY_IS_MSG (msg));
+
+       /* Get the window */ 
+       self = (ModestMsgViewWindow *) modest_mail_operation_get_source (mail_op);
+       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self));
+
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+       /* Set new message */
+       modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg);
+       modest_msg_view_window_update_priority (self);
+       update_window_title (MODEST_MSG_VIEW_WINDOW (self));
+       modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
+
+       /* Free new references */
+       g_object_unref (self);
+}
+
+TnyFolderType
 modest_msg_view_window_get_folder_type (ModestMsgViewWindow *window)
 {
        ModestMsgViewWindowPrivate *priv;
@@ -852,47 +1249,12 @@ modest_msg_view_window_get_folder_type (ModestMsgViewWindow *window)
 
                        g_object_unref (folder);
                }
+               g_object_unref (msg);
        }
 
        return folder_type;
 }
 
-static void
-modest_msg_view_window_update_dimmed (ModestMsgViewWindow *window)
-{
-       ModestWindowPrivate *parent_priv;
-       GtkAction *widget;
-       gboolean is_first, is_last;
-       TnyFolderType folder_type;
-       gboolean is_not_sent;
-
-       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-
-       is_first = modest_msg_view_window_is_first_message (window);
-       is_last = modest_msg_view_window_is_last_message (window);
-
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageBack");
-       gtk_action_set_sensitive (widget, !is_first);
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewPreviousMessageMenu");
-       gtk_action_set_sensitive (widget, !is_first);
-               
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageForward");
-       gtk_action_set_sensitive (widget, !is_last);
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewNextMessageMenu");
-       gtk_action_set_sensitive (widget, !is_last);
-
-       folder_type = modest_msg_view_window_get_folder_type (MODEST_MSG_VIEW_WINDOW (window));
-       is_not_sent = ((folder_type == TNY_FOLDER_TYPE_DRAFTS)||(folder_type == TNY_FOLDER_TYPE_OUTBOX));
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply");
-       gtk_action_set_sensitive (widget, !is_not_sent);
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/MessageMenu/MessageReplyMenu");
-       gtk_action_set_sensitive (widget, !is_not_sent);
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/MessageMenu/MessageReplyAllMenu");
-       gtk_action_set_sensitive (widget, !is_not_sent);
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/MessageMenu/MessageForwardMenu");
-       gtk_action_set_sensitive (widget, !is_not_sent);
-               
-}
 
 static void
 modest_msg_view_window_update_priority (ModestMsgViewWindow *window)
@@ -904,8 +1266,13 @@ modest_msg_view_window_update_priority (ModestMsgViewWindow *window)
 
        if (priv->header_model) {
                TnyHeader *header;
+               GtkTreeIter iter;
 
-               gtk_tree_model_get (priv->header_model, &(priv->iter), TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+               gtk_tree_model_get_iter (priv->header_model, 
+                                        &iter, 
+                                        gtk_tree_row_reference_get_path (priv->row_reference));
+
+               gtk_tree_model_get (priv->header_model, &iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
                                    &header, -1);
                flags = tny_header_get_flags (header);
        }
@@ -914,16 +1281,573 @@ modest_msg_view_window_update_priority (ModestMsgViewWindow *window)
 
 }
 
+static gboolean
+modest_msg_view_window_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer userdata)
+{
+       if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
+               ModestWindowPrivate *parent_priv;
+               ModestWindowMgr *mgr;
+               gboolean is_fullscreen;
+               GtkAction *fs_toggle_action;
+               gboolean active;
+
+               mgr = modest_runtime_get_window_mgr ();
+               is_fullscreen = (modest_window_mgr_get_fullscreen_mode (mgr))?1:0;
+
+               parent_priv = MODEST_WINDOW_GET_PRIVATE (widget);
+               
+               fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewToggleFullscreenMenu");
+               active = (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action)))?1:0;
+               if (is_fullscreen != active) {
+                       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), is_fullscreen);
+               }
+       }
+
+       return FALSE;
+
+}
+
+void
+modest_msg_view_window_toggle_fullscreen (ModestMsgViewWindow *window)
+{
+               ModestWindowPrivate *parent_priv;
+               GtkAction *fs_toggle_action;
+               parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+               
+               fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewToggleFullscreenMenu");
+               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action),
+                                             !gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action)));
+}
+
 static void
-modest_msg_view_window_toggle_fullscreen (GtkAction *action, ModestWindow *window)
+set_homogeneous (GtkWidget *widget,
+                gpointer data)
+{
+       if (GTK_IS_TOOL_ITEM (widget)) {
+               gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), TRUE);
+               gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), TRUE);
+       }
+}
+
+static void
+modest_msg_view_window_show_toolbar (ModestWindow *self,
+                                    gboolean show_toolbar)
+{
+       ModestMsgViewWindowPrivate *priv = NULL;
+       ModestWindowPrivate *parent_priv;
+       GtkWidget *reply_button = NULL, *menu = NULL;
+       GtkWidget *placeholder = NULL;
+       gint insert_index;
+       
+       parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
+
+       /* Set optimized view status */
+       priv->optimized_view = !show_toolbar;
+
+       if (!parent_priv->toolbar) {
+               parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
+                                                                 "/ToolBar");
+
+               /* Set homogeneous toolbar */
+               gtk_container_foreach (GTK_CONTAINER (parent_priv->toolbar), 
+                                      set_homogeneous, NULL);
+
+               priv->progress_toolitem = GTK_WIDGET (gtk_tool_item_new ());
+               priv->cancel_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarCancel");
+               priv->next_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageNext");
+               priv->prev_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageBack");
+               gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
+               gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
+               gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
+               gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
+
+               /* Add ProgressBar (Transfer toolbar) */ 
+               priv->progress_bar = modest_progress_bar_widget_new ();
+               gtk_widget_set_no_show_all (priv->progress_bar, TRUE);
+               placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ProgressbarView");
+               insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
+               gtk_container_add (GTK_CONTAINER (priv->progress_toolitem), priv->progress_bar);
+               gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (priv->progress_toolitem), insert_index);
+               
+               /* Connect cancel 'clicked' signal to abort progress mode */
+               g_signal_connect(priv->cancel_toolitem, "clicked",
+                                G_CALLBACK(cancel_progressbar),
+                                self);
+               
+               /* Add it to the observers list */
+               priv->progress_widgets = g_slist_prepend(priv->progress_widgets, priv->progress_bar);
+
+               /* Add to window */
+               hildon_window_add_toolbar (HILDON_WINDOW (self), 
+                                          GTK_TOOLBAR (parent_priv->toolbar));
+
+
+               /* Set reply button tap and hold menu */        
+               reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
+                                                         "/ToolBar/ToolbarMessageReply");
+               menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
+                                                 "/ToolbarReplyCSM");
+               gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
+       }
+
+       if (show_toolbar) {
+               /* Quick hack: this prevents toolbar icons "dance" when progress bar show status is changed */ 
+               /* TODO: resize mode migth be GTK_RESIZE_QUEUE, in order to avoid unneccesary shows */
+               gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE);
+               
+               gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
+               set_toolbar_mode (MODEST_MSG_VIEW_WINDOW(self), TOOLBAR_MODE_NORMAL);                   
+       } else {
+               gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE);
+               gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
+       }
+}
+
+static void 
+modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard,
+                                              GdkEvent *event,
+                                              ModestMsgViewWindow *window)
 {
        ModestWindowPrivate *parent_priv;
-       GtkAction *fs_toggle_action;
-       gboolean active;
+/*     GtkAction *action; */
+       gboolean is_address;
+       gchar *selection;
+       GtkWidget *focused;
 
        parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       selection = gtk_clipboard_wait_for_text (clipboard);
+
+       is_address = ((selection != NULL) && (modest_text_utils_validate_recipient (selection)));
+       
+/*     action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsAddToContactsMenu"); */
+/*     gtk_action_set_sensitive (action, is_address); */
+
+       focused = gtk_window_get_focus (GTK_WINDOW (window));
+
+/*     action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditCopyMenu"); */
+/*     gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); */
+
+/*     action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditCutMenu"); */
+/*     gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); */
+
+       g_free (selection);
+/*     modest_msg_view_window_update_dimmed (window); */
+       
+}
+
+static void
+cancel_progressbar (GtkToolButton *toolbutton,
+                   ModestMsgViewWindow *self)
+{
+       GSList *tmp;
+       ModestMsgViewWindowPrivate *priv;
+       
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
+
+       /* Get operation observers and cancel its current operation */
+       tmp = priv->progress_widgets;
+       while (tmp) {
+               modest_progress_object_cancel_current_operation (MODEST_PROGRESS_OBJECT(tmp->data));
+               tmp=g_slist_next(tmp);
+       }
+}
+static gboolean
+observers_empty (ModestMsgViewWindow *self)
+{
+       GSList *tmp = NULL;
+       ModestMsgViewWindowPrivate *priv;
+       gboolean is_empty = TRUE;
+       guint pending_ops = 0;
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
+       tmp = priv->progress_widgets;
+
+       /* Check all observers */
+       while (tmp && is_empty)  {
+               pending_ops = modest_progress_object_num_pending_operations (MODEST_PROGRESS_OBJECT(tmp->data));
+               is_empty = pending_ops == 0;
+               
+               tmp = g_slist_next(tmp);
+       }
+       
+       return is_empty;
+}
+
+
+static void
+on_queue_changed (ModestMailOperationQueue *queue,
+                 ModestMailOperation *mail_op,
+                 ModestMailOperationQueueNotification type,
+                 ModestMsgViewWindow *self)
+{
+       GSList *tmp;
+       ModestMsgViewWindowPrivate *priv;
+       ModestMailOperationTypeOperation op_type;
+       ModestToolBarModes mode;
+       
+       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self));
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
+
+       /* If this operations was created by another window, do nothing */
+       if (!modest_mail_operation_is_mine (mail_op, G_OBJECT(self))) 
+           return;
+
+       /* Get toolbar mode from operation id*/
+       op_type = modest_mail_operation_get_type_operation (mail_op);
+       switch (op_type) {
+       case MODEST_MAIL_OPERATION_TYPE_SEND:
+       case MODEST_MAIL_OPERATION_TYPE_RECEIVE:
+       case MODEST_MAIL_OPERATION_TYPE_OPEN:
+               mode = TOOLBAR_MODE_TRANSFER;
+               break;
+       default:
+               mode = TOOLBAR_MODE_NORMAL;
+               
+       }
+               
+       /* Add operation observers and change toolbar if neccessary*/
+       tmp = priv->progress_widgets;
+       switch (type) {
+       case MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED:
+               if (mode == TOOLBAR_MODE_TRANSFER) {
+                       /* Enable transfer toolbar mode */
+                       set_toolbar_transfer_mode(self);
+                       while (tmp) {
+                               modest_progress_object_add_operation (MODEST_PROGRESS_OBJECT (tmp->data),
+                                                                     mail_op);
+                               tmp = g_slist_next (tmp);
+                       }
+                       
+               }
+               break;
+       case MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED:
+               if (mode == TOOLBAR_MODE_TRANSFER) {
+                       while (tmp) {
+                               modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data),
+                                                                mail_op);
+                               tmp = g_slist_next (tmp);
+                               
+                       }
+
+                       /* If no more operations are being observed, NORMAL mode is enabled again */
+                       if (observers_empty (self)) {
+                               set_toolbar_mode (self, TOOLBAR_MODE_NORMAL);
+                       }
+               }
+               break;
+       }
+}
+
+GList *
+modest_msg_view_window_get_attachments (ModestMsgViewWindow *win) 
+{
+       ModestMsgViewWindowPrivate *priv;
+       GList *selected_attachments = NULL;
+       
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win), NULL);
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (win);
+
+       selected_attachments = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view));
+       
+       return selected_attachments;
+}
+
+void
+modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart *mime_part)
+{
+       ModestMsgViewWindowPrivate *priv;
+       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
+       g_return_if_fail (TNY_IS_MIME_PART (mime_part) || (mime_part == NULL));
+
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+
+       if (mime_part == NULL) {
+               gboolean error = FALSE;
+               GList *selected_attachments = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view));
+               if (selected_attachments == NULL) {
+                       error = TRUE;
+               } else if (g_list_length (selected_attachments) > 1) {
+                       hildon_banner_show_information (NULL, NULL, _("mcen_ib_unable_to_display_more"));
+                       error = TRUE;
+               } else {
+                       mime_part = (TnyMimePart *) selected_attachments->data;
+                       g_object_ref (mime_part);
+               }
+               g_list_foreach (selected_attachments, (GFunc) g_object_unref, NULL);
+               g_list_free (selected_attachments);
+
+               if (error)
+                       return;
+       } else {
+               g_object_ref (mime_part);
+       }
+
+       if (!TNY_IS_MSG (mime_part)) {
+               gchar *filepath = NULL;
+               const gchar *att_filename = tny_mime_part_get_filename (mime_part);
+               gchar *extension = NULL;
+               TnyFsStream *temp_stream = NULL;
+
+               if (att_filename) {
+                       extension = g_strrstr (att_filename, ".");
+                       if (extension != NULL)
+                               extension++;
+               }
+
+               temp_stream = modest_maemo_utils_create_temp_stream (extension, &filepath);
+
+               if (temp_stream) {
+                       const gchar *content_type;
+                       content_type = tny_mime_part_get_content_type (mime_part);
+                       tny_mime_part_decode_to_stream (mime_part, TNY_STREAM (temp_stream));
+                       
+                       modest_platform_activate_file (filepath, content_type);
+                       g_object_unref (temp_stream);
+                       g_free (filepath);
+                       /* TODO: delete temporary file */
+               }
+       } else {
+               /* message attachment */
+               TnyHeader *header = NULL;
+               ModestWindowMgr *mgr;
+               ModestWindow *msg_win = NULL;
+
+               header = tny_msg_get_header (TNY_MSG (mime_part));
+               mgr = modest_runtime_get_window_mgr ();
+               msg_win = modest_window_mgr_find_window_by_header (mgr, header);
+
+               if (!msg_win) {
+                       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 (TNY_MSG (mime_part), account, NULL);
+                       modest_window_mgr_register_window (mgr, msg_win);
+                       gtk_window_set_transient_for (GTK_WINDOW (msg_win), GTK_WINDOW (window));
+               }
+
+               gtk_widget_show_all (GTK_WIDGET (msg_win));
+       }
+       g_object_unref (mime_part);
+}
+
+static gboolean
+save_mime_part_to_file (const gchar *filename, TnyMimePart *mime_part)
+{
+       GnomeVFSResult result;
+       GnomeVFSHandle *handle;
+       TnyStream *stream;
+       
+       result = gnome_vfs_create (&handle, filename, GNOME_VFS_OPEN_WRITE, FALSE, 0777);
+       if (result != GNOME_VFS_OK) {
+               hildon_banner_show_information (NULL, NULL, _("mail_ib_file_operation_failed"));
+               return FALSE;
+       }
+       stream = tny_vfs_stream_new (handle);
+       tny_mime_part_decode_to_stream (mime_part, stream);
+       g_object_unref (G_OBJECT (stream));
+       return TRUE;
+}
+
+static gboolean
+save_mime_part_to_file_with_checks (GtkWindow *parent, const gchar *filename, TnyMimePart *mime_part)
+{
+       if (modest_maemo_utils_file_exists (filename)) {
+               GtkWidget *confirm_overwrite_dialog;
+               confirm_overwrite_dialog = hildon_note_new_confirmation (GTK_WINDOW (parent),
+                                                                        _("emev_nc_replace_files"));
+               if (gtk_dialog_run (GTK_DIALOG (confirm_overwrite_dialog)) != GTK_RESPONSE_OK) {
+                       gtk_widget_destroy (confirm_overwrite_dialog);
+                       return FALSE;
+               }
+               gtk_widget_destroy (confirm_overwrite_dialog);
+       }
+
+       return save_mime_part_to_file (filename, mime_part);
+}
+
+void
+modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, GList *mime_parts)
+{
+       gboolean clean_list = FALSE;
+       ModestMsgViewWindowPrivate *priv;
+       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
+
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+
+       if (mime_parts == NULL) {
+               mime_parts = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view));
+               if (mime_parts == NULL)
+                       return;
+               clean_list = TRUE;
+       }
+
+       if (mime_parts->next == NULL) {
+               /* only one attachment selected */
+               GtkWidget *save_dialog = NULL;
+               TnyMimePart *mime_part = (TnyMimePart *) mime_parts->data;
+               if (!TNY_IS_MSG (mime_part) && tny_mime_part_is_attachment (mime_part)) {
+                       const gchar *filename;
+                       gchar *folder;
+                       save_dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_SAVE);
+                       folder = g_build_filename (g_get_home_dir (), DEFAULT_FOLDER, NULL);
+                       gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (save_dialog), folder);
+                       g_free (folder);
+                       filename = tny_mime_part_get_filename (mime_part);
+                       if (filename != NULL)
+                               gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (save_dialog), filename);
+                       while (gtk_dialog_run (GTK_DIALOG (save_dialog)) == GTK_RESPONSE_OK) {
+                               gchar *filename_tmp = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (save_dialog));
+                               gboolean save_result;
+                               if (!modest_maemo_utils_folder_writable (filename_tmp)) {
+                                       g_free (filename_tmp);
+                                       hildon_banner_show_information (NULL, NULL, _("TODO: read only location"));
+                                       continue;
+                               }
+                               save_result = save_mime_part_to_file_with_checks (GTK_WINDOW (save_dialog), 
+                                                                                 filename_tmp, mime_part);
+                               g_free (filename_tmp);
+                               if (save_result)
+                                       break;
+                               else
+                                       continue;
+                       }
+                       gtk_widget_destroy (save_dialog);
+               } else {
+                       g_warning ("Tried to save a non-file attachment");
+               }
+       } else {
+               GtkWidget *save_dialog = NULL;
+               gchar *folder;
+               gchar *save_multiple_str = g_strdup_printf (_("FIXME: %d attachments"), 
+                                                           g_list_length (mime_parts));
+               save_dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_SAVE);
+               g_object_set (G_OBJECT (save_dialog), "save-multiple", save_multiple_str, NULL);
+               
+               folder = g_build_filename (g_get_home_dir (), DEFAULT_FOLDER, NULL);
+               gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (save_dialog), folder);
+               g_free (folder);
+               if (gtk_dialog_run (GTK_DIALOG (save_dialog)) == GTK_RESPONSE_OK) {
+                       gchar *foldername = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (save_dialog));
+                       GList *node = NULL;
+                       gboolean attachment_found = FALSE;
+                       if (!modest_maemo_utils_folder_writable (foldername)) {
+                               g_free (foldername);
+                               hildon_banner_show_information (NULL, NULL, _("TODO: read only location"));
+                       }
+                       for (node = mime_parts; node != NULL; node = g_list_next (node)) {
+                               TnyMimePart *mime_part = (TnyMimePart *) node->data;
+                               if (tny_mime_part_is_attachment (mime_part)) {
+                                       const gchar *att_filename = tny_mime_part_get_filename (mime_part);
+                                       if (att_filename != NULL) {
+                                               gchar *full_filename;
+                                               gboolean save_result;
+                                               full_filename = g_build_filename (foldername, att_filename, NULL);
+                                               attachment_found = TRUE;
+                                               
+                                               save_result = save_mime_part_to_file_with_checks (GTK_WINDOW (save_dialog), 
+                                                                                                 full_filename, mime_part);
+                                               g_free (full_filename);
+                                               if (!save_result)
+                                                       break;
+                                       }
+                               }
+                       }
+                       gtk_widget_destroy (save_dialog);
+               } else {
+                       g_warning ("Tried to save a non-file attachment");
+               }
+               /* more than one attachment selected */
+       }
+       if (clean_list) {
+               g_list_foreach (mime_parts, (GFunc) g_object_unref, NULL);
+               g_list_free (mime_parts);
+       }
+}
+
+void
+modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window)
+{
+       ModestMsgViewWindowPrivate *priv;
+       GList *mime_parts = NULL, *node;
+       gchar *confirmation_message;
+       gint response;
+       gint n_attachments;
+       TnyMsg *msg;
+/*     TnyFolder *folder; */
+
+       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+
+       mime_parts = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view));
+       if (mime_parts == NULL)
+               return;
+
+       n_attachments = g_list_length (mime_parts);
+       if (n_attachments == 1) {
+               const gchar *filename;
+
+               if (TNY_IS_MSG (mime_parts->data)) {
+                       TnyHeader *header;
+                       header = tny_msg_get_header (TNY_MSG (mime_parts->data));
+                       filename = tny_header_get_subject (header);
+                       g_object_unref (header);
+                       if (filename == NULL)
+                               filename = _("mail_va_no_subject");
+               } else {
+                       filename = tny_mime_part_get_filename (TNY_MIME_PART (mime_parts->data));
+               }
+               confirmation_message = g_strdup_printf (_("mcen_nc_purge_file_text"), filename);
+       } else {
+               confirmation_message = g_strdup_printf (ngettext("mcen_nc_purge_file_text", 
+                                                                "mcen_nc_purge_files_text", 
+                                                                n_attachments), n_attachments);
+       }
+       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window),
+                                                           confirmation_message);
+       g_free (confirmation_message);
+
+       if (response != GTK_RESPONSE_OK)
+               return;
+
+       msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view));
+/*     folder = tny_msg_get_folder (msg); */
+/*     tny_msg_uncache_attachments (msg); */
+/*     tny_folder_refresh (folder, NULL); */
+/*     g_object_unref (folder); */
+       
+       modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg);
+
+       for (node = mime_parts; node != NULL; node = g_list_next (node)) {
+               tny_mime_part_set_purged (TNY_MIME_PART (node->data));
+/*             modest_msg_view_remove_attachment (MODEST_MSG_VIEW (priv->msg_view), node->data); */
+       }
+       tny_msg_rewrite_cache (msg);
+       g_list_foreach (mime_parts, (GFunc) g_object_unref, NULL);
+       g_list_free (mime_parts);
+       modest_platform_information_banner (NULL, NULL, _("mcen_ib_removing_attachment"));
 
-       fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ShowToggleFullscreenMenu");
-       active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action));
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), !active);
 }
+
+
+static void
+update_window_title (ModestMsgViewWindow *window)
+{
+       ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+       TnyMsg *msg = NULL;
+       TnyHeader *header = NULL;
+       const gchar *subject = NULL;
+
+       msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view));
+       if (msg != NULL) {
+               header = tny_msg_get_header (msg);
+               subject = tny_header_get_subject (header);
+               g_object_unref (msg);
+       }
+
+       if ((subject == NULL)||(subject[0] == '\0'))
+               subject = _("mail_va_no_subject");
+
+       gtk_window_set_title (GTK_WINDOW (window), subject);
+}
+