* moded find_body_part from modest-tny-msg-view to modest-tny-msg-actions
[modest] / src / gtk-glade / modest-ui.c
index 9e4c0d9..ba5a004 100644 (file)
@@ -7,6 +7,9 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
+/* TODO: put in auto* */
+#include <tny-text-buffer-stream.h>
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif /*HAVE_CONFIG_H*/
@@ -21,8 +24,8 @@
 #include "../modest-tny-msg-view.h"
 #include "../modest-tny-transport-actions.h"
 
-
-//#include "modest.glade.h"
+#include "../modest-text-utils.h"
+#include "../modest-tny-msg-actions.h"
 
 #define MODEST_GLADE          PREFIX "/share/modest/glade/modest.glade"
 #define MODEST_GLADE_MAIN_WIN "main"
@@ -43,6 +46,9 @@ static GtkWidget* modest_main_window_folder_tree (ModestAccountMgr *modest_acc_m
 static GtkWidget* modest_main_window_header_tree (TnyMsgFolderIface *folder);
 
 
+void on_account_settings1_activate (GtkMenuItem *,
+                                   gpointer);
+
 static void on_password_requested (ModestTnyAccountStore *account_store,
                                   const gchar *account_name, gpointer user_data);
 
@@ -54,10 +60,14 @@ static void on_message_clicked (ModestTnyFolderTreeView *folder_tree,
                                gpointer data);
 static void on_new_mail_clicked (GtkWidget *widget, ModestUI *modest_ui);
 
+static void on_reply_clicked (GtkWidget *widget, ModestUI *modest_ui);
+
 static void on_send_button_clicked (GtkWidget *widget, ModestUI *modest_ui);
 
 static void register_toolbar_callbacks (ModestUI *modest_ui);
 
+static void reply_to_msg (ModestUI *modest_ui, TnyMsgHeaderIface *header,
+                                               ModestTnyMsgView *msg_view);
 
 /* list my signals */
 enum {
@@ -69,13 +79,13 @@ enum {
 
 typedef struct _ModestUIPrivate ModestUIPrivate;
 struct _ModestUIPrivate {
-       
+
        ModestConf           *modest_conf;
        ModestAccountMgr     *modest_acc_mgr;
        ModestWindowMgr      *modest_window_mgr;
        TnyAccountStoreIface *account_store;
-       
-       GtkWindow            *main_window;
+
+       GtkWindow            *main_window;
        GladeXML             *glade_xml;
 
 
@@ -140,27 +150,27 @@ modest_ui_init (ModestUI *obj)
        priv->modest_conf       = NULL;
        priv->modest_window_mgr = NULL;
        priv->glade_xml         = NULL;
-       
+
 }
 
 static void
 modest_ui_finalize (GObject *obj)
 {
-       ModestUIPrivate *priv = MODEST_UI_GET_PRIVATE(obj);     
-       
+       ModestUIPrivate *priv = MODEST_UI_GET_PRIVATE(obj);
+
        if (priv->modest_acc_mgr)
                g_object_unref (priv->modest_acc_mgr);
        priv->modest_acc_mgr = NULL;
-       
+
        if (priv->modest_conf)
                g_object_unref (priv->modest_conf);
        priv->modest_conf = NULL;
-       
+
        if (priv->modest_window_mgr)
                g_object_unref (priv->modest_window_mgr);
        priv->modest_window_mgr = NULL;
 }
-       
+
 GObject*
 modest_ui_new (ModestConf *modest_conf)
 {
@@ -168,10 +178,10 @@ modest_ui_new (ModestConf *modest_conf)
        ModestUIPrivate *priv;
        ModestAccountMgr *modest_acc_mgr;
        TnyAccountStoreIface *account_store_iface;
-       
+
        g_return_val_if_fail (modest_conf, NULL);
 
-       obj = g_object_new(MODEST_TYPE_UI, NULL);       
+       obj = g_object_new(MODEST_TYPE_UI, NULL);
        priv = MODEST_UI_GET_PRIVATE(obj);
 
        modest_acc_mgr =
@@ -181,30 +191,34 @@ modest_ui_new (ModestConf *modest_conf)
                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) {
                g_warning ("could not initialze ModestTnyAccountStore");
                return NULL;
        }
-       g_signal_connect (account_store_iface, "password_requested", 
+       g_signal_connect (account_store_iface, "password_requested",
                          G_CALLBACK(on_password_requested),
-                         NULL);        
+                         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;
        g_object_ref (priv->modest_conf = modest_conf);
 
        priv->account_store = account_store_iface;
-       
+
        priv->modest_window_mgr = MODEST_WINDOW_MGR(modest_window_mgr_new());
        g_signal_connect (priv->modest_window_mgr, "last_window_closed",
                          G_CALLBACK(modest_ui_last_window_closed),
@@ -221,18 +235,19 @@ modest_ui_show_main_window (ModestUI *modest_ui)
        ModestUIPrivate *priv;
        GtkWidget     *folder_view, *header_view;
        GtkWidget     *message_view;
-       
+       GtkWidget *account_settings_item;
+
        GtkWidget  *folder_view_holder,
                *header_view_holder,
-               *message_view_holder;
+               *mail_paned;
 
        priv = MODEST_UI_GET_PRIVATE(modest_ui);
-       
+
        height = modest_conf_get_int (priv->modest_conf,
                                      MODEST_CONF_MAIN_WINDOW_HEIGHT,NULL);
        width  = modest_conf_get_int (priv->modest_conf,
                                      MODEST_CONF_MAIN_WINDOW_WIDTH,NULL);
-       
+
        win = glade_xml_get_widget (priv->glade_xml, "main");
        if (!win) {
                g_warning ("could not create main window");
@@ -248,7 +263,7 @@ modest_ui_show_main_window (ModestUI *modest_ui)
                return FALSE;
        }
        gtk_container_add (GTK_CONTAINER(folder_view_holder), folder_view);
-       
+
        header_view  =  GTK_WIDGET(modest_main_window_header_tree (NULL));
        header_view_holder = glade_xml_get_widget (priv->glade_xml, "mail_list");
        if (!header_view) {
@@ -257,30 +272,41 @@ modest_ui_show_main_window (ModestUI *modest_ui)
        }
        gtk_container_add (GTK_CONTAINER(header_view_holder), header_view);
 
-       g_signal_connect (G_OBJECT(folder_view), "folder_selected", 
+       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");
        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_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, "account_settings1");
+       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);
 
        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),
                          modest_ui);
        gtk_widget_set_usize (GTK_WIDGET(win), height, width);
        gtk_window_set_title (GTK_WINDOW(win), PACKAGE_STRING);
-       
+
        gtk_widget_show_all (win);
        return TRUE;
 }
@@ -291,15 +317,20 @@ register_toolbar_callbacks (ModestUI *modest_ui)
 {
        ModestUIPrivate *priv;
        GtkWidget *button;
-       
+
        g_return_if_fail (modest_ui);
 
        priv = MODEST_UI_GET_PRIVATE (modest_ui);
-       
+
        button = glade_xml_get_widget (priv->glade_xml, "toolb_new_mail");
        if (button)
                g_signal_connect (button, "clicked",
                                  G_CALLBACK(on_new_mail_clicked), modest_ui);
+
+       button = glade_xml_get_widget (priv->glade_xml, "toolb_reply");
+       if (button)
+               g_signal_connect (button, "clicked",
+                                 G_CALLBACK(on_reply_clicked), modest_ui);
 }
 
 
@@ -319,10 +350,12 @@ modest_ui_show_edit_window (ModestUI *modest_ui, const gchar* to,
                            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,
                                          MODEST_CONF_EDIT_WINDOW_HEIGHT,NULL);
@@ -334,10 +367,22 @@ modest_ui_show_edit_window (ModestUI *modest_ui, const gchar* to,
                g_warning ("could not create new mail  window");
                return FALSE;
        }
-       
+
        modest_window_mgr_register (priv->modest_window_mgr,
                                    G_OBJECT(win), MODEST_EDIT_WINDOW, 0);
+       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", G_CALLBACK(hide_edit_window),
                          NULL);
 
