* Added new folder dialog
[modest] / src / modest-ui-actions.c
index a3f91a1..cc73773 100644 (file)
 #include <glib/gi18n.h>
 #include <string.h>
 #include <modest-runtime.h>
+#include <modest-tny-folder.h>
+#include <modest-tny-msg.h>
+#include <modest-tny-account.h>
+#include <modest-address-book.h>
+
 #include "modest-ui-actions.h"
+
 #include "modest-tny-platform-factory.h"
+#include "modest-platform.h"
 
 #include <widgets/modest-main-window.h>
-#include "modest-account-view-window.h"
 #include <widgets/modest-msg-view-window.h>
+#include <widgets/modest-account-view-window.h>
+#include <widgets/modest-details-dialog.h>
 
 #include "modest-account-mgr-helpers.h"
 #include "modest-mail-operation.h"
+#include "modest-text-utils.h"
+
+#ifdef MODEST_HAVE_EASYSETUP
+#include "easysetup/modest-easysetup-wizard.h"
+#endif /*MODEST_HAVE_EASYSETUP*/
+
 #include <modest-widget-memory.h>
 #include <tny-error.h>
 #include <tny-simple-list.h>
 #include <tny-msg-view.h>
 #include <tny-device.h>
 
-
 typedef struct _GetMsgAsyncHelper {
-       ModestMainWindow *main_window;
+       ModestWindow *window;
        TnyIterator *iter;
        GFunc func;
        gpointer user_data;
@@ -66,7 +79,7 @@ typedef enum _ReplyForwardAction {
 typedef struct _ReplyForwardHelper {
 guint reply_forward_type;
        ReplyForwardAction action;
-       gchar *from;
+       gchar *account_name;
 } ReplyForwardHelper;
 
 
@@ -74,16 +87,13 @@ static void     reply_forward_func     (gpointer data, gpointer user_data);
 static void     read_msg_func          (gpointer data, gpointer user_data);
 static void     get_msg_cb             (TnyFolder *folder, TnyMsg *msg,        GError **err, 
                                        gpointer user_data);
-
-static void     reply_forward          (GtkWidget *widget, ReplyForwardAction action,
-                                       ModestMainWindow *main_window);
+static void     reply_forward          (ReplyForwardAction action, ModestWindow *win);
 
 static gchar*   ask_for_folder_name    (GtkWindow *parent_window, const gchar *title);
 
 
 void   
-modest_ui_actions_on_about (GtkWidget *widget, 
-                            ModestMainWindow *main_window)
+modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
 {
        GtkWidget *about;
        const gchar *authors[] = {
@@ -103,28 +113,53 @@ modest_ui_actions_on_about (GtkWidget *widget,
                                         "uses the tinymail email framework written by Philip van Hoof"));
        gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(about), authors);
        gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(about), "http://modest.garage.maemo.org");
-
+       
        gtk_dialog_run (GTK_DIALOG (about));
        gtk_widget_destroy(about);
 }
 
+
+static TnyList *
+get_selected_headers (ModestWindow *win)
+{
+       if (MODEST_IS_MAIN_WINDOW(win)) {
+               GtkWidget *header_view;         
+               
+               header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
+                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+               return modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view));
+               
+       } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+               /* for MsgViewWindows, we simply return a list with one element */
+               TnyMsg *msg;
+               TnyHeader *header;
+               TnyList *list = NULL;
+               
+               msg  = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW(win));
+               if (msg) {
+                       header = tny_msg_get_header (msg);
+                       list = tny_simple_list_new ();
+                       tny_list_prepend (list, G_OBJECT(header));
+                       g_object_unref (G_OBJECT(header));
+               }
+               return list;
+
+       } else
+               return NULL;
+}
+
 void
-modest_ui_actions_on_delete (GtkWidget *widget, ModestMainWindow *main_window)
+modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 {
        TnyList *header_list;
        TnyIterator *iter;
-       GtkTreeModel *model;
 
-       if (!main_window->header_view)
-               return;
-       
-       header_list = modest_header_view_get_selected_headers (main_window->header_view);
+       g_return_if_fail (MODEST_IS_WINDOW(win));
+               
+       header_list = get_selected_headers (win);
        
        if (header_list) {
                iter = tny_list_create_iterator (header_list);
-               model = gtk_tree_view_get_model (GTK_TREE_VIEW (main_window->header_view));
-               if (GTK_IS_TREE_MODEL_SORT (model))
-                       model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model));
                do {
                        TnyHeader *header;
                        ModestMailOperation *mail_op;
@@ -132,71 +167,200 @@ modest_ui_actions_on_delete (GtkWidget *widget, ModestMainWindow *main_window)
                        header = TNY_HEADER (tny_iterator_get_current (iter));
                        /* TODO: thick grain mail operation involving
                           a list of objects. Composite pattern ??? */
-                       mail_op = modest_mail_operation_new ();
-
                        /* TODO: add confirmation dialog */
+                       mail_op = modest_mail_operation_new ();
+                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                                        mail_op);
 
-                       /* Move to trash */
-                       modest_mail_operation_remove_msg (mail_op, header, TRUE);
-
-                       /* Remove from tree model */
-                       if (modest_mail_operation_get_status (mail_op) == 
-                           MODEST_MAIL_OPERATION_STATUS_SUCCESS)
-                               tny_list_remove (TNY_LIST (model), G_OBJECT (header));
-                       else {
-                               /* TODO: error handling management */
-                               const GError *error;
-                               error = modest_mail_operation_get_error (mail_op);
-                               g_warning (error->message);
-                       }
+                       /* Always delete. TODO: Move to trash still not supported */
+                       modest_mail_operation_remove_msg (mail_op, header, FALSE);
 
+                       /* Frees */
                        g_object_unref (G_OBJECT (mail_op));
-                       g_object_unref (header);
+                       g_object_unref (G_OBJECT (header));
+
                        tny_iterator_next (iter);
 
                } while (!tny_iterator_is_done (iter));
+
+               /* Free iter */
+               g_object_unref (G_OBJECT (iter));
        }
+
+       if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+               gtk_widget_destroy (GTK_WIDGET(win));
+       } 
+}
+
+
+void
+modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
+{
+       gtk_main_quit ();
 }
 
 void
-modest_ui_actions_on_quit (GtkWidget *widget, 
-                          ModestMainWindow *main_window)
+modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win)
 {
-       /* FIXME: save size of main window */
-/*     save_sizes (main_window); */
-       gtk_widget_destroy (GTK_WIDGET (main_window));
+       if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+               gtk_widget_destroy (GTK_WIDGET (win));
+       } else if (MODEST_IS_WINDOW (win)) {
+               gtk_widget_destroy (GTK_WIDGET (win));
+       } else {
+               g_return_if_reached ();
+       }
 }
 
 void
-modest_ui_actions_on_accounts (GtkWidget *widget, 
-                               ModestMainWindow *main_window)
+modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win)
 {
-       GtkWidget *account_win;
-       account_win = modest_account_view_window_new ();
+       GtkClipboard *clipboard = NULL;
+       gchar *selection = NULL;
+
+       clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+       selection = gtk_clipboard_wait_for_text (clipboard);
+
+       modest_address_book_add_address (selection);
+       g_free (selection);
+}
 
-       gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW (main_window));
-       gtk_widget_show (account_win);
+void
+modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
+{
+       
+       /* This is currently only implemented for Maemo,
+        * because it requires a providers preset file which is not publically available.
+        */
+#ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
+       GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr());
+       gboolean accounts_exist = account_names != NULL;
+       g_slist_free (account_names);
+       
+/* To test, while modest_account_mgr_account_names() is broken: accounts_exist = TRUE; */
+       if (!accounts_exist) {
+               /* If there are no accounts yet, just show the easy-setup wizard, as per the UI spec: */
+               ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new ();
+               gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
+               gtk_dialog_run (GTK_DIALOG (wizard));
+               gtk_widget_destroy (GTK_WIDGET (wizard));
+       } else  {
+               /* Show the list of accounts: */
+               GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ());
+               gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW(win));
+               gtk_dialog_run (account_win);
+               gtk_widget_destroy (GTK_WIDGET(account_win));
+       }
+#else
+       GtkWidget *dialog, *label;
+       
+       /* Create the widgets */
+       
+       dialog = gtk_dialog_new_with_buttons ("Message",
+                                             GTK_WINDOW(win),
+                                             GTK_DIALOG_DESTROY_WITH_PARENT,
+                                             GTK_STOCK_OK,
+                                             GTK_RESPONSE_NONE,
+                                             NULL);
+       label = gtk_label_new ("Hello World!");
+       
+       /* Ensure that the dialog box is destroyed when the user responds. */
+       
+       g_signal_connect_swapped (dialog, "response", 
+                                 G_CALLBACK (gtk_widget_destroy),
+                                 dialog);
+       
+       /* Add the label, and show everything we've added to the dialog. */
+       
+       gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
+                          label);
+       gtk_widget_show_all (dialog);
+#endif /* MODEST_PLATFORM_MAEMO */
 }
 
 void
