* src/maemo/modest-msg-view-window.c:
[modest] / src / maemo / modest-msg-view-window.c
index 57da7cc..c02403b 100644 (file)
@@ -33,6 +33,7 @@
 #include <tny-msg.h>
 #include <tny-mime-part.h>
 #include <tny-vfs-stream.h>
+#include "modest-marshal.h"
 #include "modest-platform.h"
 #include <modest-maemo-utils.h>
 #include <modest-tny-msg.h>
@@ -52,6 +53,7 @@
 #include <gtkhtml/gtkhtml-search.h>
 #include "modest-ui-dimming-manager.h"
 #include <gdk/gdkkeysyms.h>
+#include <modest-tny-account.h>
 
 #define DEFAULT_FOLDER "MyDocs/.documents"
 
@@ -87,34 +89,39 @@ static void modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboa
                                                           GdkEvent *event,
                                                           ModestMsgViewWindow *window);
 
-static void cancel_progressbar (GtkToolButton *toolbutton,
-                               ModestMsgViewWindow *self);
+static void cancel_progressbar  (GtkToolButton *toolbutton,
+                                ModestMsgViewWindow *self);
 
-static void         on_queue_changed                     (ModestMailOperationQueue *queue,
-                                                         ModestMailOperation *mail_op,
-                                                         ModestMailOperationQueueNotification type,
-                                                         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 on_account_removed  (TnyAccountStore *account_store, 
+                                TnyAccount *account,
+                                gpointer user_data);
 
-static void set_toolbar_mode (ModestMsgViewWindow *self, 
-                             ModestToolBarModes mode);
-
-static gboolean set_toolbar_transfer_mode     (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 void update_window_title (ModestMsgViewWindow *window);
 
+static gboolean set_toolbar_transfer_mode     (ModestMsgViewWindow *self); 
+
 
 /* list my signals */
 enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
+       MSG_CHANGED_SIGNAL,
        LAST_SIGNAL
 };
 
 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 },
+       { "FindInMessage",    MODEST_TOOLBAR_ICON_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 },
 };
 