@@ -345,7 +390,7 @@ modest_ui_show_edit_window (ModestUI *modest_ui, const gchar* to,
        gtk_window_set_title (GTK_WINDOW(win),
                              subject ? subject : "Untitled");
 
-       
+
        btn = glade_xml_get_widget (priv->glade_xml, "toolb_send");
        g_signal_connect (btn, "clicked", G_CALLBACK(on_send_button_clicked),
                          modest_ui);
@@ -376,8 +421,90 @@ modest_ui_last_window_closed (GObject *obj, gpointer data)
        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);
+}
+
+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;
+
+       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);
+}
 
 static void
 on_folder_clicked (ModestTnyFolderTreeView *folder_tree,
@@ -388,21 +515,21 @@ on_folder_clicked (ModestTnyFolderTreeView *folder_tree,
        ModestTnyHeaderTreeView *tree_view;
        ModestUIPrivate *priv;
        GtkWidget *scrollview;
-               
+
        g_return_if_fail (folder);
        g_return_if_fail (data);
 
        priv = MODEST_UI_GET_PRIVATE(data);
        scrollview = glade_xml_get_widget (priv->glade_xml,"mail_list");
-       
+
        tree_view = MODEST_TNY_HEADER_TREE_VIEW(
                gtk_bin_get_child(GTK_BIN(scrollview)));
        win = glade_xml_get_widget (priv->glade_xml, "main");
        gtk_window_set_title (GTK_WINDOW(win),
                              tny_msg_folder_iface_get_name(folder));
-       
+
        modest_tny_header_tree_view_set_folder (tree_view,
-                                               folder);        
+                                               folder);
 }
 
 
