Add support in gnome port for detecting if message is modified, showing
[modest] / src / gnome / modest-msg-edit-window.c
index bba0288..2833380 100644 (file)
 #include <widgets/modest-msg-edit-window.h>
 #include <widgets/modest-msg-edit-window-ui.h>
 #include <widgets/modest-combo-box.h>
+#include <widgets/modest-attachments-view.h>
 
 #include <modest-widget-memory.h>
 #include <modest-account-mgr-helpers.h>
+#include <modest-tny-folder.h>
+#include <gtkhtml/gtkhtml.h>
+#include "modest-msg-edit-window-ui-dimming.h"
+#include <modest-platform.h>
+#include <libgnomevfs/gnome-vfs-mime-utils.h>
+#include <libgnomevfs/gnome-vfs.h>
+#include <tny-vfs-stream.h>
+#include <tny-gtk-text-buffer-stream.h>
+#include <gtksourceview/gtksourceview.h>
+#include <modest-utils.h>
+#include <widgets/modest-recpt-editor.h>
+#include <modest-tny-account.h>
 
 static void  modest_msg_edit_window_class_init   (ModestMsgEditWindowClass *klass);
 static void  modest_msg_edit_window_init         (ModestMsgEditWindow *obj);
 static void  modest_msg_edit_window_finalize     (GObject *obj);
 