-modest_ui_actions_on_new_msg (GtkWidget *widget, 
-                              ModestMainWindow *main_window)
+modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 {
        ModestWindow *msg_win;
-       msg_win = modest_msg_edit_window_new (MODEST_EDIT_TYPE_NEW);
+       TnyMsg *msg = NULL;
+       TnyFolder *folder = NULL;
+       gchar *account_name = NULL;
+       gchar *from_str = NULL;
+       GError *err = NULL;
+       TnyAccount *account = NULL;
+       ModestWindowMgr *mgr;
+       
+       account_name = g_strdup(modest_window_get_active_account (win));
+       if (!account_name)
+               account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+       if (!account_name) {
+               g_printerr ("modest: no account found\n");
+               goto cleanup;
+       }
+       
+       account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+                                                                      account_name,
+                                                                      TNY_ACCOUNT_TYPE_STORE);
+       if (!account) {
+               g_printerr ("modest: failed to get tnyaccount for '%s'\n", account_name);
+               goto cleanup;
+       }
+
+       from_str = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), account_name);
+       if (!from_str) {
+               g_printerr ("modest: failed get from string for '%s'\n", account_name);
+               goto cleanup;
+       }
+
+       msg = modest_tny_msg_new ("", from_str, "", "", "", "", NULL);
+       if (!msg) {
+               g_printerr ("modest: failed to create new msg\n");
+               goto cleanup;
+       }
+       
+       folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS);
+       if (!folder) {
+               g_printerr ("modest: failed to find Drafts folder\n");
+               goto cleanup;
+       }
+       
+       tny_folder_add_msg (folder, msg, &err);
+       if (err) {
+               g_printerr ("modest: error adding msg to Drafts folder: %s",
+                           err->message);
+               g_error_free (err);
+               goto cleanup;
+       }
+
+       /* Create and register edit window */
+       msg_win = modest_msg_edit_window_new (msg, account_name);
+       mgr = modest_runtime_get_window_mgr ();
+       modest_window_mgr_register_window (mgr, msg_win);
+
+       if (win)
+               gtk_window_set_transient_for (GTK_WINDOW (msg_win),
+                                             GTK_WINDOW (win));        
        gtk_widget_show_all (GTK_WIDGET (msg_win));
+
+cleanup:
+       g_free (account_name);
+       g_free (from_str);
+       if (account)
+               g_object_unref (G_OBJECT(account));
+       if (msg)
+               g_object_unref (G_OBJECT(msg));
+       if (folder)
+               g_object_unref (G_OBJECT(folder));
 }
 
 
 void
-modest_ui_actions_on_open (GtkWidget *widget,
-                           ModestMainWindow *main_window)
+modest_ui_actions_on_open (GtkAction *action, ModestWindow *win)
 {
-       /* FIXME */
-       
+       modest_runtime_not_implemented (GTK_WINDOW(win)); /* FIXME */
 }
 
 
+
 static void
 reply_forward_func (gpointer data, gpointer user_data)
 {
@@ -205,171 +369,346 @@ reply_forward_func (gpointer data, gpointer user_data)
        ReplyForwardHelper *rf_helper;
        ModestWindow *msg_win;
        ModestEditType edit_type;
-
+       gchar *from;
+       GError *err = NULL;
+       TnyFolder *folder = NULL;
+       TnyAccount *account = NULL;
+       ModestWindowMgr *mgr;
+       
        msg = TNY_MSG (data);
        helper = (GetMsgAsyncHelper *) user_data;
        rf_helper = (ReplyForwardHelper *) helper->user_data;
 
+       from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
+                                                  rf_helper->account_name);
        /* Create reply mail */
        switch (rf_helper->action) {
        case ACTION_REPLY:
                new_msg = 
-                       modest_mail_operation_create_reply_mail (msg, 
-                                                                rf_helper->from, 
-                                                                rf_helper->reply_forward_type,
-                                                                MODEST_MAIL_OPERATION_REPLY_MODE_SENDER);
+                       modest_tny_msg_create_reply_msg (msg,  from, 
+                                                        rf_helper->reply_forward_type,
+                                                        MODEST_TNY_MSG_REPLY_MODE_SENDER);
                break;
        case ACTION_REPLY_TO_ALL:
                new_msg = 
-                       modest_mail_operation_create_reply_mail (msg, rf_helper->from, rf_helper->reply_forward_type,
-                                                                MODEST_MAIL_OPERATION_REPLY_MODE_ALL);
+                       modest_tny_msg_create_reply_msg (msg, from, rf_helper->reply_forward_type,
+                                                        MODEST_TNY_MSG_REPLY_MODE_ALL);
                edit_type = MODEST_EDIT_TYPE_REPLY;
                break;
        case ACTION_FORWARD:
                new_msg = 
-                       modest_mail_operation_create_forward_mail (msg, rf_helper->from, rf_helper->reply_forward_type);
+                       modest_tny_msg_create_forward_msg (msg, from, rf_helper->reply_forward_type);
                edit_type = MODEST_EDIT_TYPE_FORWARD;
                break;
        default:
                g_return_if_reached ();
+               return;
        }
 
        if (!new_msg) {
-               g_warning ("Unable to create a message");
+               g_printerr ("modest: failed to create message\n");
                goto cleanup;
        }
-               
+
+       account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+                                                                      rf_helper->account_name,
+                                                                      TNY_ACCOUNT_TYPE_STORE);
+       if (!account) {
+               g_printerr ("modest: failed to get tnyaccount for '%s'\n", rf_helper->account_name);
+               goto cleanup;
+       }
+
+       folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS);
+       if (!folder) {
+               g_printerr ("modest: failed to find Drafts folder\n");
+               goto cleanup;
+       }
+       
+       tny_folder_add_msg (folder, msg, &err);
+       if (err) {
+               g_printerr ("modest: error adding msg to Drafts folder: %s",
+                           err->message);
+               g_error_free (err);
+               goto cleanup;
+       }       
+
+       /* Create and register the windows */                   
+       msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name);
+       mgr = modest_runtime_get_window_mgr ();
+       modest_window_mgr_register_window (mgr, msg_win);
+
        /* Show edit window */
-       msg_win = modest_msg_edit_window_new (MODEST_EDIT_TYPE_NEW);
-       modest_msg_edit_window_set_msg (MODEST_MSG_EDIT_WINDOW (msg_win),
-                                       new_msg);
        gtk_widget_show_all (GTK_WIDGET (msg_win));
-       
-       /* Clean */
-       g_object_unref (G_OBJECT (new_msg));
 
- cleanup:
-       g_free (rf_helper->from);
+cleanup:
+       if (new_msg)
+               g_object_unref (G_OBJECT (new_msg));
+       if (folder)
+               g_object_unref (G_OBJECT (folder));
+       if (account)
+               g_object_unref (G_OBJECT (account));
+       
+       g_free (rf_helper->account_name);
        g_slice_free (ReplyForwardHelper, rf_helper);
 }
-
 /*
  * Common code for the reply and forward actions
  */
 static void