@@ -151,9 +158,11 @@ struct _ModestMsgViewWindowPrivate {
 
        GtkTreeModel *header_model;
        GtkTreeRowReference *row_reference;
+       GtkTreeRowReference *next_row_reference;
 
        guint clipboard_change_handler;
        guint queue_change_handler;
+       guint account_removed_handler;
 
        guint progress_bar_timeout;
 
@@ -167,7 +176,7 @@ struct _ModestMsgViewWindowPrivate {
 static GtkWindowClass *parent_class = NULL;
 
 /* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
+static guint signals[LAST_SIGNAL] = {0};
 
 GType
 modest_msg_view_window_get_type (void)
@@ -230,6 +239,15 @@ modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass)
        g_type_class_add_private (gobject_class, sizeof(ModestMsgViewWindowPrivate));
 
        modest_window_class->save_state_func = save_state;
+
+       signals[MSG_CHANGED_SIGNAL] =
+               g_signal_new ("msg-changed",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestMsgViewWindowClass, msg_changed),
+                             NULL, NULL,
+                             modest_marshal_VOID__POINTER_POINTER,
+                             G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 }
 
 static void
@@ -241,6 +259,8 @@ modest_msg_view_window_init (ModestMsgViewWindow *obj)
        priv->msg_view      = NULL;
        priv->header_model  = NULL;
        priv->clipboard_change_handler = 0;
+       priv->queue_change_handler = 0;
+       priv->account_removed_handler = 0;
        priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL;
 
        priv->optimized_view  = FALSE;
@@ -404,19 +424,20 @@ init_window (ModestMsgViewWindow *obj, TnyMsg *msg)
        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);
+       modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->main_scroll), TRUE);
 
        gtk_container_add (GTK_CONTAINER (priv->main_scroll), priv->msg_view);
        gtk_box_pack_start (GTK_BOX(main_vbox), priv->main_scroll, TRUE, TRUE, 0);
        gtk_container_add   (GTK_CONTAINER(obj), main_vbox);
 
        priv->find_toolbar = hildon_find_toolbar_new (NULL);
+       hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar));
        gtk_widget_set_no_show_all (priv->find_toolbar, TRUE);
        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);
 
 }      
 
@@ -428,20 +449,25 @@ modest_msg_view_window_finalize (GObject *obj)
 
        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);
+               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);
+               g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), 
+                                            priv->queue_change_handler);
                priv->queue_change_handler = 0;
        }
+       if (priv->account_removed_handler > 0) {
+               g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_account_store ()), 
+                                            priv->account_removed_handler);
+               priv->account_removed_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;
@@ -452,6 +478,11 @@ modest_msg_view_window_finalize (GObject *obj)
                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->msg_uid) {
                g_free (priv->msg_uid);
                priv->msg_uid = NULL;
@@ -460,18 +491,45 @@ modest_msg_view_window_finalize (GObject *obj)
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
-
-
 static gboolean
-on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgViewWindow *self)
+select_next_valid_row (GtkTreeModel *model,
+                      GtkTreeRowReference **row_reference,
+                      gboolean cycle)
 {
-       modest_window_save_state (MODEST_WINDOW (self));
-       return FALSE;
+       GtkTreeIter tmp_iter;
+       GtkTreePath *path, *next;
+       gboolean retval = FALSE;
+
+       g_return_val_if_fail (gtk_tree_row_reference_valid (*row_reference), FALSE);
+
+       path = gtk_tree_row_reference_get_path (*row_reference);
+       gtk_tree_model_get_iter (model, &tmp_iter, path);
+       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;
+               }
+       }
+
+       /* Free */
+       gtk_tree_path_free (path);
+
+       return retval;
 }
 
 ModestWindow *
 modest_msg_view_window_new_with_header_model (TnyMsg *msg, 
-                                             const gchar *account_name,
+                                             const gchar *modest_account_name,
                                              const gchar *msg_uid,
                                              GtkTreeModel *model, 
                                              GtkTreeRowReference *row_reference)
@@ -479,7 +537,7 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg,
        ModestMsgViewWindow *window = NULL;
        ModestMsgViewWindowPrivate *priv = NULL;
 
-       window = MODEST_MSG_VIEW_WINDOW(modest_msg_view_window_new (msg, account_name, msg_uid));
+       window = MODEST_MSG_VIEW_WINDOW(modest_msg_view_window_new (msg, modest_account_name, msg_uid));
        g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL);
 
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
@@ -487,6 +545,8 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg,
        g_object_ref (model);
        priv->header_model = model;
        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);
 
        modest_msg_view_window_update_priority (window);
 