+static void update_next_cid (ModestMsgEditWindow *self, TnyList *attachments);
+
 /* list my signals */
 enum {
        /* MY_SIGNAL_1, */
@@ -56,15 +71,36 @@ enum {
 typedef struct _ModestMsgEditWindowPrivate ModestMsgEditWindowPrivate;
 struct _ModestMsgEditWindowPrivate {
 
-       GtkWidget   *toolbar;
        GtkWidget   *menubar;
 
        GtkWidget   *msg_body;
+       GtkTextBuffer *text_buffer;
+       
+       ModestPairList *from_field_protos;
        GtkWidget   *from_field;
+       
        GtkWidget   *to_field;
        GtkWidget   *cc_field;
        GtkWidget   *bcc_field;
        GtkWidget   *subject_field;
+
+       GtkWidget   *attachments_view;
+       TnyList     *attachments;
+       guint       next_cid;
+
+       TnyMsg      *draft_msg;
+       TnyMsg      *outbox_msg;
+       gchar       *msg_uid;
+
+       gchar       *references;
+       gchar       *in_reply_to;
+
+       gboolean    sent;
+       gboolean    can_undo, can_redo;
+       gchar       *original_account_name;
+       GtkWidget   *priority_icon;
+       TnyHeaderFlags priority_flags;
+       gulong      account_removed_handler_id;
 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -105,15 +141,29 @@ static void
 save_state (ModestWindow *self)
 {
        modest_widget_memory_save (modest_runtime_get_conf (),
-                                   G_OBJECT(self), "modest-edit-msg-window");
+                                   G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY);
 }
 
 
 static void
 restore_settings (ModestMsgEditWindow *self)
 {
-       modest_widget_memory_restore (modest_runtime_get_conf (),
-                                     G_OBJECT(self), "modest-edit-msg-window");
+       ModestConf *conf = NULL;
+       GtkAction *action;
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
+
+       conf = modest_runtime_get_conf ();
+
+       /* Dim at start clipboard actions */
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu");
+       gtk_action_set_sensitive (action, FALSE);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
+       gtk_action_set_sensitive (action, FALSE);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu");
+       gtk_action_set_sensitive (action, FALSE);
+
+       modest_widget_memory_restore (conf,
+                                     G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY);
 }
 
 static void
@@ -139,7 +189,6 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        ModestMsgEditWindowPrivate *priv;
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
 
-       priv->toolbar       = NULL;
        priv->menubar       = NULL;
        priv->msg_body      = NULL;
        priv->from_field    = NULL;
@@ -147,9 +196,24 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        priv->cc_field      = NULL;
        priv->bcc_field     = NULL;
        priv->subject_field = NULL;
+       priv->attachments_view = NULL;
+       priv->attachments = TNY_LIST (tny_simple_list_new ());
+       priv->sent          = FALSE;
+       priv->next_cid      = 0;
+       priv->draft_msg = NULL;
+       priv->outbox_msg = NULL;
+       priv->msg_uid = NULL;
+       priv->references = NULL;
+       priv->in_reply_to = NULL;
+       priv->can_undo = FALSE;
+       priv->can_redo = FALSE;
+       priv->priority_flags = 0;
+       priv->account_removed_handler_id = 0;
 }
 
-
+/** 
+ * @result: A ModestPairList, which must be freed with modest_pair_list_free().
+ */
 static ModestPairList*
 get_transports (void)
 {
@@ -160,9 +224,9 @@ get_transports (void)
        account_mgr = modest_runtime_get_account_mgr();
        cursor = accounts = modest_account_mgr_account_names (account_mgr, TRUE);
        while (cursor) {
-               gchar *account_name = (gchar*)cursor->data;
+               gchar *account_name = cursor->data ? g_strdup((gchar*)cursor->data) : NULL;
                gchar *from_string  = modest_account_mgr_get_from_string (account_mgr,
-                                                                         account_name);
+                                                                         account_name, NULL);
                if (!from_string)  {
                        /* something went wrong: ignore this one */
                        g_free (account_name);
@@ -187,17 +251,104 @@ on_from_combo_changed (ModestComboBox *combo, ModestWindow *win)
                win, modest_combo_box_get_active_id(combo));
 }
 
+static void
+attachment_deleted (ModestAttachmentsView *attachments_view,
+                   gpointer user_data)
+{
+       modest_msg_edit_window_remove_attachments (MODEST_MSG_EDIT_WINDOW (user_data),
+                                                  NULL);
+}
+
+static void  
+text_buffer_can_undo (GtkTextBuffer *buffer, GParamSpec *param_spec, ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       g_object_get (G_OBJECT (buffer), "can-undo", &(priv->can_undo), NULL);
+}
+
+static void  
+text_buffer_can_redo (GtkTextBuffer *buffer, GParamSpec *param_spec, ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       g_object_get (G_OBJECT (buffer), "can-redo", &(priv->can_redo), NULL);
+}
+
+gboolean            
+modest_msg_edit_window_can_undo (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       return priv->can_undo;
+}
+
+gboolean            
+modest_msg_edit_window_can_redo (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       return priv->can_redo;
+}
+
+static void
+body_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor)
+{
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (editor));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (editor));
+}
+
+static void
+recpt_field_changed (GtkTextBuffer *buffer,
+                 ModestMsgEditWindow *editor)
+{
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (editor));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (editor));
+}
+
+static void
+connect_signals (ModestMsgEditWindow *obj)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
+
+       g_signal_connect (G_OBJECT (priv->text_buffer), "notify::can-undo",
+                         G_CALLBACK (text_buffer_can_undo), obj);
+       g_signal_connect (G_OBJECT (priv->text_buffer), "notify::can-redo",
+                         G_CALLBACK (text_buffer_can_redo), obj);
+       g_signal_connect (G_OBJECT (priv->text_buffer), "changed",
+                          G_CALLBACK (body_changed), obj);
+       g_signal_connect (G_OBJECT (priv->text_buffer), "modified-changed",
+                          G_CALLBACK (body_changed), obj);
+
+       g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))),
+                         "changed", G_CALLBACK (recpt_field_changed), obj);
+       g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))),
+                         "changed", G_CALLBACK (recpt_field_changed), obj);
+       g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field))),
+                         "changed", G_CALLBACK (recpt_field_changed), obj);
+
+       g_signal_connect (G_OBJECT (priv->attachments_view), "delete", G_CALLBACK (attachment_deleted), obj);
+}
+
 
 
 static void
 init_window (ModestMsgEditWindow *obj, const gchar* account)
 {
-       GtkWidget *to_button, *cc_button, *bcc_button; 
+       GtkWidget *to_button, *cc_button, *bcc_button;
+       GtkWidget *subject_box;
        GtkWidget *header_table;
        GtkWidget *main_vbox;
+       GtkWidget *msg_vbox;
+       GtkWidget *scrolled_window;
        ModestMsgEditWindowPrivate *priv;
        ModestWindowPrivate *parent_priv;
-       ModestPairList *protos;
        
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
        parent_priv = MODEST_WINDOW_GET_PRIVATE(obj);
@@ -206,9 +357,12 @@ init_window (ModestMsgEditWindow *obj, const gchar* account)
        cc_button     = gtk_button_new_with_label (_("Cc..."));
        bcc_button    = gtk_button_new_with_label (_("Bcc..."));
        
-       protos = get_transports ();
-       priv->from_field    = modest_combo_box_new (protos, g_str_equal);
-       modest_pair_list_free (protos);
+       /* Note: This ModestPairList* must exist for as long as the combo
+        * that uses it, because the ModestComboBox uses the ID opaquely, 
+        * so it can't know how to manage its memory. */ 
+       priv->from_field_protos = get_transports ();
+       priv->from_field    = modest_combo_box_new (priv->from_field_protos, g_str_equal);
+       
        if (account) {
                modest_combo_box_set_active_id (MODEST_COMBO_BOX(priv->from_field),
                                                (gpointer)account);
@@ -217,47 +371,149 @@ init_window (ModestMsgEditWindow *obj, const gchar* account)
        /* auto-update the active account */
        g_signal_connect (G_OBJECT(priv->from_field), "changed", G_CALLBACK(on_from_combo_changed), obj);
        
-       priv->to_field      = gtk_entry_new_with_max_length (80);
-       priv->cc_field      = gtk_entry_new_with_max_length (80);
-       priv->bcc_field     = gtk_entry_new_with_max_length (80);
+       priv->to_field      = modest_recpt_editor_new ();
+       modest_recpt_editor_set_show_abook_button (MODEST_RECPT_EDITOR (priv->to_field), FALSE);
+       priv->cc_field      = modest_recpt_editor_new ();
+       modest_recpt_editor_set_show_abook_button (MODEST_RECPT_EDITOR (priv->cc_field), FALSE);
+       priv->bcc_field     = modest_recpt_editor_new ();
+       modest_recpt_editor_set_show_abook_button (MODEST_RECPT_EDITOR (priv->bcc_field), FALSE);
+
+       subject_box = gtk_hbox_new (FALSE, 0);
+       priv->priority_icon = gtk_image_new ();
+       gtk_box_pack_start (GTK_BOX (subject_box), priv->priority_icon, FALSE, FALSE, 0);
        priv->subject_field = gtk_entry_new_with_max_length (80);
+       gtk_box_pack_start (GTK_BOX (subject_box), priv->subject_field, TRUE, TRUE, 0);
+       g_object_set (G_OBJECT (priv->subject_field), "truncate-multiline", TRUE, NULL);
+       priv->attachments_view = modest_attachments_view_new (NULL);
        
-       header_table = gtk_table_new (5,2, FALSE);
+       header_table = gtk_table_new (6,2, FALSE);
        
        gtk_table_attach (GTK_TABLE(header_table), gtk_label_new (_("From:")),
-                         0,1,0,1, GTK_SHRINK, 0, 0, 0);
-       gtk_table_attach (GTK_TABLE(header_table), to_button,     0,1,1,2, GTK_SHRINK, 0, 0, 0);
-       gtk_table_attach (GTK_TABLE(header_table), cc_button,     0,1,2,3, GTK_SHRINK, 0, 0, 0);
-       gtk_table_attach (GTK_TABLE(header_table), bcc_button,    0,1,3,4, GTK_SHRINK, 0, 0, 0);
+                         0,1,0,1, GTK_FILL, 0, 0, 0);
+       gtk_table_attach (GTK_TABLE(header_table), to_button,     0,1,1,2, GTK_FILL, 0, 0, 0);
+       gtk_table_attach (GTK_TABLE(header_table), cc_button,     0,1,2,3, GTK_FILL, 0, 0, 0);
+       gtk_table_attach (GTK_TABLE(header_table), bcc_button,    0,1,3,4, GTK_FILL, 0, 0, 0);
        gtk_table_attach (GTK_TABLE(header_table), gtk_label_new (_("Subject:")),
-                         0,1,4,5, GTK_SHRINK, 0, 0, 0);
+                         0,1,4,5, GTK_FILL, 0, 0, 0);
 
        gtk_table_attach_defaults (GTK_TABLE(header_table), priv->from_field,   1,2,0,1);
        gtk_table_attach_defaults (GTK_TABLE(header_table), priv->to_field,     1,2,1,2);
        gtk_table_attach_defaults (GTK_TABLE(header_table), priv->cc_field,     1,2,2,3);
        gtk_table_attach_defaults (GTK_TABLE(header_table), priv->bcc_field,    1,2,3,4);