-reply_forward (GtkWidget *widget, ReplyForwardAction action,
-              ModestMainWindow *main_window)
+reply_forward (ReplyForwardAction action, ModestWindow *win)
 {
-       ModestAccountMgr *account_mgr;
        TnyList *header_list;
        guint reply_forward_type;
-       ModestConf *conf;       
-       ModestAccountData *default_account_data;
        TnyHeader *header;
        TnyFolder *folder;
-       gchar *from, *key, *default_account_name;
        GetMsgAsyncHelper *helper;
        ReplyForwardHelper *rf_helper;
+       
+       g_return_if_fail (MODEST_IS_WINDOW(win));
 
-       if (!main_window->header_view)
-               return;
-
-       header_list = modest_header_view_get_selected_headers (main_window->header_view);       
+       header_list = get_selected_headers (win);
        if (!header_list)
                return;
-
-       conf = modest_runtime_get_conf ();
        
-       /* Get reply or forward type */
-       key = g_strdup_printf ("%s/%s", MODEST_CONF_NAMESPACE, 
-                              (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE);
-       reply_forward_type = modest_conf_get_int (conf, key, NULL);
-       g_free (key);
-
+       reply_forward_type = modest_conf_get_int (modest_runtime_get_conf (),
+                                                 (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE,
+                                                 NULL);
        /* We assume that we can only select messages of the
           same folder and that we reply all of them from the
           same account. In fact the interface currently only
           allows single selection */
-       account_mgr = modest_runtime_get_account_mgr();
-       default_account_name = modest_account_mgr_get_default_account (account_mgr);
-       default_account_data = 
-               modest_account_mgr_get_account_data (account_mgr,
-                                                    (const gchar*) default_account_name);
-       from = g_strdup (default_account_data->email);
-       modest_account_mgr_free_account_data (account_mgr, default_account_data);
-       g_free (default_account_name);
        
        /* Fill helpers */
        rf_helper = g_slice_new0 (ReplyForwardHelper);
        rf_helper->reply_forward_type = reply_forward_type;
        rf_helper->action = action;
-       rf_helper->from = from;
-       
+
+       rf_helper->account_name = g_strdup (modest_window_get_active_account (win));
+       if (!rf_helper->account_name)
+               rf_helper->account_name =
+                       modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+
        helper = g_slice_new0 (GetMsgAsyncHelper);
-       helper->main_window = main_window;
+       helper->window = win;
        helper->func = reply_forward_func;
        helper->iter = tny_list_create_iterator (header_list);
        helper->user_data = rf_helper;
-       
-       header = TNY_HEADER (tny_iterator_get_current (helper->iter));
-       folder = tny_header_get_folder (header);
-       
-       /* The callback will call it per each header */
-       tny_folder_get_msg_async (folder, header, get_msg_cb, helper);
-       
-       /* Clean */
-       g_object_unref (G_OBJECT (header));
-       g_object_unref (G_OBJECT (folder));
+
+       if (MODEST_IS_MSG_VIEW_WINDOW(win)) {
+               TnyMsg *msg;
+               msg = modest_msg_view_window_get_message(MODEST_MSG_VIEW_WINDOW(win));
+               if (!msg) {
+                       g_printerr ("modest: no message found\n");
+                       return;
+               } else
+                       reply_forward_func (msg, helper);
+       } else {
+               header = TNY_HEADER (tny_iterator_get_current (helper->iter));
+               folder = tny_header_get_folder (header);
+               if (folder) {
+                       /* The callback will call it per each header */
+                       tny_folder_get_msg_async (folder, header, get_msg_cb, NULL, helper);
+                       g_object_unref (G_OBJECT (folder));
+               } else 
+                       g_printerr ("modest: no folder for header\n");
+               
+               /* Clean */
+               g_object_unref (G_OBJECT (header));
+       }
 }
 
+
 void
-modest_ui_actions_on_reply (GtkWidget *widget, ModestMainWindow *main_window)
+modest_ui_actions_on_reply (GtkAction *action, ModestWindow *win)
 {
-       reply_forward (widget, ACTION_REPLY, main_window);
+       g_return_if_fail (MODEST_IS_WINDOW(win));
+
+       reply_forward (ACTION_REPLY, win);
 }
 
 void
-modest_ui_actions_on_forward (GtkWidget *widget, ModestMainWindow *main_window)
+modest_ui_actions_on_forward (GtkAction *action, ModestWindow *win)
 {
-       reply_forward (widget, ACTION_FORWARD, main_window);
+       g_return_if_fail (MODEST_IS_WINDOW(win));
+
+       reply_forward (ACTION_FORWARD, win);
 }
 
 void
-modest_ui_actions_on_reply_all (GtkWidget *widget,ModestMainWindow *main_window)
+modest_ui_actions_on_reply_all (GtkAction *action, ModestWindow *win)
+{
+       g_return_if_fail (MODEST_IS_WINDOW(win));
+
+       reply_forward (ACTION_REPLY_TO_ALL, win);
+}
+
+void 
+modest_ui_actions_on_next (GtkAction *action, 
+                          ModestWindow *window)
+{
+       if (MODEST_IS_MAIN_WINDOW (window)) {
+               GtkWidget *header_view;
+
+               header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window),
+                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+               if (!header_view)
+                       return;
+       
+               modest_header_view_select_next (MODEST_HEADER_VIEW(header_view)); 
+       } else if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
+               modest_msg_view_window_select_next_message (MODEST_MSG_VIEW_WINDOW (window));
+       } else {
+               g_return_if_reached ();
+       }
+}
+
+void 
+modest_ui_actions_on_prev (GtkAction *action, 
+                          ModestWindow *window)
 {
-       reply_forward (widget, ACTION_REPLY_TO_ALL, main_window);
+       g_return_if_fail (MODEST_IS_WINDOW(window));
+
+       if (MODEST_IS_MAIN_WINDOW (window)) {
+               GtkWidget *header_view;
+               header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window),
+                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+               if (!header_view)
+                       return;
+               
+               modest_header_view_select_prev (MODEST_HEADER_VIEW(header_view)); 
+       } else if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
+               modest_msg_view_window_select_previous_message (MODEST_MSG_VIEW_WINDOW (window));
+       } else {
+               g_return_if_reached ();
+       }
 }
 
 void 
-modest_ui_actions_on_next (GtkWidget *widget, 
-                          ModestMainWindow *main_window)
+modest_ui_actions_on_sort (GtkAction *action, 
+                          ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW(window));
+       /* FIXME: unimplemented */
+}
+
+
+static gboolean
+action_send (const gchar* account_name)
+{
+       TnyAccount *tny_account;
+       ModestTnySendQueue *send_queue;
+
+       g_return_val_if_fail (account_name, FALSE);
+
+       tny_account = 
+               modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+                                                                    account_name,
+                                                                    TNY_ACCOUNT_TYPE_TRANSPORT);
+       if (!tny_account) {
+               g_printerr ("modest: cannot get tny transport account for %s\n", account_name);
+               return FALSE;
+       }
+       send_queue = modest_tny_send_queue_new (TNY_CAMEL_TRANSPORT_ACCOUNT(tny_account));
+       if (!send_queue) {
+               g_object_unref (G_OBJECT(tny_account));
+               g_printerr ("modest: cannot get send queue for %s\n", account_name);
+               return FALSE;
+       }
+       
+       //modest_tny_send_queue_flush (send_queue);
+
+       g_object_unref (G_OBJECT(send_queue));
+       g_object_unref (G_OBJECT(tny_account));
+
+       return TRUE;
+}
+
+
+static gboolean
+action_receive (const gchar* account_name)
+{
+       TnyAccount *tny_account;
+       ModestMailOperation *mail_op;
+
+       g_return_val_if_fail (account_name, FALSE);
+
+       tny_account = 
+               modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+                                                                    account_name,
+                                                                    TNY_ACCOUNT_TYPE_STORE);
+       if (!tny_account) {
+               g_printerr ("modest: cannot get tny store account for %s\n", account_name);
+               return FALSE;
+       }
+
+       /* Create the mail operation */
+       mail_op = modest_mail_operation_new ();
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+       modest_mail_operation_update_account (mail_op, TNY_STORE_ACCOUNT(tny_account));
+
+       g_object_unref (G_OBJECT(tny_account));
+       g_object_unref (G_OBJECT (mail_op));
+               
+       return TRUE;
+}
+
+
+
+void
+modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
 {
-       if (main_window->header_view)
-               modest_header_view_select_next (main_window->header_view); 
+       gchar *account_name;
+
+       
+       g_message ("online? %s", 
+               tny_device_is_online(modest_runtime_get_device()) ? "yes":"no");
+                                                               
+       account_name =
+               g_strdup(modest_window_get_active_account(MODEST_WINDOW(win)));
+       if (!account_name)
+               account_name  = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+       if (!account_name) {
+               g_printerr ("modest: cannot get account\n");
+               return;
+       }
+
+       if (!action_send(account_name))
+               g_printerr ("modest: failed to send\n");
+       if (!action_receive(account_name))
+               g_printerr ("modest: failed to receive\n");
 }
 
+
+
 void
