* Enable sending mails again.
[modest] / src / gtk-glade / modest-ui.c
index e96defe..c313f1b 100644 (file)
 #include <config.h>
 #endif /*HAVE_CONFIG_H*/
 
+/* TODO: put in auto* */
+#include <tny-text-buffer-stream.h>
+#include <tny-msg-folder.h>
+
 #include "../modest-ui.h"
 #include "../modest-window-mgr.h"
 #include "../modest-account-mgr.h"
+#include "../modest-account-mgr.h"
+#include "../modest-identity-mgr.h"
 
 #include "../modest-tny-account-store.h"
 #include "../modest-tny-folder-tree-view.h"
 #include "../modest-tny-header-tree-view.h"
 #include "../modest-tny-msg-view.h"
 #include "../modest-tny-transport-actions.h"
+#include "../modest-tny-store-actions.h"
 
+#include "../modest-text-utils.h"
+#include "../modest-tny-msg-actions.h"
 
-//#include "modest.glade.h"
-
-#define MODEST_GLADE          PREFIX "/share/modest/glade/modest.glade"
-#define MODEST_GLADE_MAIN_WIN "main"
-#define MODEST_GLADE_EDIT_WIN "new_mail"
+#include "../modest-editor-window.h"
 
+#include "modest-ui-glade.h"
+#include "modest-ui-wizard.h"
 
 /* 'private'/'protected' functions */
 static void   modest_ui_class_init     (ModestUIClass *klass);
 static void   modest_ui_init           (ModestUI *obj);
 static void   modest_ui_finalize       (GObject *obj);
 
-static void    modest_ui_window_destroy    (GtkWidget *win, gpointer data);
+static void    modest_ui_window_destroy    (GtkWidget *win, GdkEvent *event, gpointer data);
 static void    modest_ui_last_window_closed (GObject *obj, gpointer data);
 
-static GtkWidget* modest_main_window_toolbar (void);
 static GtkWidget* modest_main_window_folder_tree (ModestAccountMgr *modest_acc_mgr,
                                                  TnyAccountStoreIface *account_store);
 static GtkWidget* modest_main_window_header_tree (TnyMsgFolderIface *folder);
 
+//static void on_account_settings1_activate (GtkMenuItem *,
+//                                 gpointer);
 
 static void on_password_requested (ModestTnyAccountStore *account_store,
                                   const gchar *account_name, gpointer user_data);
@@ -56,10 +64,37 @@ static void on_new_mail_clicked (GtkWidget *widget, ModestUI *modest_ui);
 
 static void on_reply_clicked (GtkWidget *widget, ModestUI *modest_ui);
 
+static void on_forward_clicked (GtkWidget *widget, ModestUI *modest_ui);
+
+static void on_delete_clicked (GtkWidget *widget, ModestUI *modest_ui);
+
+static void on_view_attachments_toggled(GtkWidget *widget, ModestUI *modest_ui);
+
+#if 1
+static void on_send_button_clicked (GtkWidget *widget, ModestEditorWindow *modest_editwin);
+#else
 static void on_send_button_clicked (GtkWidget *widget, ModestUI *modest_ui);
+#endif
+
+static void on_sendreceive_button_clicked (GtkWidget *widget, ModestUI *modest_ui);
 
 static void register_toolbar_callbacks (ModestUI *modest_ui);
 
+typedef enum {
+       QUOTED_SEND_REPLY,
+       QUOTED_SEND_REPLY_ALL,
+       QUOTED_SEND_FORWARD
+} quoted_send_type;
+
+static void quoted_send_msg (ModestUI *modest_ui, quoted_send_type qstype);
+
+
+typedef struct {
+       ModestUI *modest_ui;
+       ModestEditorWindow *edit_win;
+       GladeXML *glade_xml;
+} EditWinData;
+
 
 /* list my signals */
 enum {
@@ -68,23 +103,6 @@ enum {
        LAST_SIGNAL
 };
 
-
-typedef struct _ModestUIPrivate ModestUIPrivate;
-struct _ModestUIPrivate {
-
-       ModestConf           *modest_conf;
-       ModestAccountMgr     *modest_acc_mgr;
-       ModestWindowMgr      *modest_window_mgr;
-       TnyAccountStoreIface *account_store;
-
-       GtkWindow            *main_window;
-       GladeXML             *glade_xml;
-
-
-};
-#define MODEST_UI_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                       MODEST_TYPE_UI, \
-                                       ModestUIPrivate))
 /* globals */
 static GObjectClass *parent_class = NULL;
 
@@ -114,6 +132,7 @@ modest_ui_get_type (void)
        return my_type;
 }
 
+
 static void
 modest_ui_class_init (ModestUIClass *klass)
 {
@@ -133,18 +152,23 @@ modest_ui_class_init (ModestUIClass *klass)
 /*     etc. */
 }
 
+
 static void
 modest_ui_init (ModestUI *obj)
 {
        ModestUIPrivate *priv = MODEST_UI_GET_PRIVATE(obj);
 
        priv->modest_acc_mgr    = NULL;
+       priv->modest_id_mgr     = NULL;
        priv->modest_conf       = NULL;
        priv->modest_window_mgr = NULL;
        priv->glade_xml         = NULL;
+       priv->folder_view       = NULL;
+       priv->header_view       = NULL;
 
 }
 
+
 static void
 modest_ui_finalize (GObject *obj)
 {
@@ -154,6 +178,10 @@ modest_ui_finalize (GObject *obj)
                g_object_unref (priv->modest_acc_mgr);
        priv->modest_acc_mgr = NULL;
 
+       if (priv->modest_id_mgr)
+               g_object_unref (priv->modest_id_mgr);
+       priv->modest_id_mgr = NULL;
+
        if (priv->modest_conf)
                g_object_unref (priv->modest_conf);
        priv->modest_conf = NULL;
@@ -163,13 +191,17 @@ modest_ui_finalize (GObject *obj)
        priv->modest_window_mgr = NULL;
 }
 
+
 GObject*
 modest_ui_new (ModestConf *modest_conf)
 {
        GObject *obj;
        ModestUIPrivate *priv;
        ModestAccountMgr *modest_acc_mgr;
+       ModestIdentityMgr *modest_id_mgr;
        TnyAccountStoreIface *account_store_iface;
+       GSList *account_names_list;
+       GSList *identities_list;
 
        g_return_val_if_fail (modest_conf, NULL);
 
@@ -184,6 +216,14 @@ modest_ui_new (ModestConf *modest_conf)
                return NULL;
        }
 