-       gtk_table_attach_defaults (GTK_TABLE(header_table), priv->subject_field,1,2,4,5);
-
-       priv->msg_body = gtk_text_view_new ();
+       gtk_table_attach_defaults (GTK_TABLE(header_table), subject_box,1,2,4,5);
+       gtk_table_attach_defaults (GTK_TABLE(header_table), priv->attachments_view,1,2,5,6);
+
+       priv->msg_body = gtk_source_view_new ();
+       priv->text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
+       gtk_source_view_set_highlight_current_line (GTK_SOURCE_VIEW (priv->msg_body), TRUE);
+       gtk_source_view_set_right_margin_position (GTK_SOURCE_VIEW (priv->msg_body), 78);
+       gtk_source_view_set_show_right_margin (GTK_SOURCE_VIEW (priv->msg_body), TRUE);
+       gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->msg_body), TRUE);
+       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (priv->msg_body), GTK_WRAP_WORD_CHAR);
+
+       PangoFontDescription *font_desc;
+       font_desc = pango_font_description_from_string ("Monospace");
+       gtk_widget_modify_font (priv->msg_body, font_desc);
+       pango_font_description_free (font_desc);
        
-       main_vbox = gtk_vbox_new  (FALSE, 6);
+       main_vbox = gtk_vbox_new  (FALSE, 0);
+
+       scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), 
+                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
 
        gtk_box_pack_start (GTK_BOX(main_vbox), priv->menubar, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX(main_vbox), priv->toolbar, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX(main_vbox), header_table, FALSE, FALSE, 6);
-       gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 6);
+       gtk_box_pack_start (GTK_BOX(main_vbox), parent_priv->toolbar, FALSE, FALSE, 0);
+       
+       msg_vbox = gtk_vbox_new (FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (main_vbox), msg_vbox, TRUE, TRUE, 0);
+
+       gtk_box_pack_start (GTK_BOX(msg_vbox), header_table, FALSE, FALSE, 0);
+       gtk_container_add (GTK_CONTAINER (scrolled_window), priv->msg_body); 
+
+       gtk_box_pack_start (GTK_BOX(msg_vbox), scrolled_window, TRUE, TRUE, 0);
 
        gtk_widget_show_all (GTK_WIDGET(main_vbox));
        gtk_container_add (GTK_CONTAINER(obj), main_vbox);
+
 }
 
 
 static void