-modest_ui_actions_toggle_view (GtkWidget *widget,
-                              ModestMainWindow *main_window)
+modest_ui_actions_toggle_header_list_view (GtkAction *action, ModestMainWindow *main_window)
 {
        ModestConf *conf;
+       GtkWidget *header_view;
+       
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
-       if (!main_window->header_view)
+       header_view = modest_main_window_get_child_widget (main_window,
+                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+       if (!header_view)
                return;
+
        conf = modest_runtime_get_conf ();
        
        /* what is saved/restored is depending on the style; thus; we save with
-        * old style, then update the style, and restore for this new style*/
-       modest_widget_memory_save (conf, G_OBJECT(main_window->header_view), "header-view");
+        * old style, then update the style, and restore for this new style
+        */
+       modest_widget_memory_save (conf, G_OBJECT(header_view), "header-view");
        
-       if (modest_header_view_get_style (main_window->header_view) == MODEST_HEADER_VIEW_STYLE_DETAILS)
-               modest_header_view_set_style (main_window->header_view,
+       if (modest_header_view_get_style
+           (MODEST_HEADER_VIEW(header_view)) == MODEST_HEADER_VIEW_STYLE_DETAILS)
+               modest_header_view_set_style (MODEST_HEADER_VIEW(header_view),
                                              MODEST_HEADER_VIEW_STYLE_TWOLINES);
        else
-               modest_header_view_set_style (main_window->header_view,
+               modest_header_view_set_style (MODEST_HEADER_VIEW(header_view),
                                              MODEST_HEADER_VIEW_STYLE_DETAILS);
 
-       modest_widget_memory_restore (conf, G_OBJECT(main_window->header_view),
+       modest_widget_memory_restore (conf, G_OBJECT(header_view),
                                      "header-view");
 }
 
@@ -385,22 +724,23 @@ read_msg_func (gpointer data, gpointer user_data)
        TnyHeader *header;
        GetMsgAsyncHelper *helper;
        TnyHeaderFlags header_flags;
-
+       GtkWidget *msg_preview;
+       
        msg = TNY_MSG (data);
        helper = (GetMsgAsyncHelper *) user_data;
 
-       if (!helper->main_window->msg_preview)
+       msg_preview = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (helper->window),
+                                                          MODEST_WIDGET_TYPE_MSG_PREVIEW);
+       if (!msg_preview)
                return;
        
-       /* mark message as seen; _set_flags crashes, bug in tinymail? */
        header = TNY_HEADER (tny_iterator_get_current (helper->iter));
        header_flags = tny_header_get_flags (header);
        tny_header_set_flags (header, header_flags | TNY_HEADER_FLAG_SEEN);
        g_object_unref (G_OBJECT (header));
 
        /* Set message on msg view */
-       modest_msg_view_set_message (helper->main_window->msg_preview,
-                                    msg);
+       modest_msg_view_set_message (MODEST_MSG_VIEW(msg_preview), msg);
 }
 
 /*
@@ -420,12 +760,9 @@ get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data)
        helper = (GetMsgAsyncHelper *) user_data;
 
        if ((*err && ((*err)->code == TNY_FOLDER_ERROR_GET_MSG)) || !msg) {
-               ModestHeaderView *header_view =
-                       helper->main_window->header_view;
-               if (header_view)
-                       modest_ui_actions_on_item_not_found (header_view,
-                                                            MODEST_ITEM_TYPE_MESSAGE,
-                                                            helper->main_window);
+               modest_ui_actions_on_item_not_found (NULL,
+                                                    MODEST_ITEM_TYPE_MESSAGE,
+                                                    helper->window);
                return;
        }
 
@@ -445,13 +782,13 @@ get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data)
                TnyHeader *header;
                header = TNY_HEADER (tny_iterator_get_current (helper->iter)); 
                tny_folder_get_msg_async (folder, header,                         
-                                         get_msg_cb, helper);
+                                         get_msg_cb, NULL, helper);
                g_object_unref (G_OBJECT(header));
        }
 }
 
 void 
-modest_ui_actions_on_header_selected (ModestHeaderView *folder_view, 
+modest_ui_actions_on_header_selected (ModestHeaderView *header_view, 
                                      TnyHeader *header,
                                      ModestMainWindow *main_window)
 {
@@ -459,16 +796,29 @@ modest_ui_actions_on_header_selected (ModestHeaderView *folder_view,
        GetMsgAsyncHelper *helper;
        TnyList *list;
 
-       if (!main_window->msg_preview)
-               return;
-       
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+
        /* when there's no header, clear the msgview */
        if (!header) {
-               modest_msg_view_set_message (main_window->msg_preview, NULL);
+               GtkWidget *msg_preview;
+
+               /* Clear msg preview if exists */
+               msg_preview = modest_main_window_get_child_widget(main_window,
+                                                                 MODEST_WIDGET_TYPE_MSG_PREVIEW);
+       
+               if (msg_preview)
+                       modest_msg_view_set_message (MODEST_MSG_VIEW(msg_preview), NULL);
                return;
        }
 
-       folder = tny_header_get_folder (TNY_HEADER(header));
+       /* Update Main window title */
+       if (GTK_WIDGET_HAS_FOCUS (header_view)) {
+               const gchar *subject = tny_header_get_subject (header);
+               if (subject && strcmp (subject, ""))
+                       gtk_window_set_title (GTK_WINDOW (main_window), subject);
+               else
+                       gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject"));
+       }
 
        /* Create list */
        list = tny_simple_list_new ();
@@ -476,13 +826,15 @@ modest_ui_actions_on_header_selected (ModestHeaderView *folder_view,
 
        /* Fill helper data */
        helper = g_slice_new0 (GetMsgAsyncHelper);
-       helper->main_window = main_window;
+       helper->window = MODEST_WINDOW (main_window);
        helper->iter = tny_list_create_iterator (list);
        helper->func = read_msg_func;
 
+       folder = tny_header_get_folder (TNY_HEADER(header));
+
        tny_folder_get_msg_async (TNY_FOLDER(folder),
                                  header, get_msg_cb,
-                                 helper);
+                                 NULL, helper);
 
        /* Frees */
        g_object_unref (G_OBJECT (folder));
@@ -491,13 +843,15 @@ modest_ui_actions_on_header_selected (ModestHeaderView *folder_view,
 
 
 void 
-modest_ui_actions_on_header_activated (ModestHeaderView *folder_view, 
-                                       TnyHeader *header,
-                                       ModestMainWindow *main_window)
+modest_ui_actions_on_header_activated (ModestHeaderView *folder_view, TnyHeader *header,
+                                      ModestMainWindow *main_window)
 {
-       ModestWindow *win;
+       ModestWindow *win = NULL;
        TnyFolder *folder = NULL;
        TnyMsg    *msg    = NULL;
+       ModestWindowMgr *mgr;
+       
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
        
        if (!header)
                return;
@@ -505,7 +859,7 @@ modest_ui_actions_on_header_activated (ModestHeaderView *folder_view,
        folder = tny_header_get_folder (header);
        if (!folder) {
                g_printerr ("modest: cannot get folder for header\n");
-               goto cleanup;
+               return;
        }
 
        /* FIXME: make async?; check error  */
@@ -515,148 +869,87 @@ modest_ui_actions_on_header_activated (ModestHeaderView *folder_view,
                goto cleanup;
        }
 
-       win = modest_msg_view_window_new (msg);
-       gtk_window_set_transient_for (GTK_WINDOW (win),
-                                     GTK_WINDOW (main_window));
+       /* Look if we already have a message view for that header */    
+       mgr = modest_runtime_get_window_mgr ();
+       win = modest_window_mgr_find_window_by_msguid (mgr, tny_header_get_uid (header));
 
-       gtk_widget_show_all (GTK_WIDGET(win));
-       
-cleanup:
-       if (folder)
-               g_object_unref (G_OBJECT (folder));
-       if (msg)
-               g_object_unref (G_OBJECT (folder));
-}
+       /* If not, create a new window */
+       if (!win) {
+               gchar *account;
+
+               account =  g_strdup(modest_window_get_active_account(MODEST_WINDOW(main_window)));
+               if (!account)
+                       account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
 
+               win = modest_msg_view_window_new (msg, account);
+               modest_window_mgr_register_window (mgr, win);
 
+               gtk_window_set_transient_for (GTK_WINDOW (win),
+                                             GTK_WINDOW (main_window));
+       }
 
+       gtk_widget_show_all (GTK_WIDGET(win));
 
+       g_object_unref (G_OBJECT (msg));
+       
+cleanup:
+       g_object_unref (G_OBJECT (folder));
+}
 
 void 
 modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
-                                              TnyFolder *folder, 
+                                              TnyFolderStore *folder_store, 
                                               gboolean selected,
                                               ModestMainWindow *main_window)
 {
-//     GtkLabel *folder_info_label;
-       gchar *txt;     
        ModestConf *conf;
-
-/*     folder_info_label =  */
-/*             GTK_LABEL (modest_widget_factory_get_folder_info_label */
-/*                        (modest_runtime_get_widget_factory())); */
-
-/*     if (!folder) { */
-/*             gtk_label_set_label (GTK_LABEL(folder_info_label), ""); */
-/*             return; */
-/*     } */
+       GtkWidget *header_view;
        
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
-       if (!main_window->header_view)
+       header_view = modest_main_window_get_child_widget(main_window,
+                                                         MODEST_WIDGET_TYPE_HEADER_VIEW);
+       if (!header_view)
                return;
-
+       
        conf = modest_runtime_get_conf ();
 
-       if (!selected) { /* the folder was unselected; save it's settings  */
-               modest_widget_memory_save (conf, G_OBJECT (main_window->header_view),
-                                          "header-view");
-               gtk_window_set_title (GTK_WINDOW(main_window), "Modest");
-               modest_header_view_set_folder (main_window->header_view, NULL);
-       } else {  /* the folder was selected */
-               if (folder) { /* folder may be NULL */
-                       guint num, unread;
-                       gchar *title;
-
-                       num    = tny_folder_get_all_count    (folder);
-                       unread = tny_folder_get_unread_count (folder);
-                       
-                       title = g_strdup_printf ("Modest: %s",
-                                                tny_folder_get_name (folder));
-                       
-                       gtk_window_set_title (GTK_WINDOW(main_window), title);
-                       g_free (title);
-                       
-                       txt = g_strdup_printf (_("%d %s, %d unread"),
-                                              num, num==1 ? _("item") : _("items"), unread);           
-                       //gtk_label_set_label (GTK_LABEL(folder_info_label), txt);
-                       g_free (txt);
-               }
-               modest_header_view_set_folder (main_window->header_view, folder);
-               modest_widget_memory_restore (conf, G_OBJECT(main_window->header_view),
-                                             "header-view");
-       }
-}
-
-
-/****************************************************/
-/*
- * below some stuff to clearup statusbar messages after 1,5 seconds....
- */
-static gboolean
-progress_bar_clean (GtkWidget *bar)
-{
-       if (GTK_IS_PROGRESS_BAR(bar)) {
-               gtk_progress_bar_set_text     (GTK_PROGRESS_BAR(bar), "");
-               gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(bar), 1.0);
-       }
-       return FALSE;
-}
-
-static gboolean
-statusbar_clean (GtkWidget *bar)
-{
-       if (GTK_IS_STATUSBAR(bar))
-               gtk_statusbar_push (GTK_STATUSBAR(bar), 0, "");
-       return FALSE;
-}
+       if (TNY_IS_FOLDER (folder_store)) {
 
+               modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS);
 
-static void
-statusbar_push (ModestMainWindow *main_window, guint context_id, const gchar *msg)
-{
-       if (!msg)
-               return;
+               if (selected) {
+                       modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), 
+                                                      TNY_FOLDER (folder_store));
+                       modest_widget_memory_restore (conf, G_OBJECT(header_view),
+                                                     "header-view");
+               } else {
+                       modest_widget_memory_save (conf, G_OBJECT (header_view), "header-view");
+                       modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), NULL);
+               }
+       } else if (TNY_IS_ACCOUNT (folder_store)) {
 
-       if (main_window->progress_bar) {
-               gtk_widget_show (main_window->progress_bar);
-               g_timeout_add (3000, (GSourceFunc)progress_bar_clean,
-                              main_window->progress_bar);
-       }
-       
-       if (main_window->status_bar) {
-               gtk_widget_show (main_window->status_bar);
-               gtk_statusbar_push (GTK_STATUSBAR(main_window->status_bar), 0, msg);
-               g_timeout_add (1500, (GSourceFunc)statusbar_clean, main_window->status_bar);
+               modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
        }
-
 }