@@ -499,7 +559,7 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg,
 
 ModestWindow *
 modest_msg_view_window_new (TnyMsg *msg, 
-                           const gchar *account_name,
+                           const gchar *modest_account_name,
                            const gchar *msg_uid)
 {
        ModestMsgViewWindow *self = NULL;
@@ -510,6 +570,7 @@ modest_msg_view_window_new (TnyMsg *msg,
        ModestDimmingRulesGroup *toolbar_rules_group = NULL;
        GtkActionGroup *action_group = NULL;
        GError *error = NULL;
+       GdkPixbuf *window_icon;
 
        g_return_val_if_fail (msg, NULL);
        
@@ -526,8 +587,8 @@ modest_msg_view_window_new (TnyMsg *msg,
        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");
+       menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules", FALSE);
+       toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules", TRUE);
 
        /* Add common actions */
        gtk_action_group_add_actions (action_group,
@@ -586,7 +647,14 @@ modest_msg_view_window_new (TnyMsg *msg,
        init_window (MODEST_MSG_VIEW_WINDOW(obj), msg);
        restore_settings (MODEST_MSG_VIEW_WINDOW(obj));
        
-       g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj);
+       /* Set window icon */
+       window_icon = modest_platform_get_icon (MODEST_APP_MSG_VIEW_ICON); 
+       if (window_icon) {
+               gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
+               g_object_unref (window_icon);
+       }
+
+       /* g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj); */
 
        g_signal_connect (G_OBJECT(priv->msg_view), "link_clicked",
                          G_CALLBACK (modest_ui_actions_on_msg_link_clicked), obj);
@@ -613,7 +681,13 @@ modest_msg_view_window_new (TnyMsg *msg,
                                                       G_CALLBACK (on_queue_changed),
                                                       obj);
 
-       modest_window_set_active_account (MODEST_WINDOW(obj), account_name);
+       /* Account manager */
+       priv->account_removed_handler = g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
+                                                         "account_removed",
+                                                         G_CALLBACK(on_account_removed),
+                                                         obj);
+
+       modest_window_set_active_account (MODEST_WINDOW(obj), modest_account_name);
 
        priv->last_search = NULL;
 
@@ -703,28 +777,6 @@ modest_msg_view_window_get_message_uid (ModestMsgViewWindow *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)
@@ -746,9 +798,9 @@ modest_msg_view_window_toggle_find_toolbar (GtkToggleAction *toggle,
 
        /* 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);
+       modest_maemo_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);
+       modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), is_active);
        
 }
 
@@ -771,6 +823,11 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
        gchar *current_search;
        ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj);
 
+       if (modest_msg_view_get_message_is_empty (MODEST_MSG_VIEW (priv->msg_view))) {
+               hildon_banner_show_information (NULL, NULL, _("mail_ib_nothing_to_find"));
+               return;
+       }
+
        g_object_get (G_OBJECT (widget), "prefix", &current_search, NULL);
 
        if ((current_search == NULL) || (strcmp (current_search, "") == 0)) {
@@ -787,6 +844,8 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
                                                 priv->last_search);
                if (!result) {
                        hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_no_matches"));
+                       g_free (priv->last_search);
+                       priv->last_search = NULL;
                } 
        } else {
                if (!modest_msg_view_search_next (MODEST_MSG_VIEW (priv->msg_view))) {
@@ -1021,77 +1080,143 @@ modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window)
        
 }
 
-gboolean        
-modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
+/**
+ * Reads the message whose summary item is @header. It takes care of
+ * several things, among others:
+ *
+ * If the message was not previously downloaded then ask the user
+ * before downloading. If there is no connection launch the connection
+ * dialog. Update toolbar dimming rules.
+ *
+ * Returns: TRUE if the mail operation was started, otherwise if the
+ * user do not want to download the message, or if the user do not
+ * want to connect, then the operation is not issued
+ **/
+static gboolean
+message_reader (ModestMsgViewWindow *window,
+               ModestMsgViewWindowPrivate *priv,
+               TnyHeader *header,
+               GtkTreePath *path)
 {
-       TnyHeaderFlags flags;
        ModestMailOperation *mail_op = NULL;
-       ModestMsgViewWindowPrivate *priv;
-       GtkTreePath *path= NULL;
-       GtkTreeIter tmp_iter;
+       ModestMailOperationTypeOperation op_type;
+       gboolean already_showing = FALSE;
+       ModestWindow *msg_window = NULL;
+       ModestWindowMgr *mgr;
+
+       g_return_val_if_fail (path != NULL, FALSE);
+
+       mgr = modest_runtime_get_window_mgr ();
+       already_showing = modest_window_mgr_find_registered_header (mgr, header, &msg_window);
+       if (already_showing && (msg_window != MODEST_WINDOW (window))) {
+               gboolean retval;
+               if (msg_window)
+                       gtk_window_present (GTK_WINDOW (msg_window));
+               g_signal_emit_by_name (G_OBJECT (window), "delete-event", NULL, &retval);
+               return TRUE;
+       }
 
-       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE);
-       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+       /* Msg download completed */
+       if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED) {
+               op_type = MODEST_MAIL_OPERATION_TYPE_OPEN;
+       } else {
+               TnyFolder *folder;
+               GtkResponseType response;
 
-       if (priv->header_model) {
-               path = gtk_tree_row_reference_get_path (priv->row_reference);
-               if (path == NULL) return FALSE;
+               op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
 
-               gtk_tree_model_get_iter (priv->header_model,
-                                        &tmp_iter,
-                                        path);
-               while (gtk_tree_model_iter_next (priv->header_model, &tmp_iter)) {
-                       TnyHeader *header;
-                       GtkTreePath *path;
+               /* Ask the user if he wants to download the message */
+               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window),
+                                                                   _("mcen_nc_get_msg"));
+               if (response == GTK_RESPONSE_CANCEL)
+                       return FALSE;
+               
+               /* Offer the connection dialog if necessary */
+               /* FIXME: should this stuff go directly to the mail
+                  operation instead of spread it all over the
+                  code? */
+               folder = tny_header_get_folder (header);
+               if (folder) {
+                       if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (folder))) {
+                               g_object_unref (folder);
+                               return FALSE;
+                       }
+                       g_object_unref (folder);
+               }
+       }
 
-                       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;
+       /* New mail operation */
+       mail_op = modest_mail_operation_new_with_error_handling (op_type, 
+                                                                G_OBJECT(window),
+                                                                modest_ui_actions_get_msgs_full_error_handler, 
+                                                                NULL);
+                               
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+       modest_mail_operation_get_msg (mail_op, header, view_msg_cb, path);
+       g_object_unref (mail_op);
 
-                       /* 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);
+       /* Update toolbar dimming rules */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
 
-                       /* Mark as read */
-                       flags = tny_header_get_flags (header);
-                       if (!(flags & TNY_HEADER_FLAG_SEEN))
-                               tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+       return TRUE;
+}
 