+modest_msg_edit_window_disconnect_signals (ModestWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       if (priv->account_removed_handler_id && 
+           g_signal_handler_is_connected (modest_runtime_get_account_store (), 
+                                          priv->account_removed_handler_id))
+               g_signal_handler_disconnect(modest_runtime_get_account_store (), 
+                                          priv->account_removed_handler_id);
+}
+
+static void
 modest_msg_edit_window_finalize (GObject *obj)
 {
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
+       
+       modest_msg_edit_window_disconnect_signals (MODEST_WINDOW (obj));
+
+       /* These had to stay alive for as long as the comboboxes that used them: */
+       modest_pair_list_free (priv->from_field_protos);
+       g_object_unref (priv->attachments);
+       priv->attachments = NULL;
+
+       if (priv->draft_msg != NULL) {
+               TnyHeader *header = tny_msg_get_header (priv->draft_msg);
+               if (TNY_IS_HEADER (header)) {
+                       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+                       modest_window_mgr_unregister_header (mgr, header);
+               }
+               g_object_unref (priv->draft_msg);
+               priv->draft_msg = NULL;
+       }
+       if (priv->outbox_msg != NULL) {
+               TnyHeader *header = tny_msg_get_header (priv->outbox_msg);
+               if (TNY_IS_HEADER (header)) {
+                       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+                       modest_window_mgr_unregister_header (mgr, header);
+               }
+               g_object_unref (priv->outbox_msg);
+               priv->outbox_msg = NULL;
+       }
+       if (priv->original_account_name)
+               g_free (priv->original_account_name);
+       g_free (priv->msg_uid);
+       g_free (priv->references);
+       g_free (priv->in_reply_to);
+       
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
+static void
+update_next_cid (ModestMsgEditWindow *self, TnyList *attachments)
+{
+       TnyIterator *iter;
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+       for (iter = tny_list_create_iterator (attachments) ; 
+            !tny_iterator_is_done (iter);
+            tny_iterator_next (iter)) {
+               TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (iter);
+               const gchar *cid = tny_mime_part_get_content_id (part);
+               if (cid != NULL) {
+                       char *invalid = NULL;
+                       gint int_cid = strtol (cid, &invalid, 10);
+                       if ((invalid != NULL) && (*invalid == '\0') && (int_cid >= priv->next_cid)) {
+                               priv->next_cid = int_cid + 1;
+                       }
+               }
+               g_object_unref (part);
+       }
+       g_object_unref (iter);
+}
+
 
 
 static gboolean
@@ -272,10 +528,12 @@ static void
 set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
 {
        TnyHeader *header;
-       GtkTextBuffer *buf;
-       const gchar *to, *cc, *bcc, *subject;
+       TnyFolder *msg_folder;
+       gchar *to, *cc, *bcc, *subject;
        ModestMsgEditWindowPrivate *priv;
-       gchar *body;
+       TnyMimePart *body_part;
+       GtkTextBuffer *buffer;
+       TnyHeaderFlags priority_flags;
        
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
        g_return_if_fail (TNY_IS_MSG (msg));
@@ -283,39 +541,141 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 
        header  = tny_msg_get_header (msg);
-       to      = tny_header_get_to (header);
-       cc      = tny_header_get_cc (header);
-       bcc     = tny_header_get_bcc (header);
-       subject = tny_header_get_subject (header);
+       to      = tny_header_dup_to (header);
+       cc      = tny_header_dup_cc (header);
+       bcc     = tny_header_dup_bcc (header);
+       subject = tny_header_dup_subject (header);
+       priority_flags = tny_header_get_priority (header);
 
        if (to)
-               gtk_entry_set_text (GTK_ENTRY(priv->to_field), to);
+               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), to);
        if (cc)
-               gtk_entry_set_text (GTK_ENTRY(priv->cc_field), cc);
+               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field),  cc);
        if (bcc)
-               gtk_entry_set_text (GTK_ENTRY(priv->bcc_field),  bcc);
+               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
        if (subject)
                gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
 
-       
-       buf  = gtk_text_view_get_buffer (GTK_TEXT_VIEW(priv->msg_body));
-       body = modest_tny_msg_get_body (msg, FALSE);
-       if (body) 
-               gtk_text_buffer_set_text (buf, body, -1);
-       g_free (body);
+       modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW(self),
+                                                  priority_flags);
+       modest_tny_msg_get_references (TNY_MSG (msg), NULL, &(priv->references), &(priv->in_reply_to));
+
+       modest_attachments_view_set_message (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), msg);
+       priv->attachments = modest_attachments_view_get_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+       update_next_cid (self, priv->attachments);
+
+       body_part = modest_tny_msg_find_body_part  (msg, FALSE);
+       if (body_part) {
+               TnyStream *stream;
+               gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->msg_body), FALSE);
+               buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
+               stream = TNY_STREAM (tny_gtk_text_buffer_stream_new (buffer));
+               tny_stream_reset (stream);
+               tny_mime_part_decode_to_stream (body_part, stream, NULL);
+               tny_stream_reset (stream);
+               gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->msg_body), TRUE);
+       }
+
+       /* Set the default focus depending on having already a To: field or not */
+       if ((!to)||(*to == '\0')) {
+               modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
+       } else {
+               gtk_widget_grab_focus (priv->msg_body);
+       }
+
+
+       modest_msg_edit_window_set_modified (self, FALSE);
+       text_buffer_can_undo (priv->text_buffer, FALSE, self);
+       text_buffer_can_redo (priv->text_buffer, FALSE, self);
+
+       if (priv->msg_uid) {
+               g_free (priv->msg_uid);
+               priv->msg_uid = NULL;
+       }
+
+       /* we should set a reference to the incoming message if it is a draft */
+       msg_folder = tny_msg_get_folder (msg);
+       if (msg_folder) {               
+               if (modest_tny_folder_is_local_folder (msg_folder)) {
+                       TnyFolderType type = modest_tny_folder_get_local_or_mmc_folder_type (msg_folder);
+                       if (type == TNY_FOLDER_TYPE_INVALID)
+                               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+                       
+                       if (type == TNY_FOLDER_TYPE_DRAFTS) 
+                               priv->draft_msg = g_object_ref(msg);
+                       if (type == TNY_FOLDER_TYPE_OUTBOX)
+                               priv->outbox_msg = g_object_ref(msg);
+                       priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
+               }
+               g_object_unref (msg_folder);
+       }
+
+       g_free (subject);
+       g_free (to);
+       g_free (cc);
+       g_free (bcc);
 }
 
+static void
+modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
+{
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       GtkWidget *tool_item;
+
+       /* Toolbar */
+       parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
+
+       /* Set expand and homogeneous for remaining items */
+       tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSend");
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), FALSE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE);
+       gtk_tool_item_set_is_important (GTK_TOOL_ITEM (tool_item), TRUE);
+       tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarAttach");
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), FALSE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE);
+       gtk_tool_item_set_is_important (GTK_TOOL_ITEM (tool_item), TRUE);
+
+       gtk_toolbar_set_tooltips (GTK_TOOLBAR (parent_priv->toolbar), TRUE);
+
+}
+
+static void
+on_account_removed (TnyAccountStore *account_store, 
+                   TnyAccount *account,
+                   gpointer user_data)
+{
+       /* Do nothing if it's a store account, because we use the
+          transport to send the messages */
+       if (tny_account_get_account_type(account) == TNY_ACCOUNT_TYPE_TRANSPORT) {
+               const gchar *parent_acc = NULL;
+               const gchar *our_acc = NULL;
+
+               our_acc = modest_window_get_active_account (MODEST_WINDOW (user_data));
+               parent_acc = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+               /* Close this window if I'm showing a message of the removed account */
+               if (strcmp (parent_acc, our_acc) == 0)
+                       modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (user_data));
+       }
+}
+
+
 
 ModestWindow *