-/****************************************************************************/
 
 void 
-modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,
-                                    ModestItemType type,
-                                    ModestMainWindow *main_window)
+modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemType type,
+                                    ModestWindow *win)
 {
        GtkWidget *dialog;
        gchar *txt, *item;
        gboolean online;
-       TnyDevice *device;
-       TnyAccountStore *account_store;
 
        item = (type == MODEST_ITEM_TYPE_FOLDER) ? "folder" : "message";
-
-       /* Get device. Do not ask the platform factory for it, because
-          it returns always a new one */
-       account_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ());
-       device = tny_account_store_get_device (account_store);
-
+       
        if (g_main_depth > 0)   
                gdk_threads_enter ();
-       online = tny_device_is_online (device);
+       online = tny_device_is_online (modest_runtime_get_device());
 
        if (online) {
                /* already online -- the item is simply not there... */
-               dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
+               dialog = gtk_message_dialog_new (GTK_WINDOW (win),
                                                 GTK_DIALOG_MODAL,
                                                 GTK_MESSAGE_WARNING,
                                                 GTK_BUTTONS_OK,
@@ -664,16 +957,14 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,
                                                 item);
                gtk_dialog_run (GTK_DIALOG(dialog));
        } else {
-
                dialog = gtk_dialog_new_with_buttons (_("Connection requested"),
-                                                     GTK_WINDOW (main_window),
+                                                     GTK_WINDOW (win),
                                                      GTK_DIALOG_MODAL,
                                                      GTK_STOCK_CANCEL,
                                                      GTK_RESPONSE_REJECT,
                                                      GTK_STOCK_OK,
                                                      GTK_RESPONSE_ACCEPT,
                                                      NULL);
-
                txt = g_strdup_printf (_("This %s is not available in offline mode.\n"
                                         "Do you want to get online?"), item);
                gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), 
@@ -683,7 +974,7 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,
 
                gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
                if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-                       tny_device_force_online (device);
+//                     tny_device_force_online (modest_runtime_get_device());
                }
        }
        gtk_widget_destroy (dialog);
@@ -691,79 +982,54 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,
                gdk_threads_leave ();
 }
 
+void
+modest_ui_actions_on_msg_link_hover (ModestMsgView *msgview, const gchar* link,
+                                    ModestWindow *win)
+{
+       g_message ("%s %s", __FUNCTION__, link);
+}      
 
 
 void
-modest_ui_actions_on_header_status_update (ModestHeaderView *header_view, 
-                                           const gchar *msg, gint num, 
-                                           gint total,  ModestMainWindow *main_window)
+modest_ui_actions_on_msg_link_clicked (ModestMsgView *msgview, const gchar* link,
+                                       ModestWindow *win)
 {
-       char* txt;
-       
-       if (!main_window->progress_bar)
-               return;
-
-       if (total != 0)
-               gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(main_window->progress_bar),
-                                              (gdouble)num/(gdouble)total);
-       else
-               gtk_progress_bar_pulse (GTK_PROGRESS_BAR(main_window->progress_bar));
-
-       txt = g_strdup_printf (_("Downloading %d of %d"), num, total);
-       gtk_progress_bar_set_text (GTK_PROGRESS_BAR(main_window->progress_bar), txt);
-       g_free (txt);
-       
-       statusbar_push (main_window, 0, msg);
+       modest_platform_activate_uri (link);
 }
 
-
 void
-modest_ui_actions_on_msg_link_hover (ModestMsgView *msgview, const gchar* link,
-                                    ModestMainWindow *main_window)
+modest_ui_actions_on_msg_link_contextual (ModestMsgView *msgview, const gchar* link,
+                                         ModestWindow *win)
 {
-       statusbar_push (main_window, 0, link);
-
-       /* TODO: do something */
-}      
-
+       modest_platform_show_uri_popup (link);
+}
 
 void
-modest_ui_actions_on_msg_link_clicked (ModestMsgView *msgview, const gchar* link,
-                                       ModestMainWindow *main_window)
+modest_ui_actions_on_msg_attachment_clicked (ModestMsgView *msgview, TnyMimePart *mime_part,
+                                            ModestWindow *win)
 {
-       gchar *msg;
-
-       msg = g_strdup_printf (_("Opening %s..."), link);
-       statusbar_push (main_window, 0, msg);
-       g_free (msg);
-
-       /* TODO: do something */
+       g_message (__FUNCTION__);
+       
 }
 
 void