-                       /* 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);
+gboolean        
+modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
+{
+       ModestMsgViewWindowPrivate *priv;
+       GtkTreePath *path= NULL;
+       GtkTreeIter tmp_iter;
+       TnyHeader *header;
+       gboolean retval = TRUE;
 
-                       /* Update toolbar dimming rules */
-                       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE);
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 
-                       return TRUE;
+       /* Update the next row reference if it's not valid. This could
+          happen if for example the header which it was pointing to,
+          was deleted. The best place to do it is in the row-deleted
+          handler but the tinymail model do not work like the glib
+          tree models and reports the deletion when the row is still
+          there */
+       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);
                }
+       }
+       if (priv->next_row_reference)
+               path = gtk_tree_row_reference_get_path (priv->next_row_reference);
+       if (path == NULL)
+               return FALSE;
+
+       gtk_tree_model_get_iter (priv->header_model,
+                                &tmp_iter,
+                                path);
+
+       gtk_tree_model_get (priv->header_model, &tmp_iter, 
+                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                           &header, -1);
+       
+       /* Read the message & show it */
+       if (!message_reader (window, priv, header, path)) {
+               retval = FALSE;
                gtk_tree_path_free (path);
        }
-       return FALSE;           
+
+       /* Free */
+       g_object_unref (header);
+
+       return retval;          
 }
 
 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;
+       GtkTreePath *path;
 
        g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
@@ -1105,37 +1230,16 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *self)
                            &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);
+       path = gtk_tree_model_get_path (priv->header_model, &iter);
        
-       /* 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));
+       /* Read the message & show it */
+       message_reader (self, priv, header, path);
        
        /* Free */
        g_object_unref (header);
@@ -1146,10 +1250,8 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *self)
 gboolean        
 modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window)
 {
-       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);
@@ -1174,27 +1276,11 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window)
                        continue;
                }
 
-               /* 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));
+               /* Read the message & show it */
+               if (!message_reader (window, priv, header, path)) {
+                       g_object_unref (header);
+                       break;
+               }
 
                g_object_unref (header);
 
@@ -1213,21 +1299,47 @@ view_msg_cb (ModestMailOperation *mail_op,
 {
        ModestMsgViewWindow *self = NULL;
        ModestMsgViewWindowPrivate *priv = NULL;
+       GtkTreePath *path;
 
-       g_return_if_fail (TNY_IS_MSG (msg));
+       /* If there was any error */
+       path = (GtkTreePath *) user_data;
+       if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) {
+               gtk_tree_path_free (path);                      
+               return;
+       }
 
        /* 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);
 
+       /* Update the row reference */
+       gtk_tree_row_reference_free (priv->row_reference);
+       priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path);
+       priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
+       select_next_valid_row (priv->header_model, &(priv->next_row_reference), TRUE);
+       gtk_tree_path_free (path);
+
+       /* Mark header as read */
+       if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN))
+               tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+
        /* 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));
 
+       /* Set the new message uid of the window  */
+       if (priv->msg_uid) {
+               g_free (priv->msg_uid);
+               priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
+       }
+
+       /* Notify the observers */
+       g_signal_emit (G_OBJECT (self), signals[MSG_CHANGED_SIGNAL], 
+                      0, priv->header_model, priv->row_reference);
+
        /* Free new references */
        g_object_unref (self);
 }
@@ -1430,6 +1542,9 @@ modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard,
        gchar *selection;
        GtkWidget *focused;
 
+       if (!GTK_WIDGET_VISIBLE (window))
+               return;
+
        parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        selection = gtk_clipboard_wait_for_text (clipboard);
 
@@ -1500,6 +1615,25 @@ observers_empty (ModestMsgViewWindow *self)
        return is_empty;
 }
 