-modest_msg_edit_window_new (TnyMsg *msg, const gchar *account)
+modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name,
+                           const gchar *mailbox,
+                           gboolean preserve_is_rich)
 {
        ModestMsgEditWindow *self;
        ModestMsgEditWindowPrivate *priv;
        ModestWindowPrivate *parent_priv;
        GtkActionGroup *action_group;
+       ModestDimmingRulesGroup *menu_rules_group = NULL;
+       ModestDimmingRulesGroup *toolbar_rules_group = NULL;
+       ModestDimmingRulesGroup *clipboard_rules_group = NULL;
        GError *error = NULL;
 
        g_return_val_if_fail (msg, NULL);
+       g_return_val_if_fail (account_name, NULL);
        
        self = MODEST_MSG_EDIT_WINDOW(g_object_new(MODEST_TYPE_MSG_EDIT_WINDOW, NULL));
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(self);
@@ -323,6 +683,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account)
        
        parent_priv->ui_manager = gtk_ui_manager_new();
        action_group = gtk_action_group_new ("ModestMsgEditWindowActions");
+       gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
 
        /* Add common actions */
        gtk_action_group_add_actions (action_group,
@@ -333,6 +694,12 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account)
                                             modest_msg_edit_toggle_action_entries,
                                             G_N_ELEMENTS (modest_msg_edit_toggle_action_entries),
                                             self);
+       gtk_action_group_add_radio_actions (action_group,
+                                           modest_msg_edit_priority_action_entries,
+                                           G_N_ELEMENTS (modest_msg_edit_priority_action_entries),
+                                           0,
+                                           G_CALLBACK (modest_ui_actions_msg_edit_on_change_priority),
+                                           self);
        gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0);
        g_object_unref (action_group);
 
@@ -352,15 +719,15 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account)
                                    gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
 
        /* Toolbar / Menubar */
-       priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
+       modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (self));
        priv->menubar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar");
-
-       gtk_toolbar_set_tooltips (GTK_TOOLBAR (priv->toolbar), TRUE);
+       modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->from_field), (gpointer) account_name);
 
        /* Init window */
-       init_window (MODEST_MSG_EDIT_WINDOW(self), account);
+       init_window (MODEST_MSG_EDIT_WINDOW(self), account_name);
 
-       restore_settings (MODEST_MSG_EDIT_WINDOW(self));
+       connect_signals (MODEST_MSG_EDIT_WINDOW (self));
+       restore_settings (MODEST_MSG_EDIT_WINDOW (self));
        
        gtk_window_set_title (GTK_WINDOW(self), "Modest");
        gtk_window_set_icon_from_file (GTK_WINDOW(self), MODEST_APP_ICON, NULL);
@@ -368,8 +735,62 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account)
        g_signal_connect (G_OBJECT(self), "delete-event",
                          G_CALLBACK(on_delete_event), self);
        
+       modest_window_set_active_account (MODEST_WINDOW(self), account_name);
+       priv->original_account_name = (account_name) ? g_strdup (account_name) : NULL;
+
+       parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new ();
+       menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE);
+       toolbar_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_TOOLBAR, TRUE);
+       clipboard_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_CLIPBOARD, FALSE);
+
+       /* Add common dimming rules */
+       modest_dimming_rules_group_add_rules (menu_rules_group, 
+                                             modest_msg_edit_window_menu_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_edit_window_menu_dimming_entries),
+                                             MODEST_WINDOW (self));
+       modest_dimming_rules_group_add_rules (toolbar_rules_group, 
+                                             modest_msg_edit_window_toolbar_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_edit_window_toolbar_dimming_entries),
+                                             MODEST_WINDOW (self));
+/*     modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_color_button, */
+/*                                                 G_CALLBACK (modest_ui_dimming_rules_on_set_style), */
+/*                                                 MODEST_WINDOW (self)); */
+/*     modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_size_toolitem, */
+/*                                                 G_CALLBACK (modest_ui_dimming_rules_on_set_style), */
+/*                                                 MODEST_WINDOW (self)); */
+/*     modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_face_toolitem, */
+/*                                                 G_CALLBACK (modest_ui_dimming_rules_on_set_style), */
+/*                                                 MODEST_WINDOW (self)); */
+       modest_dimming_rules_group_add_rules (clipboard_rules_group, 
+                                             modest_msg_edit_window_clipboard_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_edit_window_clipboard_dimming_entries),
+                                             MODEST_WINDOW (self));
+       /* Insert dimming rules group for this window */
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group);
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group);
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group);
+        /* Checks the dimming rules */
+       g_object_unref (menu_rules_group);
+       g_object_unref (toolbar_rules_group);
+       g_object_unref (clipboard_rules_group);
+
        set_msg (self, msg);
        
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (self), MODEST_DIMMING_RULES_CLIPBOARD);
+
+       modest_msg_edit_window_set_modified (MODEST_MSG_EDIT_WINDOW (self), FALSE);
+
+       /* Track account-removed signal, this window should be closed
+          in the case we're creating a mail associated to the account
+          that is deleted */
+       priv->account_removed_handler_id = 
+               g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
+                                 "account_removed",
+                                 G_CALLBACK(on_account_removed),
+                                 self);
+
        return MODEST_WINDOW(self);
 }
 