-modest_ui_actions_on_msg_attachment_clicked (ModestMsgView *msgview, 
-                                             int index,
-                                             ModestMainWindow *main_window)
+modest_ui_actions_on_msg_recpt_activated (ModestMsgView *msgview,
+                                         const gchar *address,
+                                         ModestWindow *win)
 {
-       gchar *msg;
-       
-       msg = g_strdup_printf (_("Opening attachment %d..."), index);
-       statusbar_push (main_window, 0, msg);
-       
-       g_free (msg);
-       /* TODO: do something */
+       g_message ("%s %s", __FUNCTION__, address);
 }
 
 void
-modest_ui_actions_on_send (GtkWidget *widget, 
-                          ModestMsgEditWindow *edit_window)
+modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
        TnyTransportAccount *transport_account;
        ModestMailOperation *mail_operation;
        MsgData *data;
        gchar *account_name, *from;
        ModestAccountMgr *account_mgr;
-       
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
        
        data = modest_msg_edit_window_get_msg_data (edit_window);
 
@@ -771,9 +1037,11 @@ modest_ui_actions_on_send (GtkWidget *widget,
           use the send queue provided by tinymail and some
           classifier */
        account_mgr = modest_runtime_get_account_mgr();
-       account_name = modest_account_mgr_get_default_account (account_mgr);
+       account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
+       if (!account_name) 
+               account_name = modest_account_mgr_get_default_account (account_mgr);
        if (!account_name) {
-               g_printerr ("modest: no default account found\n");
+               g_printerr ("modest: no account found\n");
                modest_msg_edit_window_free_msg_data (edit_window, data);
                return;
        }
@@ -789,8 +1057,11 @@ modest_ui_actions_on_send (GtkWidget *widget,
                return;
        }
        from = modest_account_mgr_get_from_string (account_mgr, account_name);
-               
+
+       /* Create the mail operation */         
        mail_operation = modest_mail_operation_new ();
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
+
        modest_mail_operation_send_new_mail (mail_operation,
                                             transport_account,
                                             from,
@@ -798,21 +1069,147 @@ modest_ui_actions_on_send (GtkWidget *widget,
                                             data->cc, 
                                             data->bcc,
                                             data->subject, 
-                                            data->body, 
-                                            NULL);
+                                            data->plain_body, 
+                                            data->html_body,
+                                            data->attachments,
+                                            data->priority_flags);
        /* Frees */
        g_free (from);
        g_free (account_name);
-       g_object_unref (G_OBJECT (mail_operation));
        g_object_unref (G_OBJECT (transport_account));
+       g_object_unref (G_OBJECT (mail_operation));
 
        modest_msg_edit_window_free_msg_data (edit_window, data);
 
        /* Save settings and close the window */
-       /* save_settings (edit_window) */
        gtk_widget_destroy (GTK_WIDGET (edit_window));
 }
 
+void 
+modest_ui_actions_on_toggle_bold (GtkToggleAction *action,
+                                 ModestMsgEditWindow *window)
+{
+       ModestMsgEditFormatState *format_state = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       g_return_if_fail (GTK_IS_TOGGLE_ACTION (action));
+
+       if (modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW (window)) == MODEST_MSG_EDIT_FORMAT_TEXT)
+               return;
+
+       format_state = modest_msg_edit_window_get_format_state (window);
+       g_return_if_fail (format_state != NULL);
+
+       format_state->bold = gtk_toggle_action_get_active (action);
+       modest_msg_edit_window_set_format_state (window, format_state);
+       g_free (format_state);
+       
+}
+
+void 
+modest_ui_actions_on_toggle_italics (GtkToggleAction *action,
+                                    ModestMsgEditWindow *window)
+{
+       ModestMsgEditFormatState *format_state = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       g_return_if_fail (GTK_IS_TOGGLE_ACTION (action));
+
+       if (modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW(window)) == MODEST_MSG_EDIT_FORMAT_TEXT)
+               return;
+
+       format_state = modest_msg_edit_window_get_format_state (window);
+       g_return_if_fail (format_state != NULL);
+
+       format_state->italics = gtk_toggle_action_get_active (action);
+       modest_msg_edit_window_set_format_state (window, format_state);
+       g_free (format_state);
+       
+}
+
+void 
+modest_ui_actions_on_toggle_bullets (GtkToggleAction *action,
+                                    ModestMsgEditWindow *window)
+{
+       ModestMsgEditFormatState *format_state = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       g_return_if_fail (GTK_IS_TOGGLE_ACTION (action));
+
+       if (modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW (window)) == MODEST_MSG_EDIT_FORMAT_TEXT)
+               return;
+
+       format_state = modest_msg_edit_window_get_format_state (window);
+       g_return_if_fail (format_state != NULL);
+
+       format_state->bullet = gtk_toggle_action_get_active (action);
+       modest_msg_edit_window_set_format_state (window, format_state);
+       g_free (format_state);
+       
+}
+
+void 
+modest_ui_actions_on_change_justify (GtkRadioAction *action,
+                                    GtkRadioAction *selected,
+                                    ModestMsgEditWindow *window)
+{
+       ModestMsgEditFormatState *format_state = NULL;
+       GtkJustification value;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       if (modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW(window)) == MODEST_MSG_EDIT_FORMAT_TEXT)
+               return;
+
+       value = gtk_radio_action_get_current_value (selected);
+
+       format_state = modest_msg_edit_window_get_format_state (window);
+       g_return_if_fail (format_state != NULL);
+
+       format_state->justification = value;
+       modest_msg_edit_window_set_format_state (window, format_state);
+       g_free (format_state);
+}
+
+void 
+modest_ui_actions_on_select_editor_color (GtkAction *action,
+                                         ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       g_return_if_fail (GTK_IS_ACTION (action));
+
+       if (modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW(window)) == MODEST_MSG_EDIT_FORMAT_TEXT)
+               return;
+
+       modest_msg_edit_window_select_color (window);
+}
+
+void 
+modest_ui_actions_on_select_editor_background_color (GtkAction *action,
+                                                    ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       g_return_if_fail (GTK_IS_ACTION (action));
+
+       if (modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW(window)) == MODEST_MSG_EDIT_FORMAT_TEXT)
+               return;
+
+       modest_msg_edit_window_select_background_color (window);
+}
+
+void 
+modest_ui_actions_on_insert_image (GtkAction *action,
+                                  ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       g_return_if_fail (GTK_IS_ACTION (action));
+
+       if (modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW(window)) == MODEST_MSG_EDIT_FORMAT_TEXT)
+               return;
+
+       modest_msg_edit_window_insert_image (window);
+}
+
 /*
  * Shows a dialog with an entry that asks for some text. The returned
  * value must be freed by the caller. The dialog window title will be
@@ -852,144 +1249,538 @@ ask_for_folder_name (GtkWindow *parent_window,
 
        return folder_name;
 }
-       
+
 void 
-modest_ui_actions_on_new_folder (GtkWidget *widget,
-                                 ModestMainWindow *main_window)
+modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window)
 {
-       TnyFolder *parent_folder;
+       TnyFolderStore *parent_folder;
+       GtkWidget *folder_view;
+       
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
-       if (!main_window->folder_view)
+       folder_view = modest_main_window_get_child_widget (main_window,
+                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+       if (!folder_view)
                return;
 
-       parent_folder = modest_folder_view_get_selected (main_window->folder_view);
+       parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
        
        if (parent_folder) {
-               gchar *folder_name;
-
-               folder_name = ask_for_folder_name (GTK_WINDOW (main_window),
-                                                  _("Please enter a name for the new folder"));
+               /* Run the new folder dialog */
+               while (!modest_platform_run_new_folder_dialog (MODEST_WINDOW (main_window),
+                                                              parent_folder));
 
-               if (folder_name != NULL && strlen (folder_name) > 0) {
-                       TnyFolder *new_folder;
-                       ModestMailOperation *mail_op;
-
-                       mail_op = modest_mail_operation_new ();
-                       new_folder = modest_mail_operation_create_folder (mail_op,
-                                                                         TNY_FOLDER_STORE (parent_folder),
-                                                                         (const gchar *) folder_name);
-                       if (new_folder) {
-                               /* TODO: tinymail should do this. 
-                                  Update view */
-                               modest_folder_view_add_subfolder (main_window->folder_view, new_folder);
-
-                               /* Free new folder */
-                               g_object_unref (new_folder);
-                       }
-                       g_object_unref (mail_op);
-               }
                g_object_unref (parent_folder);
        }
 }
 
 void 