@@ -411,125 +538,105 @@ static void on_message_clicked (ModestTnyFolderTreeView *folder_tree,
                                TnyMsgIface *message,
                                gpointer data)
 {
-       GtkWidget *scrollview;
+       GtkWidget *paned;
        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);
 }
 
-
 static void
 on_password_requested (ModestTnyAccountStore *account_store,
                       const gchar *account_name, gpointer user_data)
 {
 
-       GtkWidget *dialog;
-       dialog = gtk_message_dialog_new_with_markup (NULL,
-                                        GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        GTK_MESSAGE_INFO,
-                                        GTK_BUTTONS_CLOSE,
-                                                    "This dialog asks you for the password for account <b>%s</b>\n"
-                                                    "However, it's not working yet. So for now, use\n"
-                                                    "<i>gconf-editor</i>, and stay tuned!",
-                                                    account_name);
-       gtk_dialog_run (GTK_DIALOG(dialog));
-       gtk_widget_destroy (dialog);
+       GtkWidget *passdialog;
+       GtkWidget *vbox;
+       GtkWidget *infolabel;
+       GtkWidget *passentry;
+       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,
+                                                GTK_STOCK_OK,
+                                                GTK_RESPONSE_ACCEPT,
+                                                GTK_STOCK_CANCEL,
+                                                GTK_RESPONSE_REJECT,
+                                                NULL);
+
+       vbox=gtk_vbox_new(FALSE, 0);
+
+       infolabel=gtk_label_new(infostring);
+       passentry=gtk_entry_new();
+
+       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(passdialog)->vbox), infolabel, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(passdialog)->vbox), passentry, FALSE, FALSE, 0);
+       gtk_widget_show_all(passdialog);
+
+       retval = gtk_dialog_run (GTK_DIALOG(passdialog));
+
+       switch (retval)
+       {
+       case GTK_RESPONSE_ACCEPT:
+               modest_account_mgr_set_server_account_string(modest_tny_account_store_get_accout_mgr(account_store),
+                                                            account_name,
+                                                            "password",
+                                                            gtk_entry_get_text(GTK_ENTRY(passentry)),
+                                                            NULL);
+               break;
+       case GTK_RESPONSE_CANCEL:
+               /* FIXME:
+                * What happens, if canceled?"
+                */
+               break;
+       }
+
+       gtk_widget_destroy (passdialog);
 }