@@ -378,11 +799,11 @@ MsgData *
 modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
 {
        MsgData *data;
-       GtkTextBuffer *buf;
-       GtkTextIter b, e;
+       
        const gchar *account_name;
        gchar *from_string = NULL;
        ModestMsgEditWindowPrivate *priv;
+       TnyIterator *att_iter;
        
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window), NULL);
 
@@ -390,39 +811,105 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        
        account_name = (gchar*)modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
        if (account_name) 
-               from_string = modest_account_mgr_get_from_string (
-                       modest_runtime_get_account_mgr(), account_name);
+               from_string = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), 
+                                                                 account_name, NULL);
        if (!from_string) {
                g_printerr ("modest: cannot get from string\n");
                return NULL;
        }
        
-       buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
-       gtk_text_buffer_get_bounds (buf, &b, &e);
-
-       /* don't free these (except from) */
+       
+       
        data = g_slice_new0 (MsgData);
-       data->from    =  from_string, /* will be freed when data is freed */
-       data->to      =  (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->to_field));
-       data->cc      =  (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->cc_field));
-       data->bcc     =  (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->bcc_field));
-       data->subject =  (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->subject_field));
-       data->plain_body    =  gtk_text_buffer_get_text (buf, &b, &e, FALSE);
-       /* No rich supported yet, then html body is NULL */
+       data->account_name = g_strdup (account_name);
+       data->from    =  from_string; /* will be freed when data is freed */
+       data->to      =  g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->to_field)));
+       data->cc      =  g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->cc_field)));
+       data->bcc     =  g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->bcc_field)));
+       data->subject =  g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->subject_field)));
+       data->references = g_strdup (priv->references);
+       data->in_reply_to = g_strdup (priv->in_reply_to);
+       if (priv->draft_msg) {
+               data->draft_msg = g_object_ref (priv->draft_msg);
+       } else if (priv->outbox_msg) {
+               data->draft_msg = g_object_ref (priv->outbox_msg);
+       } else {
+               data->draft_msg = NULL;
+       }
+
+       GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
+       GtkTextIter b, e;
+       gtk_text_buffer_get_bounds (buf, &b, &e);
+       gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+       data->plain_body =  gtk_text_buffer_get_text (buf, &b, &e, FALSE); /* Returns a copy. */
        data->html_body = NULL;
 
+       /* deep-copy the attachment data */
+       att_iter = tny_list_create_iterator (priv->attachments);
+       data->attachments = NULL;
+       while (!tny_iterator_is_done (att_iter)) {
+               TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (att_iter);
+               if (!(TNY_IS_MIME_PART(part))) {
+                       g_warning ("strange data in attachment list");
+                       g_object_unref (part);
+                       tny_iterator_next (att_iter);
+                       continue;
+               }
+               data->attachments = g_list_append (data->attachments,
+                                                  part);
+               tny_iterator_next (att_iter);
+       }
+       g_object_unref (att_iter);
+
+
+       if (priv->draft_msg) {
+               data->draft_msg = g_object_ref (priv->draft_msg);
+       } else if (priv->outbox_msg) {
+               data->draft_msg = g_object_ref (priv->outbox_msg);
+       } else {
+               data->draft_msg = NULL;
+       }
+
+       data->priority_flags = priv->priority_flags;
+
        return data;
 }
 
+static void
+unref_gobject (GObject *obj, gpointer data)
+{
+       if (!G_IS_OBJECT(obj))
+               return;
+       g_object_unref (obj);
+}
+
 void 
 modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
                                      MsgData *data)
 {
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window));
 
-       g_free (data->from);
+       if (!data)
+               return;
+
+       g_free (data->to);
+       g_free (data->cc);
+       g_free (data->bcc);
+       g_free (data->subject);
        g_free (data->plain_body);
        g_free (data->html_body);
+       g_free (data->account_name);
+       g_free (data->references);
+       g_free (data->in_reply_to);
+
+       if (data->draft_msg != NULL) {
+               g_object_unref (data->draft_msg);
+               data->draft_msg = NULL;
+       }       
+       
+       g_list_foreach (data->attachments, (GFunc)unref_gobject,  NULL);
+       g_list_free (data->attachments);
+
        g_slice_free (MsgData, data);
 }
 
@@ -513,6 +1000,107 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
 }
 
 void