+       modest_id_mgr =
+               MODEST_IDENTITY_MGR(modest_identity_mgr_new (modest_conf));
+       if (!modest_id_mgr) {
+               g_warning ("could not create ModestIdentityMgr instance");
+               g_object_unref (obj);
+               return NULL;
+       }
+
        account_store_iface =
                TNY_ACCOUNT_STORE_IFACE(modest_tny_account_store_new (modest_acc_mgr));
        if (!account_store_iface) {
@@ -193,16 +233,21 @@ modest_ui_new (ModestConf *modest_conf)
        g_signal_connect (account_store_iface, "password_requested",
                          G_CALLBACK(on_password_requested),
                          NULL);
+
        glade_init ();
-       priv->glade_xml = glade_xml_new (MODEST_GLADE,
-                                        NULL,NULL);
+       priv->glade_xml = glade_xml_new (MODEST_GLADE, NULL,NULL);
        if (!priv->glade_xml) {
                g_warning ("failed to do glade stuff");
                g_object_unref (obj);
                return NULL;
        }
 
+       /* FIXME: could be used, but doesn't work atm.
+        * glade_xml_signal_autoconnect(priv->glade_xml);
+        */
+
        priv->modest_acc_mgr = modest_acc_mgr;
+       priv->modest_id_mgr  = modest_id_mgr;
        g_object_ref (priv->modest_conf = modest_conf);
 
        priv->account_store = account_store_iface;
@@ -211,6 +256,14 @@ modest_ui_new (ModestConf *modest_conf)
        g_signal_connect (priv->modest_window_mgr, "last_window_closed",
                          G_CALLBACK(modest_ui_last_window_closed),
                          NULL);
+
+       account_names_list=modest_account_mgr_server_account_names(modest_acc_mgr, NULL, MODEST_PROTO_TYPE_ANY, NULL, FALSE);
+       identities_list=modest_identity_mgr_identity_names(modest_id_mgr, NULL);
+       if (!(account_names_list!=NULL || identities_list!=NULL))
+               wizard_account_dialog(MODEST_UI(obj));
+       g_slist_free(account_names_list);
+       g_slist_free(identities_list);
+
        return obj;
 }
 
@@ -219,14 +272,18 @@ gboolean
 modest_ui_show_main_window (ModestUI *modest_ui)
 {
        GtkWidget       *win;
-       int              height, width;
+       gint              height, width;
        ModestUIPrivate *priv;
        GtkWidget     *folder_view, *header_view;
        GtkWidget     *message_view;
+       GtkWidget     *account_settings_item;
+       GtkWidget     *new_account_item;
+       GtkWidget     *delete_item;
+       GtkWidget     *view_attachments_item;
 
        GtkWidget  *folder_view_holder,
                *header_view_holder,
-               *message_view_holder;
+               *mail_paned;
 
        priv = MODEST_UI_GET_PRIVATE(modest_ui);
 
@@ -244,6 +301,7 @@ modest_ui_show_main_window (ModestUI *modest_ui)
        folder_view =
                GTK_WIDGET(modest_main_window_folder_tree(priv->modest_acc_mgr,
                                                          priv->account_store));
+       priv->folder_view = folder_view;
        folder_view_holder = glade_xml_get_widget (priv->glade_xml, "folders");
        if (!folder_view||!folder_view_holder) {
                g_warning ("failed to create folder tree");
@@ -252,6 +310,7 @@ modest_ui_show_main_window (ModestUI *modest_ui)
        gtk_container_add (GTK_CONTAINER(folder_view_holder), folder_view);
 
        header_view  =  GTK_WIDGET(modest_main_window_header_tree (NULL));
+       priv->header_view = header_view;
        header_view_holder = glade_xml_get_widget (priv->glade_xml, "mail_list");
        if (!header_view) {
                g_warning ("failed to create header tree");
@@ -262,25 +321,78 @@ modest_ui_show_main_window (ModestUI *modest_ui)
        g_signal_connect (G_OBJECT(folder_view), "folder_selected",
                          G_CALLBACK(on_folder_clicked), modest_ui);
 
-       message_view  = GTK_WIDGET(modest_tny_msg_view_new (NULL));
-       message_view_holder = glade_xml_get_widget (priv->glade_xml, "mail_view");
+       message_view  = GTK_WIDGET(modest_tny_msg_view_new (NULL, priv->modest_conf));
        if (!message_view) {
                g_warning ("failed to create message view");
                return FALSE;
        }
-       gtk_container_add (GTK_CONTAINER(message_view_holder), message_view);
+       mail_paned = glade_xml_get_widget (priv->glade_xml, "mail_paned");
+       gtk_paned_add2 (GTK_PANED(mail_paned), message_view);
 
        g_signal_connect (header_view, "message_selected",
                          G_CALLBACK(on_message_clicked),
-                         modest_ui);
+                          modest_ui);
+
+       account_settings_item = glade_xml_get_widget (priv->glade_xml, "AccountSettingsMenuItem");
+       if (!account_settings_item)
+       {
+               g_warning ("The account settings item isn't available!\n");
+                return FALSE;
+        }
+        /*
+        g_signal_connect (account_settings_item, "activate",
+                          G_CALLBACK(on_account_settings1_activate),
+                          modest_ui);
+        */
+
+       new_account_item = glade_xml_get_widget (priv->glade_xml, "NewAccountWizardMenuItem");
+       if (!new_account_item)
+       {
+               g_warning ("The new account item isn't available!\n");
+               return FALSE;
+       }
+
+        g_signal_connect (new_account_item, "activate",
+                          G_CALLBACK(new_wizard_account),
+                          modest_ui);
+
+       delete_item = glade_xml_get_widget (priv->glade_xml, "delete1");
+       if (!delete_item)
+       {
+               g_warning ("The delete item isn't available!\n");
+               return FALSE;
+       }
+
+       g_signal_connect (delete_item, "activate", G_CALLBACK(on_delete_clicked),
+                         modest_ui);
+
+       view_attachments_item = glade_xml_get_widget (priv->glade_xml, "menu_view_attachments");
+       if (!view_attachments_item)
+       {
+               g_warning ("The view_attachments_item isn't available!");
+               return FALSE;
+       }
+
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(view_attachments_item),
+                                                                  modest_conf_get_bool(priv->modest_conf,
+                                                                                                               MODEST_CONF_MSG_VIEW_SHOW_ATTACHMENTS_INLINE,
+                                                                                                               NULL)
+                                                                  );
+
+       g_signal_connect (view_attachments_item,
+                                         "toggled",
+                                         G_CALLBACK(on_view_attachments_toggled),
+                                         modest_ui);
 
        register_toolbar_callbacks (modest_ui);
 
        modest_window_mgr_register (priv->modest_window_mgr,
                                    G_OBJECT(win), MODEST_MAIN_WINDOW, 0);
-       g_signal_connect (win, "destroy", G_CALLBACK(modest_ui_window_destroy),
+       g_signal_connect (win, "destroy-event", G_CALLBACK(modest_ui_window_destroy),
                          modest_ui);
-       gtk_widget_set_usize (GTK_WIDGET(win), height, width);
+       g_signal_connect (win, "delete-event", G_CALLBACK(modest_ui_window_destroy),
+                         modest_ui);
+       gtk_widget_set_usize (GTK_WIDGET(win), width, height);
        gtk_window_set_title (GTK_WINDOW(win), PACKAGE_STRING);
 
        gtk_widget_show_all (win);
@@ -304,31 +416,232 @@ register_toolbar_callbacks (ModestUI *modest_ui)
                                  G_CALLBACK(on_new_mail_clicked), modest_ui);
 
        button = glade_xml_get_widget (priv->glade_xml, "toolb_reply");
-       if (button)
+       if (button) {
                g_signal_connect (button, "clicked",
                                  G_CALLBACK(on_reply_clicked), modest_ui);
-}
+               gtk_widget_set_sensitive(button, FALSE);
+       }
+
+       button = glade_xml_get_widget (priv->glade_xml, "toolb_reply_all");
+       if (button) {
+               //g_signal_connect (button, "clicked",
+               //                G_CALLBACK(on_reply_all_clicked), modest_ui);
+               gtk_widget_set_sensitive(button, FALSE);
+       }
+
+       button = glade_xml_get_widget (priv->glade_xml, "toolb_forward");
+       if (button) {
+               g_signal_connect (button, "clicked",
+                                 G_CALLBACK(on_forward_clicked), modest_ui);
+               gtk_widget_set_sensitive(button, FALSE);
+       }
 