-       
-                                      
-                                    
+
+
+
 
 
 
 static GtkWidget*
 modest_main_window_header_tree (TnyMsgFolderIface *folder)
 {
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); 
        GtkWidget *header_tree;
-       
+
        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);
-
        
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(folder_tree), TRUE);
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(folder_tree), TRUE);
-
        return folder_tree;
 }
 
@@ -541,6 +648,96 @@ on_new_mail_clicked (GtkWidget *widget, ModestUI *modest_ui)
        modest_ui_show_edit_window (modest_ui, "", "", "", "", "", NULL);
 }
 
+static void
+reply_to_msg (ModestUI *modest_ui, TnyMsgHeaderIface *header,
+                                               ModestTnyMsgView *msg_view) {
+       const TnyMsgIface *msg;
+       const TnyMsgFolderIface *folder;
+       GString *re_sub;
+       const gchar *subject, *from;
+       gchar *unquoted, *quoted;
+       time_t sent_date;
+       gint line_limit = 76;
+       
+       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);
+       g_string_prepend(re_sub, "Re: ");
+       /* 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);
+       
+       modest_ui_show_edit_window (modest_ui, from, /* cc */ "", /* bcc */ "", re_sub->str, quoted, NULL);
+       g_free(quoted);
+       g_free(unquoted);
+       g_string_free(re_sub, TRUE);
+}
+
+
+static void
+on_reply_clicked (GtkWidget *widget, ModestUI *modest_ui)
+{
+       GtkTreeSelection *sel;
+       GtkWidget *paned;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+       GtkScrolledWindow *scroll;
+
+       TnyMsgHeaderIface *header;
+
+       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);
+
+       if (!gtk_tree_selection_get_selected (sel, &model, &iter)) {
+               /* no message was selected. TODO: disable reply button in this case */
+               g_warning("nothing to reply to");
+               return;
+       }
+
+       gtk_tree_model_get (model, &iter,
+                           TNY_MSG_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                           &header, -1);
+
+       reply_to_msg (modest_ui, header, msg_view);
+}
+
 
 /* FIXME: truly evil --> we cannot really assume that
  * there is only one edit window open...
@@ -551,22 +748,24 @@ on_send_button_clicked (GtkWidget *widget, ModestUI *modest_ui)
        ModestTnyTransportActions *actions;
        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;
+       ModestAccountMgr *acc_mgr;
+
        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;
-       transport_accounts = 
+       transport_accounts =
                tny_account_store_iface_get_transport_accounts (account_store);
        if (!transport_accounts) {
                g_message ("cannot send message: no transport account defined");
@@ -574,11 +773,11 @@ on_send_button_clicked (GtkWidget *widget, ModestUI *modest_ui)
        } else /* take the first one! */
                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      = gtk_entry_get_text (GTK_ENTRY(to_entry));
        subject = gtk_entry_get_text (GTK_ENTRY(subject_entry));
 
@@ -586,12 +785,22 @@ 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);
+       /* FIXME: HACK! */
+       conf = MODEST_CONF(modest_conf_new());
+       acc_mgr = MODEST_ACCOUNT_MGR(modest_account_mgr_new (conf));
+       if (!acc_mgr) {
+               g_warning ("failed to instantiate account mgr");
+               return;
+       }
+       email_from = modest_account_mgr_get_identity_string(acc_mgr, "myidentity", MODEST_ACCOUNT_EMAIL, NULL);
+       /* end HACK */
+       
+       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);       
+                                                  body);
        g_free (body);
        g_object_unref (G_OBJECT(actions));