-modest_ui_actions_on_rename_folder (GtkWidget *widget,
+modest_ui_actions_on_rename_folder (GtkAction *action,
                                     ModestMainWindow *main_window)
 {
-       TnyFolder *folder;
+       TnyFolderStore *folder;
+       GtkWidget *folder_view;
+       
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
-       if (!main_window->folder_view)
+       folder_view = modest_main_window_get_child_widget (main_window,
+                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+       if (!folder_view)
                return;
        
-       folder = modest_folder_view_get_selected (main_window->folder_view);
-
-       if (folder) {
+       folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
+       
+       if (folder && TNY_IS_FOLDER (folder)) {
                gchar *folder_name;
-
                folder_name = ask_for_folder_name (GTK_WINDOW (main_window),
                                                   _("Please enter a new name for the folder"));
 
                if (folder_name != NULL && strlen (folder_name) > 0) {
                        ModestMailOperation *mail_op;
-                       const GError *error;
 
                        mail_op = modest_mail_operation_new ();
+                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                                        mail_op);
+
                        modest_mail_operation_rename_folder (mail_op,
-                                                            folder,
+                                                            TNY_FOLDER (folder),
                                                             (const gchar *) folder_name);
 
-                       error = modest_mail_operation_get_error (mail_op);
-                       if (!error)
-                               /* TODO: tinymail should do this. 
-                                  Update view */
-                               modest_folder_view_rename (main_window->folder_view);
-
-                       /* TODO: else ? notify error ? */
-
                        g_object_unref (mail_op);
+                       g_free (folder_name);
                }
                g_object_unref (folder);
        }
 }
 
 static void
-delete_folder (ModestMainWindow *main_window,
-              gboolean move_to_trash) 
+delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) 
 {
-       TnyFolder *folder;
+       TnyFolderStore *folder;
        ModestMailOperation *mail_op;
+       GtkWidget *folder_view;
        
-       if (!main_window->folder_view)
-               return;
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
-       folder = modest_folder_view_get_selected (main_window->folder_view);
+       folder_view = modest_main_window_get_child_widget (main_window,
+                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+       if (!folder_view)
+               return;
 
+       folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+       
        mail_op = modest_mail_operation_new ();
-       modest_mail_operation_remove_folder (mail_op, folder, move_to_trash);
-       g_object_unref (mail_op);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                        mail_op);
+       modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), move_to_trash);
+
+       g_object_unref (G_OBJECT (mail_op));
+       g_object_unref (G_OBJECT (folder));
 }
 
 void 
-modest_ui_actions_on_delete_folder (GtkWidget *widget,
+modest_ui_actions_on_delete_folder (GtkAction *action,
                                     ModestMainWindow *main_window)
 {
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+
        delete_folder (main_window, FALSE);
 }
 
 void 
-modest_ui_actions_on_move_to_trash_folder (GtkWidget *widget,
-                                           ModestMainWindow *main_window)
+modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainWindow *main_window)
 {
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+       
        delete_folder (main_window, TRUE);
 }
 
 void