+       button = glade_xml_get_widget (priv->glade_xml, "toolb_move_to");
+       if (button) {
+               //g_signal_connect (button, "clicked",
+               //                G_CALLBACK(on_move_to_clicked), modest_ui);
+               gtk_widget_set_sensitive(button, FALSE);
+       }
 
+       button = glade_xml_get_widget (priv->glade_xml, "toolb_delete");
+       if (button) {
+               g_signal_connect (button, "clicked",
+                                 G_CALLBACK(on_delete_clicked), modest_ui);
+               gtk_widget_set_sensitive(button, FALSE);
+       }
+
+       button = glade_xml_get_widget (priv->glade_xml, "toolb_send_receive");
+       if (button) {
+               g_signal_connect (button, "clicked",
+                                 G_CALLBACK(on_sendreceive_button_clicked), modest_ui);
+               gtk_widget_set_sensitive(button, TRUE);
+       }
+}
 
+#if 0
 static void
-hide_edit_window (GtkWidget *win, gpointer data)
+hide_edit_window (GtkWidget *win, GdkEvent *event, gpointer data)
 {
+       ModestUIPrivate *priv;
+
+       priv = MODEST_UI_GET_PRIVATE(data);
        gtk_widget_hide (win);
+       modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT(win));
+}
+#endif
+
+
+static gboolean close_edit_confirm_dialog(ModestEditorWindow *edit_win)
+{
+       GtkWidget *mdialog;
+       gint res;
+
+       mdialog = gtk_message_dialog_new(GTK_WINDOW(edit_win),
+                       GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                       GTK_MESSAGE_QUESTION,
+                       GTK_BUTTONS_YES_NO,
+                       _("Message was modified.\nDiscard Changes?"));
+       gtk_widget_show_all (mdialog);
+
+       res=gtk_dialog_run(GTK_DIALOG(mdialog));
+       gtk_widget_destroy (mdialog);
+       if (res == GTK_RESPONSE_YES)
+               return TRUE;
+       else
+               return FALSE;
+}
+
+static void
+close_edit_window (GtkWidget *win, GdkEvent *event, gpointer data)
+{
+       ModestEditorWindow *edit_win;
+       ModestUIPrivate *priv;
+       EditWinData *win_data;
+
+       edit_win = (ModestEditorWindow *)data;
+       win_data = modest_editor_window_get_data(edit_win);
+       priv = MODEST_UI_GET_PRIVATE(win_data->modest_ui);
+
+       // g_message("window was %s modified", modest_editor_window_get_modified(edit_win) ? "" : "not");
+
+       if (modest_editor_window_get_modified(edit_win)) {
+               if (close_edit_confirm_dialog(edit_win)) {
+                       gtk_widget_hide (GTK_WIDGET(edit_win));
+                       modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT(edit_win));
+                       gtk_widget_destroy(GTK_WIDGET(edit_win));
+                       g_message("closing window");
+               } else {
+                       g_message("not closing window");
+               }
+       }
+}
+
+
+GtkContainer
+*modest_ui_new_editor_window (ModestUI *modest_ui, gpointer *user_data)
+{
+       GtkWidget       *top_container;
+
+       GladeXML                *glade_xml;
+       EditWinData             *win_data;
+
+       glade_xml = glade_xml_new(MODEST_GLADE, "new_mail_top_container", NULL);
+       if (!glade_xml)
+               return NULL;
+
+       win_data = g_malloc(sizeof(EditWinData));
+       win_data->modest_ui = modest_ui;
+       win_data->glade_xml = glade_xml;
+       *user_data = win_data;
+
+       top_container = glade_xml_get_widget(glade_xml, "new_mail_top_container");
+       if (!top_container) {
+               g_object_unref(G_OBJECT(glade_xml));
+               return NULL;
+       }
+
+       return GTK_CONTAINER(top_container);
+}
+
+
+gboolean
+modest_ui_editor_window_set_to_header(const gchar *to, gpointer window_data)
+{
+       GladeXML *glade_xml;
+       GtkWidget *w;
+       EditWinData *win_data;
+
+       win_data = (EditWinData *)window_data;
+       glade_xml = win_data->glade_xml;
+       w = glade_xml_get_widget(glade_xml, "to_entry");
+       gtk_entry_set_text(GTK_ENTRY(w), to);
+
+       return TRUE;
+}
+
+
+gboolean
+modest_ui_editor_window_set_cc_header(const gchar *cc, gpointer window_data)
+{
+       GladeXML *glade_xml;
+       // GtkWidget *w;
+       EditWinData *win_data;
+
+       win_data = (EditWinData *)window_data;
+       glade_xml = win_data->glade_xml;
+/*
+       w = glade_xml_get_widget(glade_xml, "cc_entry");
+       gtk_entry_set_text(GTK_ENTRY(w), cc);
+*/
+       return TRUE;
+}
+
+
+gboolean
+modest_ui_editor_window_set_bcc_header(const gchar *bcc, gpointer window_data)
+{
+       GladeXML *glade_xml;
+       // GtkWidget *w;
+       EditWinData *win_data;
+
+       win_data = (EditWinData *)window_data;
+       glade_xml = win_data->glade_xml;
+/*
+       w = glade_xml_get_widget(glade_xml, "bcc_entry");
+       gtk_entry_set_text(GTK_ENTRY(w), bcc);
+*/
+       return TRUE;
+}
+
+
+gboolean
+modest_ui_editor_window_set_subject_header(const gchar *subject, gpointer window_data)
+{
+       GladeXML *glade_xml;
+       GtkWidget *w;
+       EditWinData *win_data;
+
+       win_data = (EditWinData *)window_data;
+       glade_xml = win_data->glade_xml;
+
+       w = glade_xml_get_widget(glade_xml, "subject_entry");
+       gtk_entry_set_text(GTK_ENTRY(w), subject);
+
+       return TRUE;
 }
 
 