+static void
+on_account_removed (TnyAccountStore *account_store, 
+                   TnyAccount *account,
+                   gpointer user_data)
+{
+       /* Do nothing if it's a transport account, because we only
+          show the messages of a store account */
+       if (tny_account_get_account_type(account) == TNY_ACCOUNT_TYPE_STORE) {
+               const gchar *parent_acc = NULL;
+               const gchar *our_acc = NULL;
+
+               our_acc = modest_window_get_active_account (MODEST_WINDOW (user_data));
+               parent_acc = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+
+               /* Close this window if I'm showing a message of the removed account */
+               if (strcmp (parent_acc, our_acc) == 0)
+                       modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (user_data));
+       }
+}
 
 static void
 on_queue_changed (ModestMailOperationQueue *queue,
@@ -1522,7 +1656,7 @@ on_queue_changed (ModestMailOperationQueue *queue,
        /* 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_SEND: */
        case MODEST_MAIL_OPERATION_TYPE_RECEIVE:
        case MODEST_MAIL_OPERATION_TYPE_OPEN:
                mode = TOOLBAR_MODE_TRANSFER;
@@ -1672,48 +1806,133 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart
        g_object_unref (mime_part);
 }
 
+typedef struct
+{
+       gchar *filename;
+       TnyMimePart *part;
+} SaveMimePartPair;
+
+typedef struct
+{
+       GList *pairs;
+       GtkWidget *banner;
+       gboolean result;
+} SaveMimePartInfo;
+
+static void save_mime_part_info_free (SaveMimePartInfo *info, gboolean with_struct);
+static gboolean idle_save_mime_part_show_result (SaveMimePartInfo *info);
+static gpointer save_mime_part_to_file (SaveMimePartInfo *info);
+static void save_mime_parts_to_file_with_checks (SaveMimePartInfo *info);
+
+static void 
+save_mime_part_info_free (SaveMimePartInfo *info, gboolean with_struct)
+{
+       
+       GList *node;
+       for (node = info->pairs; node != NULL; node = g_list_next (node)) {
+               SaveMimePartPair *pair = (SaveMimePartPair *) node->data;
+               g_free (pair->filename);
+               g_object_unref (pair->part);
+               g_slice_free (SaveMimePartPair, pair);
+       }
+       g_list_free (info->pairs);
+       info->pairs = NULL;
+       if (with_struct) {
+               gtk_widget_destroy (info->banner);
+               g_object_unref (info->banner);
+               g_slice_free (SaveMimePartInfo, info);
+       }
+}
+
 static gboolean
-save_mime_part_to_file (const gchar *filename, TnyMimePart *mime_part)
+idle_save_mime_part_show_result (SaveMimePartInfo *info)
+{
+       if (info->pairs != NULL) {
+               gdk_threads_enter ();
+               save_mime_parts_to_file_with_checks (info);
+               gdk_threads_leave ();
+       } else {
+               gboolean result;
+               result = info->result;
+
+               gdk_threads_enter ();
+               save_mime_part_info_free (info, TRUE);
+               if (result) {
+                       hildon_banner_show_information (NULL, NULL, _CS("sfil_ib_saved"));
+               } else {
+                       hildon_banner_show_information (NULL, NULL, _("mail_ib_file_operation_failed"));
+               }
+               gdk_threads_leave ();
+       }
+
+       return FALSE;
+}
+
+static gpointer
+save_mime_part_to_file (SaveMimePartInfo *info)
 {
        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;
+       SaveMimePartPair *pair = (SaveMimePartPair *) info->pairs->data;
+
+       result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0777);
+       if (result == GNOME_VFS_OK) {
+               stream = tny_vfs_stream_new (handle);
+               tny_mime_part_decode_to_stream (pair->part, stream);
+               g_object_unref (G_OBJECT (stream));
+               g_object_unref (pair->part);
+               g_slice_free (SaveMimePartPair, pair);
+               info->pairs = g_list_delete_link (info->pairs, info->pairs);
+               info->result = TRUE;
+       } else {
+               save_mime_part_info_free (info, FALSE);
+               info->result = FALSE;
        }
-       stream = tny_vfs_stream_new (handle);
-       tny_mime_part_decode_to_stream (mime_part, stream);
-       g_object_unref (G_OBJECT (stream));
-       return TRUE;
+
+       g_idle_add ((GSourceFunc) idle_save_mime_part_show_result, info);
+       return NULL;
 }
 