-modest_ui_actions_on_accounts_reloaded (TnyAccountStore *store, gpointer user_data)
+modest_ui_actions_on_password_requested (TnyAccountStore *account_store, 
+                                        const gchar* account_name,
+                                        gchar **password, 
+                                        gboolean *cancel, 
+                                        gboolean *remember,
+                                        ModestMainWindow *main_window)
 {
-       /* FIXME */
-       /* ModestFolderView *folder_view; */
+       gchar *txt;
+       GtkWidget *dialog, *entry, *remember_pass_check;
+
+       dialog = gtk_dialog_new_with_buttons (_("Password requested"),
+                                             NULL,
+                                             GTK_DIALOG_MODAL,
+                                             GTK_STOCK_CANCEL,
+                                             GTK_RESPONSE_REJECT,
+                                             GTK_STOCK_OK,
+                                             GTK_RESPONSE_ACCEPT,
+                                             NULL);
+       gtk_window_set_transient_for (GTK_WINDOW(dialog), GTK_WINDOW(main_window));
        
-/*     folder_view = modest_widget_factory_get_folder_view (modest_runtime_get_widget_factory()); */
-/*     modest_folder_view_update_model (folder_view, store); */
+       txt = g_strdup_printf (_("Please enter your password for %s"), account_name);
+       gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), gtk_label_new(txt),
+                           FALSE, FALSE, 0);
+       g_free (txt);
+
+       entry = gtk_entry_new_with_max_length (40);
+       gtk_entry_set_visibility (GTK_ENTRY(entry), FALSE);
+       gtk_entry_set_invisible_char (GTK_ENTRY(entry), 0x2022); /* bullet unichar */
+       
+       gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry,
+                           TRUE, FALSE, 0);    
+
+       remember_pass_check = gtk_check_button_new_with_label (_("Remember password"));
+       gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), remember_pass_check,
+                           TRUE, FALSE, 0);
+
+       gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
+       
+       if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+               *password = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry)));
+               *cancel   = FALSE;
+       } else {
+               *password = NULL;
+               *cancel   = TRUE;
+       }
+
+       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (remember_pass_check)))
+               *remember = TRUE;
+       else
+               *remember = FALSE;
+
+       gtk_widget_destroy (dialog);
+}
+
+void
+modest_ui_actions_on_cut (GtkAction *action,
+                         ModestWindow *window)
+{
+       GtkWidget *focused_widget;
+
+       focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
+       if (GTK_IS_EDITABLE (focused_widget)) {
+               gtk_editable_cut_clipboard (GTK_EDITABLE(focused_widget));
+       } else if (GTK_IS_TEXT_VIEW (focused_widget)) {
+               GtkTextBuffer *buffer;
+               GtkClipboard *clipboard;
+
+               clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+               buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
+               gtk_text_buffer_cut_clipboard (buffer, clipboard, TRUE);
+       }
+}
+
+void
+modest_ui_actions_on_copy (GtkAction *action,
+                          ModestWindow *window)
+{
+       GtkClipboard *clipboard;
+       GtkWidget *focused_widget;
+
+       clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+       focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
+       if (GTK_IS_LABEL (focused_widget)) {
+               gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1);
+       } else if (GTK_IS_EDITABLE (focused_widget)) {
+               gtk_editable_copy_clipboard (GTK_EDITABLE(focused_widget));
+       } else if (GTK_IS_TEXT_VIEW (focused_widget)) {
+               GtkTextBuffer *buffer;
+
+               buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
+               gtk_text_buffer_copy_clipboard (buffer, clipboard);
+       }
+}
+
+void
+modest_ui_actions_on_undo (GtkAction *action,
+                          ModestWindow *window)
+{
+       if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
+               modest_msg_edit_window_undo (MODEST_MSG_EDIT_WINDOW (window));
+       } else {
+               g_return_if_reached ();
+       }
+}
+
+void
+modest_ui_actions_on_paste (GtkAction *action,
+                           ModestWindow *window)
+{
+       GtkWidget *focused_widget;
+
+       focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
+       if (GTK_IS_EDITABLE (focused_widget)) {
+               gtk_editable_paste_clipboard (GTK_EDITABLE(focused_widget));
+       } else if (GTK_IS_TEXT_VIEW (focused_widget)) {
+               GtkTextBuffer *buffer;
+               GtkClipboard *clipboard;
+
+               clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+               buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
+               gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
+       }
+}
+
+void
+modest_ui_actions_on_select_all (GtkAction *action,
+                                ModestWindow *window)
+{
+       GtkWidget *focused_widget;
+
+       focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
+       if (GTK_IS_LABEL (focused_widget)) {
+               gtk_label_select_region (GTK_LABEL (focused_widget), 0, -1);
+       } else if (GTK_IS_EDITABLE (focused_widget)) {
+               gtk_editable_select_region (GTK_EDITABLE(focused_widget), 0, -1);
+       } else if (GTK_IS_TEXT_VIEW (focused_widget)) {
+               GtkTextBuffer *buffer;
+               GtkTextIter start, end;
+
+               buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
+               gtk_text_buffer_get_start_iter (buffer, &start);
+               gtk_text_buffer_get_end_iter (buffer, &end);
+               gtk_text_buffer_select_range (buffer, &start, &end);
+       }
+}
+
+void
+modest_ui_actions_on_change_zoom (GtkRadioAction *action,
+                                 GtkRadioAction *selected,
+                                 ModestWindow *window)
+{
+       gint value;
+
+       value = gtk_radio_action_get_current_value (selected);
+       if (MODEST_IS_WINDOW (window)) {
+               modest_window_set_zoom (MODEST_WINDOW (window), ((gdouble)value)/100);
+       }
+}
+
+void     modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action,
+                                                       GtkRadioAction *selected,
+                                                       ModestWindow *window)
+{
+       TnyHeaderFlags flags;
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       flags = gtk_radio_action_get_current_value (selected);
+       modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW (window), flags);
+}
+
+void     modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action,
+                                                          GtkRadioAction *selected,
+                                                          ModestWindow *window)
+{
+       gint file_format;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       file_format = gtk_radio_action_get_current_value (selected);
+       modest_msg_edit_window_set_file_format (MODEST_MSG_EDIT_WINDOW (window), file_format);
+}
+
+
+void     
+modest_ui_actions_on_zoom_plus (GtkAction *action,
+                               ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       modest_window_zoom_plus (MODEST_WINDOW (window));
+}
+
+void     
+modest_ui_actions_on_zoom_minus (GtkAction *action,
+                                ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       modest_window_zoom_minus (MODEST_WINDOW (window));
+}
+
+void     
+modest_ui_actions_on_toggle_fullscreen    (GtkToggleAction *toggle,
+                                          ModestWindow *window)
+{
+       ModestWindowMgr *mgr;
+       gboolean fullscreen, active;
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       mgr = modest_runtime_get_window_mgr ();
+
+       active = (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (toggle)))?1:0;
+       fullscreen = modest_window_mgr_get_fullscreen_mode (mgr);
+
+       if (active != fullscreen) {
+               modest_window_mgr_set_fullscreen_mode (mgr, active);
+               gtk_window_present (GTK_WINDOW (window));
+       }
+}
+
+void
+modest_ui_actions_on_change_fullscreen (GtkAction *action,
+                                       ModestWindow *window)
+{
+       ModestWindowMgr *mgr;
+       gboolean fullscreen;
+
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       mgr = modest_runtime_get_window_mgr ();
+       fullscreen = modest_window_mgr_get_fullscreen_mode (mgr);
+       modest_window_mgr_set_fullscreen_mode (mgr, !fullscreen);
+
+       gtk_window_present (GTK_WINDOW (window));
+}
+
+/*
+ * Show the header details in a ModestDetailsDialog widget
+ */
+static void
+show_header_details (TnyHeader *header, 
+                    GtkWindow *window)
+{
+       GtkWidget *dialog;
+       
+       /* Create dialog */
+       dialog = modest_details_dialog_new_with_header (window, header);
+
+       /* Run dialog */
+       gtk_widget_show_all (dialog);
+       gtk_dialog_run (GTK_DIALOG (dialog));
+
+       gtk_widget_destroy (dialog);
+}
+
+/*
+ * Show the folder details in a ModestDetailsDialog widget
+ */
+static void
+show_folder_details (TnyFolder *folder, 
+                    GtkWindow *window)
+{
+       GtkWidget *dialog;
+       
+       /* Create dialog */
+       dialog = modest_details_dialog_new_with_folder (window, folder);
+
+       /* Run dialog */
+       gtk_widget_show_all (dialog);
+       gtk_dialog_run (GTK_DIALOG (dialog));
+
+       gtk_widget_destroy (dialog);
+}
+
+
+void     
+modest_ui_actions_on_details (GtkAction *action, 
+                             ModestWindow *win)
+{
+       TnyList * headers_list;
+       TnyIterator *iter;
+       TnyHeader *header;              
+
+       if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+               TnyMsg *msg;
+
+               msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
+               if (!msg) {
+                       return;
+               } else {
+                       headers_list = get_selected_headers (win);
+                       if (!headers_list)
+                               return;
+
+                       iter = tny_list_create_iterator (headers_list);
+
+                       header = TNY_HEADER (tny_iterator_get_current (iter));
+                       show_header_details (header, GTK_WINDOW (win));
+                       g_object_unref (header);
+
+                       g_object_unref (iter);
+               }
+       } else if (MODEST_IS_MAIN_WINDOW (win)) {
+               GtkWidget *folder_view, *header_view;
+
+               /* Check which widget has the focus */
+               folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                                   MODEST_WIDGET_TYPE_FOLDER_VIEW);
+               if (gtk_widget_is_focus (folder_view)) {
+                       TnyFolder *folder;
+
+                       folder = (TnyFolder *) modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+                       /* Show only when it's a folder */
+                       if (!folder || !TNY_IS_FOLDER (folder))
+                               return;
+
+                       show_folder_details (folder, GTK_WINDOW (win));
+
+               } else {
+                       header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                       if (!gtk_widget_is_focus (header_view))
+                               return;
+
+                       headers_list = get_selected_headers (win);
+                       if (!headers_list)
+                               return;
+
+                       iter = tny_list_create_iterator (headers_list);
+                       while (!tny_iterator_is_done (iter)) {
+
+                               header = TNY_HEADER (tny_iterator_get_current (iter));
+                               show_header_details (header, GTK_WINDOW (win));
+                               g_object_unref (header);
+
+                               tny_iterator_next (iter);
+                       }
+                       g_object_unref (iter);
+               }
+       }
+}
+
+void     
+modest_ui_actions_on_toggle_show_cc (GtkToggleAction *toggle,
+                                    ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       modest_msg_edit_window_show_cc (window, gtk_toggle_action_get_active (toggle));
+}
+
+void     
+modest_ui_actions_on_toggle_show_bcc (GtkToggleAction *toggle,
+                                     ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       modest_msg_edit_window_show_bcc (window, gtk_toggle_action_get_active (toggle));
+}
+
+void
+modest_ui_actions_toggle_folders_view (GtkAction *action, 
+                                      ModestMainWindow *main_window)
+{
+       ModestConf *conf;
+       
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+
+       conf = modest_runtime_get_conf ();
+       
+       if (modest_main_window_get_style (main_window) == MODEST_MAIN_WINDOW_STYLE_SPLIT)
+               modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SIMPLE);
+       else
+               modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SPLIT);
 }
 
 void 
-modest_ui_actions_on_folder_moved (ModestFolderView *folder_view,  TnyFolder        *folder, 
-                                   TnyFolderStore   *parent,    gboolean         *done,
-                                   gpointer          user_data)
+modest_ui_actions_on_toggle_toolbar (GtkToggleAction *toggle, 
+                                    ModestWindow *window)
 {
-       ModestMailOperation *mail_op;
-       const GError *error;
+       gboolean active, fullscreen = FALSE;
+       ModestWindowMgr *mgr;
 
-       *done = TRUE;
+       active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (toggle));
 
-       /* Try to move the folder */    
-       mail_op = modest_mail_operation_new ();
-       modest_mail_operation_move_folder (mail_op, folder, parent);
+       /* Check if we want to toggle the toolbar vuew in fullscreen
+          or normal mode */
+       if (!strcmp (gtk_action_get_name (GTK_ACTION (toggle)), 
+                    "ViewShowToolbarFullScreen")) {
+               fullscreen = TRUE;
+       }
 
-       error = modest_mail_operation_get_error (mail_op);
-       if (error)
-               *done = FALSE;
+       /* Toggle toolbar */
+       mgr = modest_runtime_get_window_mgr ();
+       modest_window_mgr_show_toolbars (mgr, active, fullscreen);
+}
 
-       g_object_unref (G_OBJECT (mail_op));
+void     
+modest_ui_actions_msg_edit_on_select_font (GtkAction *action,
+                                          ModestMsgEditWindow *window)
+{
+       modest_msg_edit_window_select_font (window);
+}
+
+void
+modest_ui_actions_on_folder_display_name_changed (ModestFolderView *folder_view,
+                                                 const gchar *display_name,
+                                                 GtkWindow *window)
+{
+       /* Do not change the application name if the widget has not
+          the focus. This callback could be called even if the folder
+          view has not the focus, because the handled signal could be
+          emitted when the folder view is redrawn */
+       if (gtk_widget_is_focus (GTK_WIDGET (folder_view))) {
+               if (display_name)
+                       gtk_window_set_title (window, display_name);
+               else
+                       gtk_window_set_title (window, " ");
+       }
+}
+
+void
+modest_ui_actions_on_select_contacts (GtkAction *action, ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       modest_msg_edit_window_select_contacts (window);
 }