+gboolean
+modest_ui_editor_window_set_body(const gchar *body, gpointer window_data)
+{
+       GladeXML *glade_xml;
+       GtkWidget *body_view;
+       GtkTextBuffer *buf;
+       EditWinData *win_data;
+
+       win_data = (EditWinData *)window_data;
+       glade_xml = win_data->glade_xml;
 
+       body_view = glade_xml_get_widget(glade_xml, "body_view");
+       buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(body_view));
 
+       gtk_text_buffer_set_text(GTK_TEXT_BUFFER(buf), body, -1);
+
+       return TRUE;
+}
+
+#if 0
 gboolean
-modest_ui_show_edit_window (ModestUI *modest_ui, const gchar* to,
+modest_ui_new_edit_window (ModestUI *modest_ui, const gchar* to,
                            const gchar* cc, const gchar* bcc,
                            const gchar* subject, const gchar *body,
                            const GSList* att)
 {
-       GtkWidget       *win;
+       GtkWidget       *win, *to_entry, *subject_entry, *body_view;
+
        ModestUIPrivate *priv;
        GtkWidget       *btn;
+       GtkTextBuffer   *buf;
 
        priv = MODEST_UI_GET_PRIVATE(modest_ui);
        int height = modest_conf_get_int (priv->modest_conf,
@@ -342,11 +655,30 @@ modest_ui_show_edit_window (ModestUI *modest_ui, const gchar* to,
                return FALSE;
        }
 
-       modest_window_mgr_register (priv->modest_window_mgr,
-                                   G_OBJECT(win), MODEST_EDIT_WINDOW, 0);
+       /* FIXME: this also assumes that there can be only one edit window! */
+       if (!modest_window_mgr_find_by_type(priv->modest_window_mgr, MODEST_EDIT_WINDOW)) {
+               /* there already is one edit win, maybe we should preserver its contents */
+               modest_window_mgr_register (priv->modest_window_mgr,
+                                                                       G_OBJECT(win), MODEST_EDIT_WINDOW, 0);
+       }
 
-       g_signal_connect (win, "destroy", G_CALLBACK(hide_edit_window),
-                         NULL);
+       to_entry      = glade_xml_get_widget (priv->glade_xml, "to_entry");
+       subject_entry = glade_xml_get_widget (priv->glade_xml, "subject_entry");
+       body_view     = glade_xml_get_widget (priv->glade_xml, "body_view");
+
+       gtk_entry_set_text(GTK_ENTRY(subject_entry), subject);
+       gtk_entry_set_text(GTK_ENTRY(to_entry), to);
+
+       buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(body_view));
+       if (body) {
+               gtk_text_buffer_set_text(buf, body, -1);
+       } else {
+               gtk_text_buffer_set_text(buf, "", -1);
+       }
+       g_signal_connect (win, "destroy-event", G_CALLBACK(hide_edit_window),
+                         modest_ui);
+       g_signal_connect (win, "delete-event", G_CALLBACK(hide_edit_window),
+                         modest_ui);
 
        gtk_widget_set_usize (GTK_WIDGET(win), height, width);
        gtk_window_set_title (GTK_WINDOW(win),
@@ -361,29 +693,123 @@ modest_ui_show_edit_window (ModestUI *modest_ui, const gchar* to,
 
        return TRUE;
 }
-
+#endif
 
 static void
-modest_ui_window_destroy (GtkWidget *win, gpointer data)
+modest_ui_window_destroy (GtkWidget *win, GdkEvent *event, gpointer data)
 {
        ModestUIPrivate *priv;
 
        g_return_if_fail (data);
-
-       priv = MODEST_UI_GET_PRIVATE((ModestUI*)data);
+       g_return_if_fail(MODEST_IS_UI(data));
+       priv = MODEST_UI_GET_PRIVATE((ModestUI *)data);
+       g_return_if_fail(priv);
        if (!modest_window_mgr_unregister (priv->modest_window_mgr, G_OBJECT(win)))
                g_warning ("modest window mgr: failed to unregister %p",
                           G_OBJECT(win));
+       else
+               gtk_widget_hide(win);
 }
 
 
 static void
 modest_ui_last_window_closed (GObject *obj, gpointer data)
 {
+       /* FIXME: Other cleanups todo? Finalize Tinymail? */
        gtk_main_quit ();
 }
 
 
+void
+on_account_selector_selection_changed (GtkWidget *widget,
+                                      gpointer user_data)
+{
+       GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
+       GtkTreeIter iter;
+
+       gchar *account_name;
+
+       if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter))
+       {
+               gtk_tree_model_get(GTK_TREE_MODEL(model),
+                                  &iter,
+                                  0, &account_name,
+                                  -1);
+       }
+       else
+       {
+               account_name="empty";
+       }
+
+       g_message("Value: '%s'\n", account_name);
+
+       free(account_name);
+}
+
+#if 0
+static void
+on_account_settings1_activate (GtkMenuItem *menuitem,
+                              gpointer user_data)
+{
+       GladeXML *glade_xml;
+       GtkWidget *advanced_account_setup;
+       ModestUIPrivate *priv;
+       gint retval;
+       GSList *account_name_list;
+       GSList *account_name_list_iter;
+       GtkListStore *account_names;
+       GtkTreeIter account_names_iter;
+       GtkWidget *account_selector;
+       GtkCellRenderer *renderer;
+
+
+        g_return_if_fail(MODEST_IS_UI(user_data));
+       priv = MODEST_UI_GET_PRIVATE(MODEST_UI(user_data));
+
+       glade_xml = glade_xml_new(MODEST_GLADE, "mailbox_setup_advanced", NULL);
+       advanced_account_setup = glade_xml_get_widget(glade_xml, "mailbox_setup_advanced");
+
+       account_name_list=modest_account_mgr_account_names(priv->modest_acc_mgr, NULL);
+       account_names = gtk_list_store_new(1, G_TYPE_STRING);
+
+       for (account_name_list_iter=account_name_list;
+            account_name_list_iter!=NULL;
+            account_name_list_iter=g_slist_next(account_name_list_iter))
+       {
+               gtk_list_store_append(account_names, &account_names_iter);
+               gtk_list_store_set(account_names, &account_names_iter,
+                                  0, account_name_list_iter->data,
+                                  -1);
+       }
+
+       g_slist_free(account_name_list);
+
+       account_selector = glade_xml_get_widget(glade_xml, "account_selector");
+       gtk_combo_box_set_model(GTK_COMBO_BOX(account_selector), GTK_TREE_MODEL(account_names));
+
+       renderer = gtk_cell_renderer_text_new ();
+       gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (account_selector), renderer, TRUE);
+       gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (account_selector), renderer,
+                                       "text", 0,
+                                       NULL);
+
+       g_signal_connect(GTK_WIDGET(account_selector), "changed",
+                        G_CALLBACK(on_account_selector_selection_changed),
+                        GTK_WIDGET(advanced_account_setup));
+
+       gtk_combo_box_set_active(GTK_COMBO_BOX(account_selector), 0);
+
+       gtk_widget_show_all(GTK_WIDGET(advanced_account_setup));
+
+       retval=gtk_dialog_run(GTK_DIALOG(advanced_account_setup));
+
+       g_object_unref(account_names);
+
+       gtk_widget_destroy(GTK_WIDGET(advanced_account_setup));
+
+       g_object_unref(glade_xml);
+}
+#endif
 
 
 static void