+modest_msg_edit_window_attach_file (ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+
+       g_message ("Attach file operation is not supported");
+}
+
+void
+modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
+                                          TnyList *att_list)
+{
+       ModestMsgEditWindowPrivate *priv;
+       TnyIterator *iter;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       if (att_list == NULL) {
+               att_list = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+       } else {
+               g_object_ref (att_list);
+       }
+
+       if (tny_list_get_length (att_list) == 0) {
+               modest_platform_information_banner (NULL, NULL, _("TODO: no attachments selected to remove"));
+       } else {
+               GtkWidget *confirmation_dialog = NULL;
+               gboolean dialog_response;
+               gchar *message = NULL;
+               gchar *filename = NULL;
+
+               if (tny_list_get_length (att_list) == 1) {
+                       TnyMimePart *part;
+                       iter = tny_list_create_iterator (att_list);
+                       part = (TnyMimePart *) tny_iterator_get_current (iter);
+                       g_object_unref (iter);
+                       if (TNY_IS_MSG (part)) {
+                               TnyHeader *header = tny_msg_get_header (TNY_MSG (part));
+                               if (header) {
+                                       filename = tny_header_dup_subject (header);
+                                       g_object_unref (header);
+                               }
+                               if (filename == NULL) {
+                                       filename = g_strdup (_("mail_va_no_subject"));
+                               }
+                       } else {
+                               filename = g_strdup (tny_mime_part_get_filename (TNY_MIME_PART (part)));
+                       }
+                       g_object_unref (part);
+               } else {
+                       filename = g_strdup ("");
+               }
+               message = g_strdup_printf (ngettext("emev_nc_delete_attachment", "emev_nc_delete_attachments",
+                                                   (tny_list_get_length (att_list) == 1)), filename);
+               g_free (filename);
+               confirmation_dialog = gtk_message_dialog_new (GTK_WINDOW (window), 
+                                                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, 
+                                                             GTK_MESSAGE_QUESTION,
+                                                             GTK_BUTTONS_OK_CANCEL,
+                                                             "%s", message);
+               g_free (message);
+               dialog_response = (gtk_dialog_run (GTK_DIALOG (confirmation_dialog))==GTK_RESPONSE_OK);
+               gtk_widget_destroy (confirmation_dialog);
+               if (!dialog_response) {
+                       g_object_unref (att_list);
+                       return;
+               }
+               modest_platform_information_banner (NULL, NULL, _("mcen_ib_removing_attachment"));
+               
+               for (iter = tny_list_create_iterator (att_list);
+                    !tny_iterator_is_done (iter);
+                    tny_iterator_next (iter)) {
+                       TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter);
+                       tny_list_remove (priv->attachments, (GObject *) mime_part);
+
+                       modest_attachments_view_remove_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                                                  mime_part);
+                       gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+                       g_object_unref (mime_part);
+               }
+               g_object_unref (iter);
+       }
+
+       g_object_unref (att_list);
+
+}
+
+void 
+modest_msg_edit_window_get_parts_size (ModestMsgEditWindow *window,
+                                      gint *parts_count,
+                                      guint64 *parts_size)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       modest_attachments_view_get_sizes (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), parts_count, parts_size);
+
+}
+
+void
 modest_msg_edit_window_show_cc (ModestMsgEditWindow *window, 
                                gboolean show)
 {
@@ -546,11 +1134,42 @@ void
 modest_msg_edit_window_set_priority_flags (ModestMsgEditWindow *window,
                                           TnyHeaderFlags priority_flags)
 {
+       ModestMsgEditWindowPrivate *priv;
+       ModestWindowPrivate *parent_priv;
+
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
-      
-       g_message ("not implemented yet %s", __FUNCTION__);
-}
 
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+       if (priv->priority_flags != priority_flags) {
+               GtkAction *priority_action = NULL;
+
+               priv->priority_flags = priority_flags;
+
+               switch (priority_flags) {
+               case TNY_HEADER_FLAG_HIGH_PRIORITY:
+                       gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), "qgn_list_messaging_high", GTK_ICON_SIZE_MENU);
+                       gtk_widget_show (priv->priority_icon);
+                       priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                                                                    "/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityHighMenu");
+                       break;
+               case TNY_HEADER_FLAG_LOW_PRIORITY:
+                       gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), "qgn_list_messaging_low", GTK_ICON_SIZE_MENU);
+                       gtk_widget_show (priv->priority_icon);
+                       priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                                                                    "/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityLowMenu");
+                       break;
+               default:
+                       gtk_widget_hide (priv->priority_icon);
+                       priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                                                                    "/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityNormalMenu");
+                       break;
+               }
+               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priority_action), TRUE);
+               gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+       }
+}
 
 void
 modest_msg_edit_window_select_contacts (ModestMsgEditWindow *window)
@@ -561,7 +1180,7 @@ modest_msg_edit_window_select_contacts (ModestMsgEditWindow *window)
 }
 
 gboolean
-modest_msg_edit_window_check_names (ModestMsgEditWindow *window)
+modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook)
 {
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
 
@@ -577,3 +1196,279 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
 
        g_message ("not implemented yet %s", __FUNCTION__);
 }