-static gboolean
-save_mime_part_to_file_with_checks (GtkWindow *parent, const gchar *filename, TnyMimePart *mime_part)
+static void
+save_mime_parts_to_file_with_checks (SaveMimePartInfo *info)
 {
-       if (modest_maemo_utils_file_exists (filename)) {
+       SaveMimePartPair *pair;
+       gboolean is_ok = TRUE;
+
+       pair = info->pairs->data;
+       if (modest_maemo_utils_file_exists (pair->filename)) {
                GtkWidget *confirm_overwrite_dialog;
-               confirm_overwrite_dialog = hildon_note_new_confirmation (GTK_WINDOW (parent),
+               confirm_overwrite_dialog = hildon_note_new_confirmation (NULL,
                                                                         _("emev_nc_replace_files"));
                if (gtk_dialog_run (GTK_DIALOG (confirm_overwrite_dialog)) != GTK_RESPONSE_OK) {
-                       gtk_widget_destroy (confirm_overwrite_dialog);
-                       return FALSE;
+                       is_ok = FALSE;
                }
                gtk_widget_destroy (confirm_overwrite_dialog);
        }
 
-       return save_mime_part_to_file (filename, mime_part);
+       if (!is_ok) {
+               save_mime_part_info_free (info, TRUE);
+       } else {
+               g_thread_create ((GThreadFunc)save_mime_part_to_file, info, FALSE, NULL);
+       }
+
 }
 
+
 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));
+       GList *files_to_save = NULL;
+       GtkWidget *save_dialog = NULL;
+       gchar *folder = NULL;
+       gboolean canceled = FALSE;
+       const gchar *filename = NULL;
+       gchar *save_multiple_str = NULL;
 
+       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 
        if (mime_parts == NULL) {
@@ -1723,87 +1942,92 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, GList *mim
                clean_list = TRUE;
        }
 
+       /* prepare dialog */
        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");
+                       canceled = TRUE;
                }
        } 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);
+               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);
+
+       /* set folder */
+       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);
+
+       /* set filename */
+       if (filename != NULL)
+               gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (save_dialog), 
+                                                  filename);
+
+       /* if multiple, set multiple string */
+       if (save_multiple_str) {
                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));
+       /* 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_maemo_utils_folder_writable (chooser_uri)) {
+                       hildon_banner_show_information 
+                               (NULL, NULL, dgettext("hildon-fm", "sfil_ib_readonly_location"));
+               } else {
                        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;
+                                       SaveMimePartPair *pair;
+
+                                       if ((mime_parts->next != NULL) &&
+                                           (tny_mime_part_get_filename (mime_part) == NULL))
+                                               continue;
+                                       
+                                       pair = g_slice_new0 (SaveMimePartPair);
+                                       if (mime_parts->next == NULL) {
+                                               pair->filename = g_strdup (chooser_uri);
+                                       } else {
+                                               pair->filename = 
+                                                       g_build_filename (chooser_uri,
+                                                                         tny_mime_part_get_filename (mime_part), NULL);
                                        }
+                                       pair->part = g_object_ref (mime_part);
+                                       files_to_save = g_list_prepend (files_to_save, pair);
                                }
                        }
-                       gtk_widget_destroy (save_dialog);
-               } else {
-                       g_warning ("Tried to save a non-file attachment");
                }
-               /* more than one attachment selected */
+               g_free (chooser_uri);
        }
+
+       gtk_widget_destroy (save_dialog);
+
        if (clean_list) {
                g_list_foreach (mime_parts, (GFunc) g_object_unref, NULL);
                g_list_free (mime_parts);
        }
+
+       if (files_to_save != NULL) {
+               SaveMimePartInfo *info = g_slice_new0 (SaveMimePartInfo);
+               GtkWidget *banner = hildon_banner_show_animation (NULL, NULL, 
+                                                                 _CS("sfil_ib_saving"));
+               info->pairs = files_to_save;
+               info->banner = banner;
+               info->result = TRUE;
+               g_object_ref (banner);
+               save_mime_parts_to_file_with_checks (info);
+       }
 }
 
 void
@@ -1913,5 +2137,3 @@ update_window_title (ModestMsgViewWindow *window)
 
        gtk_window_set_title (GTK_WINDOW (window), subject);
 }
-
-