@@ -392,7 +818,10 @@ on_folder_clicked (ModestTnyFolderTreeView *folder_tree,
                   gpointer data)
 {
        GtkWidget *win;
+       GtkWidget *button;
+       GtkWidget *paned;
        ModestTnyHeaderTreeView *tree_view;
+       ModestTnyMsgView *msg_view;
        ModestUIPrivate *priv;
        GtkWidget *scrollview;
 
@@ -410,31 +839,65 @@ on_folder_clicked (ModestTnyFolderTreeView *folder_tree,
 
        modest_tny_header_tree_view_set_folder (tree_view,
                                                folder);
-}
 
+       button = glade_xml_get_widget (priv->glade_xml, "toolb_reply");
+       if (button) {
+               gtk_widget_set_sensitive(button, FALSE);
+       }
+
+       button = glade_xml_get_widget (priv->glade_xml, "toolb_forward");
+       if (button) {
+               gtk_widget_set_sensitive(button, FALSE);
+       }
 
+       button = glade_xml_get_widget (priv->glade_xml, "toolb_delete");
+       if (button) {
+               gtk_widget_set_sensitive(button, FALSE);
+       }
 
-static void on_message_clicked (ModestTnyFolderTreeView *folder_tree,
+       paned = glade_xml_get_widget (priv->glade_xml,"mail_paned");
+       g_return_if_fail (paned);
+
+       msg_view = MODEST_TNY_MSG_VIEW(gtk_paned_get_child2 (GTK_PANED(paned)));
+       g_return_if_fail (msg_view);
+
+       modest_tny_msg_view_set_message  (msg_view, NULL);
+}
+
+
+static void
+on_message_clicked (ModestTnyFolderTreeView *folder_tree,
                                TnyMsgIface *message,
                                gpointer data)
 {
-       GtkWidget *scrollview;
+       GtkWidget *paned;
+       GtkWidget *button;
        ModestTnyMsgView *msg_view;
        ModestUIPrivate *priv;
 
-       g_return_if_fail (message);
        g_return_if_fail (data);
 
        priv = MODEST_UI_GET_PRIVATE(data);
-       scrollview = glade_xml_get_widget (priv->glade_xml,"mail_view");
-
-       msg_view = MODEST_TNY_MSG_VIEW(
-               gtk_bin_get_child(GTK_BIN(scrollview)));
+       paned = glade_xml_get_widget (priv->glade_xml,"mail_paned");
+       msg_view = MODEST_TNY_MSG_VIEW(gtk_paned_get_child2 (GTK_PANED(paned)));
 
        modest_tny_msg_view_set_message (msg_view,
                                         message);
+       button = glade_xml_get_widget (priv->glade_xml, "toolb_reply");
+       if (button) {
+               gtk_widget_set_sensitive(button, TRUE);
+       }
+       button = glade_xml_get_widget (priv->glade_xml, "toolb_forward");
+       if (button) {
+               gtk_widget_set_sensitive(button, TRUE);
+       }
+       button = glade_xml_get_widget (priv->glade_xml, "toolb_delete");
+       if (button) {
+               gtk_widget_set_sensitive(button, TRUE);
+       }
 }
 
+
 static void
 on_password_requested (ModestTnyAccountStore *account_store,
                       const gchar *account_name, gpointer user_data)
@@ -447,7 +910,6 @@ on_password_requested (ModestTnyAccountStore *account_store,
        gint retval;
        const gchar *infostring=g_strconcat("Please enter the password for ", account_name, ".", NULL);
 
-
        passdialog = gtk_dialog_new_with_buttons("MyDialog",
                                                 NULL,
                                                 GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -478,7 +940,9 @@ on_password_requested (ModestTnyAccountStore *account_store,
                                                             NULL);
                break;
        case GTK_RESPONSE_CANCEL:
-               g_message("Dann halt nich!\n");
+               /* FIXME:
+                * What happens, if canceled?"
+                */
                break;
        }
 
@@ -486,129 +950,322 @@ on_password_requested (ModestTnyAccountStore *account_store,
 }
 
 
-
-
-
-
 static GtkWidget*
 modest_main_window_header_tree (TnyMsgFolderIface *folder)
 {
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+       int i;
+       GSList *columns = NULL;
        GtkWidget *header_tree;
+       ModestTnyHeaderTreeViewColumn cols[] = {
+               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_MSGTYPE,
+               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_ATTACH,
+               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_COMPACT_HEADER
+       };
+
+       for (i = 0 ; i != sizeof(cols)/sizeof(ModestTnyHeaderTreeViewColumn); ++i)
+               columns = g_slist_append (columns, GINT_TO_POINTER(cols[i]));
+
+       header_tree = GTK_WIDGET(modest_tny_header_tree_view_new(folder, columns,
+                                                                MODEST_TNY_HEADER_TREE_VIEW_STYLE_NORMAL));
+       g_slist_free (columns);
 
-       header_tree = GTK_WIDGET(modest_tny_header_tree_view_new(folder));
        if (!header_tree) {
                g_warning ("could not create header tree");
                return NULL;
        }
 
-       column =  gtk_tree_view_column_new_with_attributes(_("Date"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-
-
-       column =  gtk_tree_view_column_new_with_attributes(_("From"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-
-       column =  gtk_tree_view_column_new_with_attributes(_("Subject"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(header_tree), TRUE);
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(header_tree), TRUE);
-
        return GTK_WIDGET(header_tree);
 }
 
 
-
-
 static GtkWidget*
 modest_main_window_folder_tree (ModestAccountMgr *modest_acc_mgr,
                                TnyAccountStoreIface *account_store)
 {
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
        GtkWidget *folder_tree;
 
-       folder_tree = modest_tny_folder_tree_view_new (account_store);
+       folder_tree = GTK_WIDGET(modest_tny_folder_tree_view_new (account_store));
        if (!folder_tree) {
                g_warning ("could not create folder list");
                return NULL;
        }
 
-       column = gtk_tree_view_column_new_with_attributes(_("All Mail Folders"),
-                                                         renderer,"text",
-                                                         TNY_ACCOUNT_TREE_MODEL_NAME_COLUMN,
-                                                         NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(folder_tree), column);
-
-       column = gtk_tree_view_column_new_with_attributes(_("Unread"),
-                                                         renderer, "text",
-                                                         TNY_ACCOUNT_TREE_MODEL_UNREAD_COLUMN,
-                                                         NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(folder_tree), column);
+       return folder_tree;
+}
 
+static void on_editor_entry_changed(GtkEditable *editable,
+                                            gpointer     user_data)
+{
+       GtkWidget *edit_win;
+       EditWinData *windata;
 
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(folder_tree), TRUE);
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(folder_tree), TRUE);
+       edit_win = (GtkWidget *)user_data;
+       windata = (EditWinData *)modest_editor_window_get_data(MODEST_EDITOR_WINDOW(edit_win));
 
-       return folder_tree;
+       modest_editor_window_set_modified(MODEST_EDITOR_WINDOW(edit_win), TRUE);
 }
 
+static void on_editor_buffer_changed (GtkTextBuffer *textbuffer,
+                                            gpointer       user_data)
+{
+       GtkWidget *edit_win;
+       EditWinData *windata;
+
+       edit_win = (GtkWidget *)user_data;
+       windata = (EditWinData *)modest_editor_window_get_data(MODEST_EDITOR_WINDOW(edit_win));
+
+       modest_editor_window_set_modified(MODEST_EDITOR_WINDOW(edit_win), TRUE);
+}
 
 static void
 on_new_mail_clicked (GtkWidget *widget, ModestUI *modest_ui)
 {
+       GtkWidget *edit_win;
+       GladeXML *glade_xml;
+       GtkWidget *btn, *w;
+       GtkTextBuffer *buf;
+       EditWinData *windata;
+       ModestUIPrivate *priv;
+       gint height, width;
+
        g_return_if_fail (modest_ui);
-       modest_ui_show_edit_window (modest_ui, "", "", "", "", "", NULL);
+       //modest_ui_new_edit_window (modest_ui, "", "", "", "", "", NULL);
+
+       edit_win = modest_editor_window_new(modest_ui);
+       windata = (EditWinData *)modest_editor_window_get_data(MODEST_EDITOR_WINDOW(edit_win));
+       g_return_if_fail(windata);
+
+       windata->edit_win = MODEST_EDITOR_WINDOW(edit_win);
+       glade_xml = windata->glade_xml;
+       btn = glade_xml_get_widget (glade_xml, "toolb_send");
+       g_signal_connect (btn, "clicked", G_CALLBACK(on_send_button_clicked),
+                         edit_win);
+
+       w = glade_xml_get_widget (glade_xml, "to_entry");
+       g_signal_connect(w, "changed", G_CALLBACK(on_editor_entry_changed), edit_win);
+       w = glade_xml_get_widget (glade_xml, "subject_entry");
+       g_signal_connect(w, "changed", G_CALLBACK(on_editor_entry_changed), edit_win);
+       w = glade_xml_get_widget (glade_xml, "body_view");
+       buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(w));
+       gtk_text_buffer_set_text(buf, "", -1);
+       g_signal_connect(buf, "changed", G_CALLBACK(on_editor_buffer_changed), edit_win);
+
+       g_signal_connect (edit_win, "destroy-event", G_CALLBACK(close_edit_window),
+                         edit_win);
+       g_signal_connect (edit_win, "delete-event", G_CALLBACK(close_edit_window),
+                         edit_win);
+
+       priv = MODEST_UI_GET_PRIVATE(windata->modest_ui);
+       height = modest_conf_get_int (priv->modest_conf,
+                                         MODEST_CONF_EDIT_WINDOW_HEIGHT, NULL);
+       width  = modest_conf_get_int (priv->modest_conf,
+                                         MODEST_CONF_EDIT_WINDOW_WIDTH, NULL);
+
+       // g_message("new editor win@%dx%d", width, height);
+
+       gtk_widget_set_usize (GTK_WIDGET(edit_win), width, height);
+       gtk_window_set_title (GTK_WINDOW(edit_win), _("Untitled"));
+       modest_window_mgr_register(priv->modest_window_mgr, G_OBJECT(edit_win), MODEST_EDIT_WINDOW, 0);
+       gtk_widget_show(edit_win);
 }
 
-/* WIP, testing az */
+
 static void
-on_reply_clicked (GtkWidget *widget, ModestUI *modest_ui)
+new_editor_with_presets (ModestUI *modest_ui, const gchar *to_header,
+                                                       const gchar *cc_header, const gchar *bcc_header,
+                                                       const gchar *subject_header, const gchar *body)
 {
+       GtkWidget *edit_win;
+       GladeXML *glade_xml;
+       GtkWidget *btn, *w;
+       GtkTextBuffer *buf;
+       EditWinData *windata;
+       ModestUIPrivate *priv;
+       gint height, width;
+
        g_return_if_fail (modest_ui);
-       modest_ui_show_edit_window (modest_ui, "replyto", "cc", "bcc", "sub", "body-quote", NULL);
+
+       edit_win = modest_editor_window_new(modest_ui);
+       windata = (EditWinData *)modest_editor_window_get_data(MODEST_EDITOR_WINDOW(edit_win));
+       g_return_if_fail(windata);
+
+       glade_xml = windata->glade_xml;
+       btn = glade_xml_get_widget (glade_xml, "toolb_send");
+       g_signal_connect (btn, "clicked", G_CALLBACK(on_send_button_clicked),
+                         edit_win);
+
+       w = glade_xml_get_widget (glade_xml, "to_entry");
+       g_signal_connect(w, "changed", G_CALLBACK(on_editor_entry_changed), edit_win);
+       w = glade_xml_get_widget (glade_xml, "subject_entry");
+       g_signal_connect(w, "changed", G_CALLBACK(on_editor_entry_changed), edit_win);
+       w = glade_xml_get_widget (glade_xml, "body_view");
+       buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(w));
+       g_signal_connect(buf, "changed", G_CALLBACK(on_editor_buffer_changed), edit_win);
+
+       g_signal_connect (edit_win, "destroy-event", G_CALLBACK(close_edit_window),
+                         edit_win);
+       g_signal_connect (edit_win, "delete-event", G_CALLBACK(close_edit_window),
+                         edit_win);
+
+       priv = MODEST_UI_GET_PRIVATE(windata->modest_ui);
+       height = modest_conf_get_int (priv->modest_conf,
+                                         MODEST_CONF_EDIT_WINDOW_HEIGHT, NULL);
+       width  = modest_conf_get_int (priv->modest_conf,
+                                         MODEST_CONF_EDIT_WINDOW_WIDTH, NULL);
+
+       // g_message("new editor win@%dx%d", width, height);
+
+       gtk_widget_set_usize (GTK_WIDGET(edit_win), width, height);
+       gtk_window_set_title (GTK_WINDOW(edit_win), _("Untitled"));
+       modest_window_mgr_register(priv->modest_window_mgr, G_OBJECT(edit_win), MODEST_EDIT_WINDOW, 0);
+
+       modest_editor_window_set_to_header(MODEST_EDITOR_WINDOW(edit_win), to_header);
+       modest_editor_window_set_cc_header(MODEST_EDITOR_WINDOW(edit_win), cc_header);
+       modest_editor_window_set_bcc_header(MODEST_EDITOR_WINDOW(edit_win), bcc_header);
+       modest_editor_window_set_subject_header(MODEST_EDITOR_WINDOW(edit_win), subject_header);
+       modest_editor_window_set_body(MODEST_EDITOR_WINDOW(edit_win), body);
+
+       modest_editor_window_set_modified(MODEST_EDITOR_WINDOW(edit_win), FALSE);
+
+       gtk_widget_show(edit_win);
 }
 
 
-/* FIXME: truly evil --> we cannot really assume that
- * there is only one edit window open...
- */
 static void
-on_send_button_clicked (GtkWidget *widget, ModestUI *modest_ui)
+quoted_send_msg (ModestUI *modest_ui, quoted_send_type qstype) {
+       GtkTreeSelection *sel;
+       GtkWidget *paned;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+       GtkScrolledWindow *scroll;
+
+       TnyMsgHeaderIface *header;
+
+       ModestTnyHeaderTreeView *header_view;
+       ModestTnyMsgView *msg_view;
+       ModestUIPrivate *priv;
+
+       const TnyMsgIface *msg;
+       const TnyMsgFolderIface *folder;
+       GString *re_sub;
+       const gchar *subject, *from;
+       gchar *unquoted, *quoted;
+       time_t sent_date;
+       gint line_limit = 76;
+
+       g_return_if_fail (modest_ui);
+
+       priv = MODEST_UI_GET_PRIVATE(modest_ui);
+
+       paned = glade_xml_get_widget (priv->glade_xml,"mail_paned");
+       g_return_if_fail (paned);
+
+       scroll = GTK_SCROLLED_WINDOW(gtk_paned_get_child1 (GTK_PANED(paned)));
+       g_return_if_fail (scroll);
+
+       msg_view = MODEST_TNY_MSG_VIEW(gtk_paned_get_child2 (GTK_PANED(paned)));
+       g_return_if_fail (msg_view);
+
+       header_view = MODEST_TNY_HEADER_TREE_VIEW(gtk_bin_get_child (GTK_BIN(scroll)));
+       g_return_if_fail (header_view);
+
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(header_view));
+       g_return_if_fail (sel);
+
+       if (!gtk_tree_selection_get_selected (sel, &model, &iter)) {
+               g_warning("nothing to reply to");
+               return;
+       }
+
+       gtk_tree_model_get (model, &iter,
+                           TNY_MSG_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                           &header, -1);
+
+       if (!header) {
+               g_warning("no header");
+               return;
+       }
+
+       folder = tny_msg_header_iface_get_folder (TNY_MSG_HEADER_IFACE(header));
+       if (!folder) {
+               g_warning ("cannot find folder");
+               return;
+       }
+
+       msg = tny_msg_folder_iface_get_message (TNY_MSG_FOLDER_IFACE(folder), header);
+       if (!msg) {
+               g_warning ("cannot find msg");
+               return;
+       }
+
+       subject = tny_msg_header_iface_get_subject(header);
+       re_sub = g_string_new(subject);
+       /* FIXME: honor replyto, cc */
+       from = tny_msg_header_iface_get_from(header);
+       sent_date = tny_msg_header_iface_get_date_sent(header);
+
+       unquoted = modest_tny_msg_view_get_selected_text(msg_view);
+       quoted = modest_tny_msg_actions_quote(msg, from, sent_date, line_limit, unquoted);
+
+       switch (qstype) {
+               case QUOTED_SEND_REPLY:
+                       g_string_prepend(re_sub, _("Re: "));
+                       new_editor_with_presets(modest_ui, from, /* cc */ "", /* bcc */ "", re_sub->str, quoted);
+                       break;
+               case QUOTED_SEND_FORWARD:
+                       g_string_prepend(re_sub, _("Fwd: "));
+                       new_editor_with_presets(modest_ui, /* from */ "", /* cc */ "", /* bcc */ "", re_sub->str, quoted);
+                       break;
+               default:
+                       break;
+       }
+       g_free(quoted);
+       g_free(unquoted);
+       g_string_free(re_sub, TRUE);
+}
+
+
+static void
+on_reply_clicked (GtkWidget *widget, ModestUI *modest_ui)
+{
+       quoted_send_msg (modest_ui, QUOTED_SEND_REPLY);
+}
+
+
+static void
+on_forward_clicked (GtkWidget *widget, ModestUI *modest_ui)
+{
+       quoted_send_msg (modest_ui, QUOTED_SEND_FORWARD);
+}
+
+
+static void
+on_send_button_clicked (GtkWidget *widget, ModestEditorWindow *modest_editwin)
 {
        ModestTnyTransportActions *actions;
+       ModestUI *modest_ui;
        ModestUIPrivate *priv;
        GtkWidget *to_entry, *subject_entry, *body_view;
-       const gchar *to, *subject;
+       const gchar *to, *subject, *email_from;
        gchar *body;
        GtkTextIter start, end;
        GtkTextBuffer *buf;
        TnyAccountStoreIface *account_store;
        const GList *transport_accounts;
        TnyTransportAccountIface *transport_account;
+       ModestConf       *conf;
+       ModestIdentityMgr *id_mgr;
+       EditWinData *win_data;
+
+
+       win_data = modest_editor_window_get_data(modest_editwin);
+       modest_ui = win_data->modest_ui;
 
        g_return_if_fail (modest_ui);
 
        actions = MODEST_TNY_TRANSPORT_ACTIONS
                (modest_tny_transport_actions_new ());
+
        priv = MODEST_UI_GET_PRIVATE(modest_ui);
 
        account_store = priv->account_store;
@@ -621,9 +1278,9 @@ on_send_button_clicked (GtkWidget *widget, ModestUI *modest_ui)
                transport_account =
                        TNY_TRANSPORT_ACCOUNT_IFACE(transport_accounts->data);
 
-       to_entry      = glade_xml_get_widget (priv->glade_xml, "to_entry");
-       subject_entry = glade_xml_get_widget (priv->glade_xml, "subject_entry");
-       body_view     = glade_xml_get_widget (priv->glade_xml, "body_view");
+       to_entry      = glade_xml_get_widget (win_data->glade_xml, "to_entry");
+       subject_entry = glade_xml_get_widget (win_data->glade_xml, "subject_entry");
+       body_view     = glade_xml_get_widget (win_data->glade_xml, "body_view");
 
        to      = gtk_entry_get_text (GTK_ENTRY(to_entry));
        subject = gtk_entry_get_text (GTK_ENTRY(subject_entry));
@@ -632,18 +1289,142 @@ on_send_button_clicked (GtkWidget *widget, ModestUI *modest_ui)
        gtk_text_buffer_get_bounds (buf, &start, &end);
        body    = gtk_text_buffer_get_text (buf, &start, &end, FALSE);
 
-       g_message ("sending %s ==> %s", subject, to);
+       id_mgr = priv->modest_id_mgr;
+       email_from = modest_identity_mgr_get_identity_string(id_mgr,
+                                                            MODEST_IDENTITY_DEFAULT_IDENTITY,
+                                                            MODEST_IDENTITY_EMAIL, NULL);
+
+       if (!email_from)
+               email_from = "";
+       
+       g_message("sending \"%s\" %s ==> %s", subject, email_from, to);
+
        modest_tny_transport_actions_send_message (actions,
                                                   transport_account,
-                                                  "dirk-jan.binnema@nokia.com",
+                                                  email_from,
                                                   to, "", "", subject,
                                                   body);
+
        g_free (body);
        g_object_unref (G_OBJECT(actions));
 
-       gtk_entry_set_text (GTK_ENTRY(to_entry), "");
-       gtk_entry_set_text (GTK_ENTRY(subject_entry), "");
-       gtk_text_buffer_set_text (buf, "", 0);
+       gtk_widget_hide (GTK_WIDGET(modest_editwin));
+       modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT(modest_editwin));
+       if (GTK_IS_WIDGET(modest_editwin)) {
+               gtk_widget_destroy(GTK_WIDGET(modest_editwin));
+       } else
+               g_warning("editor window has vanished!");
+}
+
+static void
+on_view_attachments_toggled(GtkWidget *widget, ModestUI *modest_ui)
+{
+       GtkWidget *view_attachments_item, *paned;
+       ModestTnyMsgView *msg_view;
+       ModestUIPrivate *priv;
+
+       priv = MODEST_UI_GET_PRIVATE(modest_ui);
+       view_attachments_item = glade_xml_get_widget (priv->glade_xml, "menu_view_attachments");
+       g_return_if_fail(view_attachments_item);
+
+       modest_conf_set_bool(priv->modest_conf,
+                                                        MODEST_CONF_MSG_VIEW_SHOW_ATTACHMENTS_INLINE,
+                                                        gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(view_attachments_item)),
+                                                        NULL);
+
+       /* refresh message view */
+       paned = glade_xml_get_widget (priv->glade_xml,"mail_paned");
+       msg_view = MODEST_TNY_MSG_VIEW(gtk_paned_get_child2 (GTK_PANED(paned)));
+       modest_tny_msg_view_redraw(MODEST_TNY_MSG_VIEW(msg_view));
+}
+static void
+on_delete_clicked (GtkWidget *widget, ModestUI *modest_ui)
+{
+       GtkTreeSelection *sel;
+       GtkWidget *paned;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+       GtkScrolledWindow *scroll;
+       GtkTreeModel *mymodel;
+
+       ModestTnyHeaderTreeView *header_view;
+       ModestTnyMsgView *msg_view;
+       ModestUIPrivate *priv;
+
+       g_return_if_fail (modest_ui);
+
+       priv = MODEST_UI_GET_PRIVATE(modest_ui);
+
+       paned = glade_xml_get_widget (priv->glade_xml,"mail_paned");
+       g_return_if_fail (paned);
+
+       scroll = GTK_SCROLLED_WINDOW(gtk_paned_get_child1 (GTK_PANED(paned)));
+       g_return_if_fail (scroll);
+
+       msg_view = MODEST_TNY_MSG_VIEW(gtk_paned_get_child2 (GTK_PANED(paned)));
+       g_return_if_fail (msg_view);
+
+       header_view = MODEST_TNY_HEADER_TREE_VIEW(gtk_bin_get_child (GTK_BIN(scroll)));
+       g_return_if_fail (header_view);
+
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(header_view));
+       g_return_if_fail (sel);
+
+       /* get all selected mails */
+       if (G_LIKELY (gtk_tree_selection_get_selected (sel, &model, &iter)))
+       {
+               TnyMsgHeaderIface *header;
+
+               gtk_tree_model_get (model, &iter, TNY_MSG_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                       &header, -1);
+
+               if (G_LIKELY (header))
+               {
+                       TnyMsgFolderIface *folder;
+                       // const TnyMsgIface *msg;
+
+                       if (GTK_IS_TREE_MODEL_SORT (model))
+                       {
+                               mymodel = gtk_tree_model_sort_get_model
+                                       (GTK_TREE_MODEL_SORT (model));
+                       } else
+                               mymodel = model;
+
+                       folder = (TnyMsgFolderIface*)tny_msg_header_iface_get_folder (header);
+
+                       /* this will make the message as deleted */
+                       /*      tny_msg_folder_iface_expunge (folder); will finally delete messages */
+                       if (TNY_IS_MSG_FOLDER (folder))
+                               tny_msg_folder_iface_remove_message (folder, header);
+                       gtk_widget_queue_draw (GTK_WIDGET (header_view));
+               }
+       }
+}
+
+static void
+on_sendreceive_button_clicked (GtkWidget *widget, ModestUI *modest_ui)
+{
+       ModestUIPrivate *priv;
+       ModestTnyStoreActions *store_actions;
+       TnyAccountStoreIface *account_store;
+       const GList *store_accounts;
+       const GList *iter;
+
+       g_return_if_fail (modest_ui);
+
+       store_actions = MODEST_TNY_STORE_ACTIONS (modest_tny_store_actions_new ());
+       priv = MODEST_UI_GET_PRIVATE(modest_ui);
+
+       account_store = priv->account_store;
+       store_accounts =
+               tny_account_store_iface_get_store_accounts (account_store);
+
+       for (iter = store_accounts; iter; iter = iter->next)
+       {
+               modest_tny_store_actions_update_folders (store_actions,
+                                                                                                TNY_STORE_ACCOUNT_IFACE (iter->data));
+
+       }
+       g_object_unref (store_actions);
 
-       gtk_widget_hide (glade_xml_get_widget (priv->glade_xml, "new_mail"));
 }