+
+gboolean 
+modest_msg_edit_window_get_sent (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
+       return priv->sent;
+}
+
+void 
+modest_msg_edit_window_set_sent (ModestMsgEditWindow *window, 
+                                gboolean sent)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
+       priv->sent = sent;
+}
+
+GtkWidget *
+modest_msg_edit_window_get_child_widget (ModestMsgEditWindow *win,
+                                        ModestMsgEditWindowWidgetType widget_type)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (win), NULL);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (win);
+
+       switch (widget_type) {
+       case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BODY:
+               return priv->msg_body;
+               break;
+       case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_TO:
+               return priv->to_field;
+               break;
+       case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_CC:
+               return priv->cc_field;
+               break;
+       case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BCC:
+               return priv->bcc_field;
+               break;
+       case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_SUBJECT:
+               return priv->subject_field;
+               break;
+       case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_ATTACHMENTS:
+               return priv->attachments_view;
+               break;
+       default:
+               return NULL;
+       }
+       return NULL;
+}
+
+/* FUNCTIONS NOT IMPLEMENTED YET */
+
+void            
+modest_msg_edit_window_set_modified      (ModestMsgEditWindow *window,
+                                         gboolean modified)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       GtkTextBuffer *buffer;
+
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->to_field));
+       gtk_text_buffer_set_modified (buffer, modified);
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->cc_field));
+       gtk_text_buffer_set_modified (buffer, modified);
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->bcc_field));
+       gtk_text_buffer_set_modified (buffer, modified);
+       gtk_text_buffer_set_modified (priv->text_buffer, modified);
+}
+
+void            
+modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window,
+                                           gboolean show)
+{
+       g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+}
+
+void                    
+modest_msg_edit_window_add_part (ModestMsgEditWindow *window,
+                                TnyMimePart *part)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       g_return_if_fail (TNY_IS_MIME_PART (part));
+       tny_list_prepend (priv->attachments, (GObject *) part);
+       modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), part, TRUE, 0);
+}
+
+void            
+modest_msg_edit_window_redo               (ModestMsgEditWindow *window)
+{
+       g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+}
+
+void                    
+modest_msg_edit_window_offer_attach_file           (ModestMsgEditWindow *window)
+{
+       GtkWidget *dialog = NULL;
+       gint response = 0;
+       GSList *uris = NULL;
+       GSList *uri_node;
+       
+       dialog = gtk_file_chooser_dialog_new (_("mcen_ti_select_attachment_title"), 
+                                             GTK_WINDOW (window), 
+                                             GTK_FILE_CHOOSER_ACTION_OPEN,
+                                             GTK_STOCK_OPEN,
+                                             GTK_RESPONSE_OK,
+                                             GTK_STOCK_CANCEL,
+                                             GTK_RESPONSE_CANCEL,
+                                             NULL);
+
+       response = gtk_dialog_run (GTK_DIALOG (dialog));
+       switch (response) {
+       case GTK_RESPONSE_OK:
+               uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog));
+               break;
+       default:
+               break;
+       }
+       gtk_widget_destroy (dialog);
+
+       for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) {
+               const gchar *uri = (const gchar *) uri_node->data;
+               modest_msg_edit_window_attach_file_one (window, uri, MODEST_MAX_ATTACHMENT_SIZE);
+       }
+       g_slist_foreach (uris, (GFunc) g_free, NULL);
+       g_slist_free (uris);
+}
+
+GnomeVFSFileSize
+modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, 
+                                       const gchar *uri,
+                                       GnomeVFSFileSize allowed_size)
+{
+       GnomeVFSHandle *handle = NULL;
+       ModestMsgEditWindowPrivate *priv;
+       GnomeVFSResult result;
+
+       g_return_val_if_fail (window, 0);
+       g_return_val_if_fail (uri, 0);
+               
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       
+       result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+       if (result == GNOME_VFS_OK) {
+               TnyMimePart *mime_part;
+               TnyStream *stream;
+               const gchar *mime_type = NULL;
+               gchar *basename;
+               gchar *escaped_filename;
+               gchar *filename;
+               gchar *content_id;
+               GnomeVFSFileInfo *info;
+               GnomeVFSURI *vfs_uri;
+
+               vfs_uri = gnome_vfs_uri_new (uri);
+
+               escaped_filename = g_path_get_basename (gnome_vfs_uri_get_path (vfs_uri));
+               filename = gnome_vfs_unescape_string_for_display (escaped_filename);
+               g_free (escaped_filename);
+               gnome_vfs_uri_unref (vfs_uri);
+
+               info = gnome_vfs_file_info_new ();
+               
+               if (gnome_vfs_get_file_info (uri, 
+                                            info, 
+                                            GNOME_VFS_FILE_INFO_GET_MIME_TYPE)
+                   == GNOME_VFS_OK)
+                       mime_type = gnome_vfs_file_info_get_mime_type (info);
+               mime_part = tny_platform_factory_new_mime_part
+                       (modest_runtime_get_platform_factory ());
+               stream = TNY_STREAM (tny_vfs_stream_new (handle));
+               
+               tny_mime_part_construct (mime_part, stream, mime_type, "base64");
+
+               g_object_unref (stream);
+               
+               content_id = g_strdup_printf ("%d", priv->next_cid);
+               tny_mime_part_set_content_id (mime_part, content_id);
+               g_free (content_id);
+               priv->next_cid++;
+               
+               basename = g_path_get_basename (filename);
+               tny_mime_part_set_filename (mime_part, basename);
+               g_free (basename);
+               
+               tny_list_prepend (priv->attachments, (GObject *) mime_part);
+               modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                                       mime_part,
+                                                       info->size == 0, info->size);
+               gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+               g_free (filename);
+               g_object_unref (mime_part);
+               gnome_vfs_file_info_unref (info);
+       }
+       /* TODO: return proper file size */
+       return 0;
+}
+
+void            
+modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
+                                 TnyMsg *draft)
+{
+       ModestMsgEditWindowPrivate *priv;
+       TnyHeader *header = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       g_return_if_fail ((draft == NULL)||(TNY_IS_MSG (draft)));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+
+       if (priv->draft_msg != NULL) {
+               g_object_unref (priv->draft_msg);
+       }
+
+       if (draft != NULL) {
+               g_object_ref (draft);
+               header = tny_msg_get_header (draft);
+               if (priv->msg_uid) {
+                       g_free (priv->msg_uid);
+                       priv->msg_uid = NULL;
+               }
+               priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
+               if (GTK_WIDGET_REALIZED (window))
+                       modest_window_mgr_register_window (mgr, MODEST_WINDOW (window), NULL);
+       }
+
+       priv->draft_msg = draft;
+}
+
+gboolean        
+modest_msg_edit_window_is_modified         (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       const char *account_name;
+       GtkTextBuffer *buffer;
+
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->to_field));
+       if (gtk_text_buffer_get_modified (buffer))
+               return TRUE;
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->cc_field));
+       if (gtk_text_buffer_get_modified (buffer))
+               return TRUE;
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->bcc_field));
+       if (gtk_text_buffer_get_modified (buffer))
+               return TRUE;
+       if (gtk_text_buffer_get_modified (priv->text_buffer))
+               return TRUE;
+       account_name = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
+       if (!priv->original_account_name || strcmp(account_name, priv->original_account_name)) {
+               return TRUE;
+       }
+
+       return FALSE;
+}
+
+const gchar *
+modest_msg_edit_window_get_clipboard_text (ModestMsgEditWindow *win)
+{
+       g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+       return NULL;
+}
+
+const gchar*    
+modest_msg_edit_window_get_message_uid (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), NULL);        
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       return priv->msg_uid;
+}