* Added an attribute sent to the msg edit window that specifies that the mail has...
[modest] / src / maemo / modest-msg-edit-window.c
index 992e844..c120bb0 100644 (file)
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <tny-account-store.h>
 #include <tny-fs-stream.h>
+#include <tny-vfs-stream.h>
 
 #include <config.h>
 
 
 #include <widgets/modest-msg-edit-window.h>
 #include <widgets/modest-combo-box.h>
+#include <widgets/modest-recpt-editor.h>
+#include <widgets/modest-attachments-view.h>
 
 #include <modest-runtime.h>
 
+#include "modest-platform.h"
 #include "modest-icon-names.h"
 #include "modest-widget-memory.h"
 #include "modest-window-priv.h"
 #include "modest-mail-operation.h"
 #include "modest-tny-platform-factory.h"
 #include "modest-tny-msg.h"
+#include "modest-address-book.h"
+#include "modest-text-utils.h"
 #include <tny-simple-list.h>
 #include <wptextview.h>
 #include <wptextbuffer.h>
-#include <hildon-widgets/hildon-color-selector.h>
-#include <hildon-widgets/hildon-color-button.h>
-#include <hildon-widgets/hildon-banner.h>
-#include <hildon-widgets/hildon-caption.h>
-
-#ifdef MODEST_HILDON_VERSION_0
-#include <hildon-widgets/hildon-file-chooser-dialog.h>
+#include "modest-scroll-area.h"
+
+#include "modest-hildon-includes.h"
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#include <hildon-widgets/hildon-color-chooser.h>
+#endif
+#include "widgets/modest-msg-edit-window-ui.h"
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#include <libgnomevfs/gnome-vfs-mime-utils.h>
 #else
-#include <hildon/hildon-file-chooser-dialog.h>
-#include <widgets/modest-msg-edit-window-ui.h>
-
-#endif /*MODEST_HILDON_VERSION_0 */
-
+#include <libgnomevfs/gnome-vfs-mime.h>
+#endif
+#include "modest-maemo-utils.h"
 
 
 #define DEFAULT_FONT_SIZE 3
 #define DEFAULT_FONT 2
+#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans"
 #define DEFAULT_SIZE_COMBOBOX_WIDTH 80
 #define DEFAULT_MAIN_VBOX_SPACING 6
 #define SUBJECT_MAX_LENGTH 1000
+#define IMAGE_MAX_WIDTH 640
 
 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 gboolean msg_body_focus (GtkWidget *focus, GdkEventFocus *event, gpointer userdata);
+static void  recpt_field_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor);
+static void  send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
+static void  style_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
+static void  remove_attachment_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
+static void  zoom_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
+static void  paste_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
+static void  setup_insensitive_handlers (ModestMsgEditWindow *editor);
+static void  reset_modified (ModestMsgEditWindow *editor);
+
 static void  text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *window);
-static void  text_buffer_mark_set (GtkTextBuffer *buffer, GtkTextIter *location, GtkTextMark *mark, gpointer userdata);
+static void  text_buffer_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, gpointer userdata);
+static void  text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window);
+static void  text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id);
+static void  subject_field_changed (GtkEditable *editable, ModestMsgEditWindow *window);
 static void  modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window,
                                                         gpointer userdata);
-static void  modest_msg_edit_window_size_combobox_change (ModestMsgEditWindow *window,
-                                                         gpointer userdata);
-static void  modest_msg_edit_window_font_combobox_change (ModestMsgEditWindow *window,
-                                                         gpointer userdata);
+static void  modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item,
+                                                gpointer userdata);
+static void  modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item,
+                                                gpointer userdata);
 static void  modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window);
 static gboolean modest_msg_edit_window_window_state_event (GtkWidget *widget, 
                                                           GdkEventWindowState *event, 
                                                           gpointer userdata);
+static void modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window,
+                                                    ModestRecptEditor *editor);
+static void modest_msg_edit_window_add_attachment_clicked (GtkButton *button,
+                                                          ModestMsgEditWindow *window);
 
 /* ModestWindow methods implementation */
 static void  modest_msg_edit_window_set_zoom (ModestWindow *window, gdouble zoom);
 static gdouble modest_msg_edit_window_get_zoom (ModestWindow *window);
 static gboolean modest_msg_edit_window_zoom_minus (ModestWindow *window);
 static gboolean modest_msg_edit_window_zoom_plus (ModestWindow *window);
-
-
+static void modest_msg_edit_window_show_toolbar   (ModestWindow *window,
+                                                  gboolean show_toolbar);
+static void modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard,
+                                                          GdkEvent *event,
+                                                          ModestMsgEditWindow *window);
+static void modest_msg_edit_window_system_clipboard_owner_change (GtkClipboard *clipboard,
+                                                                 GdkEvent *event,
+                                                                 ModestMsgEditWindow *window);
+static void update_window_title (ModestMsgEditWindow *window);
+static void update_dimmed (ModestMsgEditWindow *window);
+static void update_paste_dimming (ModestMsgEditWindow *window);
+static void update_select_all_dimming (ModestMsgEditWindow *window);
+static void update_zoom_dimming (ModestMsgEditWindow *window);
+
+/* Find toolbar */
+static void modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
+                                                       ModestMsgEditWindow *window);
+static void modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
+                                                      ModestMsgEditWindow *window);
+static void edit_menu_activated (GtkAction *action,
+                                gpointer userdata);
+static void view_menu_activated (GtkAction *action,
+                                gpointer userdata);
 
 /* list my signals */
 enum {
@@ -111,27 +157,49 @@ typedef struct _ModestMsgEditWindowPrivate ModestMsgEditWindowPrivate;
 struct _ModestMsgEditWindowPrivate {
        GtkWidget   *msg_body;
        GtkWidget   *header_box;
+       
+       ModestPairList *from_field_protos;
        GtkWidget   *from_field;
+       
        GtkWidget   *to_field;
        GtkWidget   *cc_field;
        GtkWidget   *bcc_field;
        GtkWidget   *subject_field;
+       GtkWidget   *attachments_view;
+       GtkWidget   *priority_icon;
+       GtkWidget   *add_attachment_button;
 
        GtkWidget   *cc_caption;
        GtkWidget   *bcc_caption;
+       GtkWidget   *attachments_caption;
 
        GtkTextBuffer *text_buffer;
 
+       GtkWidget   *font_size_toolitem;
+       GtkWidget   *font_face_toolitem;
        GtkWidget   *font_color_button;
-       GtkWidget   *size_combobox;
-       GtkWidget   *font_combobox;
+       GSList      *font_items_group;
+       GtkWidget   *font_tool_button_label;
+       GSList      *size_items_group;
+       GtkWidget   *size_tool_button_label;
+       
+       GtkWidget   *find_toolbar;
 
        GtkWidget   *scroll;
+       GtkWidget   *scroll_area;
 
        gint last_cid;
        GList *attachments;
 
+       TnyHeaderFlags priority_flags;
+
        gdouble zoom_level;
+       
+       gulong      clipboard_change_handler_id;
+       gulong      system_clipboard_change_handler_id;
+
+       TnyMsg      *draft_msg;
+       gboolean    sent;
 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -170,6 +238,22 @@ modest_msg_edit_window_get_type (void)
 }
 
 static void
+save_state (ModestWindow *self)
+{
+       modest_widget_memory_save (modest_runtime_get_conf(),
+                                  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_CONF_EDIT_WINDOW_KEY);
+}
+
+
+static void
 modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass)
 {
        GObjectClass *gobject_class;
@@ -184,8 +268,11 @@ modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass)
        modest_window_class->get_zoom_func = modest_msg_edit_window_get_zoom;
        modest_window_class->zoom_plus_func = modest_msg_edit_window_zoom_plus;
        modest_window_class->zoom_minus_func = modest_msg_edit_window_zoom_minus;
+       modest_window_class->show_toolbar_func = modest_msg_edit_window_show_toolbar;
 
        g_type_class_add_private (gobject_class, sizeof(ModestMsgEditWindowPrivate));
+
+       modest_window_class->save_state_func = save_state;
 }
 
 static void
@@ -206,134 +293,125 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
 
        priv->cc_caption    = NULL;
        priv->bcc_caption    = NULL;
-}
 
+       priv->priority_flags = 0;
 
+       priv->find_toolbar = NULL;
 
-static void
-save_settings (ModestMsgEditWindow *self)
-{
-       modest_widget_memory_save (modest_runtime_get_conf(),
-                                  G_OBJECT(self), "modest-edit-msg-window");
-}
-
-
-static void
-restore_settings (ModestMsgEditWindow *self)
-{
-       modest_widget_memory_restore (modest_runtime_get_conf(),
-                                     G_OBJECT(self), "modest-edit-msg-window");
+       priv->draft_msg = NULL;
+       priv->clipboard_change_handler_id = 0;
+       priv->system_clipboard_change_handler_id = 0;
+       priv->sent = FALSE;
 }
 
 
 /* FIXME: this is a dup from the one in gtk/ */
+
+/** 
+ * @result: A ModestPairList, which must be freed with modest_pair_list_free().
+ */
 static ModestPairList*
 get_transports (void)
 {
-       ModestAccountMgr *account_mgr;
        GSList *transports = NULL;
-       GSList *cursor, *accounts;
        
-       account_mgr = modest_runtime_get_account_mgr();
-       cursor = accounts = modest_account_mgr_account_names (account_mgr); 
+       ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
+       GSList *accounts = modest_account_mgr_account_names (account_mgr, 
+                                                            TRUE /* only enabled accounts. */); 
+                                               
+       GSList *cursor = accounts;
        while (cursor) {
-               gchar *account_name = (gchar*)cursor->data;
-               gchar *from_string  = modest_account_mgr_get_from_string (account_mgr,
+               gchar *account_name = cursor->data;
+               gchar *from_string  = NULL;
+               if (account_name) {
+                       from_string = modest_account_mgr_get_from_string (account_mgr,
                                                                          account_name);
-               if (!from_string)  {
-                       /* something went wrong: ignore this one */
-                       g_free (account_name);
-                       cursor->data = NULL;
-               } else {
-                       ModestPair *pair;
-                       pair = modest_pair_new ((gpointer) account_name,
+               }
+               
+               if (from_string && account_name) {
+                       gchar *name = account_name;
+                       ModestPair *pair = modest_pair_new ((gpointer) name,
                                                (gpointer) from_string , TRUE);
                        transports = g_slist_prepend (transports, pair);
-               } /* don't free account name; it's freed when the transports list is freed */
+               }
+               
                cursor = cursor->next;
        }
-       g_slist_free (accounts);
+       g_slist_free (accounts); /* only free the accounts, not the elements,
+                                 * because they are used in the pairlist */
        return transports;
 }
 
 
 static void
-text_buffer_mark_set (GtkTextBuffer *buffer, GtkTextIter *iter, GtkTextMark *mark, gpointer userdata)
-{
-       ModestMsgEditWindow *window;
-       ModestMsgEditWindowPrivate *priv;
-       GdkRectangle location;
-       gint v_scroll_min_value = 0;
-       gint v_scroll_max_value = 0;
-       gint v_scroll_visible;
-       GtkAdjustment *vadj;
-       GtkTextMark *insert_mark;
-       GtkTextIter insert_iter;
-       
-       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (userdata));
-       g_return_if_fail (GTK_IS_TEXT_MARK (mark));
-       window = MODEST_MSG_EDIT_WINDOW (userdata);
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-               
-       insert_mark = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer));
-       gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer), &insert_iter, insert_mark);
-       gtk_text_view_get_iter_location (GTK_TEXT_VIEW (priv->msg_body), &insert_iter, &location);
-       
-       if (priv->header_box)
-               v_scroll_min_value += priv->header_box->allocation.height + DEFAULT_MAIN_VBOX_SPACING;
-       v_scroll_min_value += location.y;
-       v_scroll_max_value = v_scroll_min_value + location.height;
-       
-       v_scroll_visible = GTK_WIDGET (window)->allocation.height;
-       
-       vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll));
-       
-       if (((gdouble) v_scroll_min_value) < vadj->value)
-               gtk_adjustment_set_value (vadj, v_scroll_min_value);
-       else if (((gdouble) v_scroll_max_value) > (vadj->value + vadj->page_size))
-               gtk_adjustment_set_value (vadj, ((gdouble)v_scroll_max_value) - vadj->page_size);
-}
-
-static void
 init_window (ModestMsgEditWindow *obj)
 {
        GtkWidget *from_caption, *to_caption, *subject_caption;
        GtkWidget *main_vbox;
        ModestMsgEditWindowPrivate *priv;
-       ModestPairList *protos;
+
        GtkSizeGroup *size_group;
+       GtkWidget *frame;
+       GtkWidget *subject_box;
+       GtkWidget *attachment_icon;
+       GtkWidget *window_box;
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
 
        size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
-       protos = get_transports ();
-       priv->from_field    = modest_combo_box_new (protos, g_str_equal);
-       modest_pair_list_free (protos);
-
-       priv->to_field      = gtk_entry_new_with_max_length (80);
-       g_object_set (G_OBJECT (priv->to_field), "autocap", FALSE, NULL);
-       priv->cc_field      = gtk_entry_new_with_max_length (80);
-       g_object_set (G_OBJECT (priv->cc_field), "autocap", FALSE, NULL);
-       priv->bcc_field     = gtk_entry_new_with_max_length (80);
-       g_object_set (G_OBJECT (priv->bcc_field), "autocap", FALSE, NULL);
-       priv->subject_field = gtk_entry_new_with_max_length (80);
-       g_object_set (G_OBJECT (priv->subject_field), "autocap", TRUE, NULL);
-       gtk_entry_set_max_length (GTK_ENTRY (priv->subject_field), SUBJECT_MAX_LENGTH);
+       /* 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);
+
+       priv->to_field      = modest_recpt_editor_new ();
+       priv->cc_field      = modest_recpt_editor_new ();
+       priv->bcc_field     = modest_recpt_editor_new ();
+       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 (SUBJECT_MAX_LENGTH);
+       hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->subject_field), 
+                                        HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
+       gtk_box_pack_start (GTK_BOX (subject_box), priv->subject_field, TRUE, TRUE, 0);
+       priv->add_attachment_button = gtk_button_new ();
+       GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (priv->add_attachment_button), GTK_CAN_FOCUS);
+       gtk_button_set_relief (GTK_BUTTON (priv->add_attachment_button), GTK_RELIEF_NONE);
+       gtk_button_set_focus_on_click (GTK_BUTTON (priv->add_attachment_button), FALSE);
+       gtk_button_set_alignment (GTK_BUTTON (priv->add_attachment_button), 1.0, 1.0);
+       attachment_icon = gtk_image_new_from_icon_name (MODEST_HEADER_ICON_ATTACH, GTK_ICON_SIZE_BUTTON);
+       gtk_container_add (GTK_CONTAINER (priv->add_attachment_button), attachment_icon);
+       gtk_box_pack_start (GTK_BOX (subject_box), priv->add_attachment_button, FALSE, FALSE, 0);
+       priv->attachments_view = modest_attachments_view_new (NULL);
        
        priv->header_box = gtk_vbox_new (FALSE, 0);
        
-       from_caption = hildon_caption_new (size_group, _("From:"), priv->from_field, NULL, 0);
-       to_caption = hildon_caption_new (size_group, _("To:"), priv->to_field, NULL, 0);
-       priv->cc_caption = hildon_caption_new (size_group, _("Cc:"), priv->cc_field, NULL, 0);
-       priv->bcc_caption = hildon_caption_new (size_group, _("Bcc:"), priv->bcc_field, NULL, 0);
-       subject_caption = hildon_caption_new (size_group, _("Subject:"), priv->subject_field, NULL, 0);
+       from_caption = hildon_caption_new (size_group, _("mail_va_from"), priv->from_field, NULL, 0);
+       to_caption = hildon_caption_new (size_group, _("mail_va_to"), priv->to_field, NULL, 0);
+       priv->cc_caption = hildon_caption_new (size_group, _("mail_va_cc"), priv->cc_field, NULL, 0);
+       priv->bcc_caption = hildon_caption_new (size_group, _("mail_va_hotfix1"), priv->bcc_field, NULL, 0);
+       subject_caption = hildon_caption_new (size_group, _("mail_va_subject"), subject_box, NULL, 0);
+       priv->attachments_caption = hildon_caption_new (size_group, _("mail_va_attachment"), priv->attachments_view, NULL, 0);
+       g_object_unref (size_group);
+
+       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+       modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->to_field), size_group);
+       modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->cc_field), size_group);
+       modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->bcc_field), size_group);
+       gtk_size_group_add_widget (size_group, priv->subject_field);
+       gtk_size_group_add_widget (size_group, priv->attachments_view);
+       g_object_unref (size_group);
 
        gtk_box_pack_start (GTK_BOX (priv->header_box), from_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), to_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->cc_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->bcc_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), subject_caption, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (priv->header_box), priv->attachments_caption, FALSE, FALSE, 0);
+       gtk_widget_set_no_show_all (priv->attachments_caption, TRUE);
 
 
        priv->msg_body = wp_text_view_new ();
@@ -343,33 +421,86 @@ init_window (ModestMsgEditWindow *obj)
        wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
 /*     gtk_text_buffer_set_can_paste_rich_text (priv->text_buffer, TRUE); */
        wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
+
+       priv->find_toolbar = hildon_find_toolbar_new (NULL);
+       gtk_widget_set_no_show_all (priv->find_toolbar, TRUE);
+
        g_signal_connect (G_OBJECT (priv->text_buffer), "refresh_attributes",
                          G_CALLBACK (text_buffer_refresh_attributes), obj);
-       g_signal_connect (G_OBJECT (priv->text_buffer), "mark-set",
-                         G_CALLBACK (text_buffer_mark_set), obj);
+       g_signal_connect (G_OBJECT (priv->text_buffer), "delete-range",
+                         G_CALLBACK (text_buffer_delete_range), obj);
+       g_signal_connect (G_OBJECT (priv->text_buffer), "can-undo",
+                         G_CALLBACK (text_buffer_can_undo), obj);
        g_signal_connect (G_OBJECT (obj), "window-state-event",
                          G_CALLBACK (modest_msg_edit_window_window_state_event),
                          NULL);
+       g_signal_connect_swapped (G_OBJECT (priv->to_field), "open-addressbook", 
+                                 G_CALLBACK (modest_msg_edit_window_open_addressbook), obj);
+       g_signal_connect_swapped (G_OBJECT (priv->cc_field), "open-addressbook", 
+                                 G_CALLBACK (modest_msg_edit_window_open_addressbook), obj);
+       g_signal_connect_swapped (G_OBJECT (priv->bcc_field), "open-addressbook", 
+                                 G_CALLBACK (modest_msg_edit_window_open_addressbook), obj);
+
+       g_signal_connect (G_OBJECT (priv->add_attachment_button), "clicked",
+                         G_CALLBACK (modest_msg_edit_window_add_attachment_clicked), obj);
+
+       g_signal_connect (G_OBJECT (priv->msg_body), "focus-in-event",
+                         G_CALLBACK (msg_body_focus), obj);
+       g_signal_connect (G_OBJECT (priv->msg_body), "focus-out-event",
+                         G_CALLBACK (msg_body_focus), 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);
+       recpt_field_changed (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field)), MODEST_MSG_EDIT_WINDOW (obj));
+       g_signal_connect (G_OBJECT (priv->subject_field), "changed", G_CALLBACK (subject_field_changed), obj);
+
+       g_signal_connect (G_OBJECT (priv->find_toolbar), "close", G_CALLBACK (modest_msg_edit_window_find_toolbar_close), obj);
+       g_signal_connect (G_OBJECT (priv->find_toolbar), "search", G_CALLBACK (modest_msg_edit_window_find_toolbar_search), obj);
 
        priv->scroll = gtk_scrolled_window_new (NULL, NULL);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scroll), GTK_SCROLL_NONE);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scroll), GTK_SHADOW_NONE);
        
        main_vbox = gtk_vbox_new  (FALSE, DEFAULT_MAIN_VBOX_SPACING);
 
        gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 0);
+       frame = gtk_frame_new (NULL);
+       gtk_box_pack_start (GTK_BOX(main_vbox), frame, TRUE, TRUE, 0);
 
        gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (priv->scroll), main_vbox);
        gtk_container_set_focus_vadjustment (GTK_CONTAINER (main_vbox), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)));
        gtk_widget_show_all (GTK_WIDGET(priv->scroll));
        
-       if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL))
-               gtk_widget_hide (priv->cc_field);
-       if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL))
-               gtk_widget_hide (priv->bcc_field);
+       if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL)) {
+               gtk_widget_set_no_show_all (priv->cc_caption, TRUE);
+               gtk_widget_hide (priv->cc_caption);
+       }
+       if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL)) {
+               gtk_widget_set_no_show_all (priv->bcc_caption, TRUE);
+               gtk_widget_hide (priv->bcc_caption);
+       }
 
-       gtk_container_add (GTK_CONTAINER(obj), priv->scroll);
+       window_box = gtk_vbox_new (FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (window_box), priv->scroll, TRUE, TRUE, 0);
+       gtk_box_pack_end (GTK_BOX (window_box), priv->find_toolbar, FALSE, FALSE, 0);
+       gtk_container_add (GTK_CONTAINER(obj), window_box);
+       priv->scroll_area = modest_scroll_area_new (priv->scroll, priv->msg_body);
+       gtk_container_add (GTK_CONTAINER (frame), priv->scroll_area);
+       
+       /*
+        TODO: scroll_area was never instantiated.
+        Stop building without warnings-as-errors. murrayc.
+       gtk_container_set_focus_vadjustment (GTK_CONTAINER (scroll_area), 
+                                            gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)));
+       */
+
+       priv->clipboard_change_handler_id = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change",
+                                                             G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj);
+       priv->system_clipboard_change_handler_id = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD)), "owner-change",
+                                                             G_CALLBACK (modest_msg_edit_window_system_clipboard_owner_change), obj);
 }
        
 
@@ -377,16 +508,23 @@ init_window (ModestMsgEditWindow *obj)
 static void
 modest_msg_edit_window_finalize (GObject *obj)
 {
-       G_OBJECT_CLASS(parent_class)->finalize (obj);
-}
-
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj);
 
-
-static gboolean
-on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgEditWindow *self)
-{
-       save_settings (self);
-       return FALSE;
+       if (priv->clipboard_change_handler_id > 0) {
+               g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_PRIMARY), priv->clipboard_change_handler_id);
+               priv->clipboard_change_handler_id = 0;
+       }
+       
+       if (priv->system_clipboard_change_handler_id > 0) {
+               g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), 
+                                            priv->system_clipboard_change_handler_id);
+               priv->system_clipboard_change_handler_id = 0;
+       }
+       
+       /* This had to stay alive for as long as the combobox that used it: */
+       modest_pair_list_free (priv->from_field_protos);
+       
+       G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
 static GtkWidget *
@@ -419,8 +557,11 @@ static void
 set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
 {
        TnyHeader *header;
-       const gchar *to, *cc, *bcc, *subject, *body;
+       const gchar *to, *cc, *bcc, *subject;
+       gchar *body;
        ModestMsgEditWindowPrivate *priv;
+       GtkTextIter iter;
+       TnyHeaderFlags priority_flags;
        
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
        g_return_if_fail (TNY_IS_MSG (msg));
@@ -432,42 +573,56 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
        cc      = tny_header_get_cc (header);
        bcc     = tny_header_get_bcc (header);
        subject = tny_header_get_subject (header);
+       priority_flags = tny_header_get_flags (header) & TNY_HEADER_FLAG_PRIORITY;
 
        if (to)
-               gtk_entry_set_text (GTK_ENTRY(priv->to_field),  to);
-       if (cc)
-               gtk_entry_set_text (GTK_ENTRY(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->to_field),  to);
+       if (cc) {
+               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field),  cc);
+               gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
+               gtk_widget_show (priv->cc_caption);
+       } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_CC, NULL)) {
+               gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
+               gtk_widget_hide (priv->cc_caption);
+       }
+       if (bcc) {
+               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
+               gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
+               gtk_widget_show (priv->bcc_caption);
+       } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_BCC, NULL)) {
+               gtk_widget_set_no_show_all (priv->bcc_caption, FALSE);
+               gtk_widget_hide (priv->bcc_caption);
+       } 
        if (subject)
-               gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);   
+               gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
+       modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW(self),
+                                                  priority_flags);
+
+       update_window_title (self);
 
 /*     gtk_text_buffer_set_can_paste_rich_text (priv->text_buffer, TRUE); */
        wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
-       body = modest_tny_msg_get_body (msg, FALSE);
-       if ((body!=NULL) && (body[0] != '\0')) {
-               wp_text_buffer_load_document_begin (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
-               wp_text_buffer_load_document_write (WP_TEXT_BUFFER (priv->text_buffer),
-                                                   (gchar *) body,
-                                                   -1);
-               wp_text_buffer_load_document_end (WP_TEXT_BUFFER (priv->text_buffer));
-       } else {
-               WPTextBufferFormat fmt = {0};
-
-               fmt.font_size = DEFAULT_FONT_SIZE;
-               fmt.font = DEFAULT_FONT;
-               fmt.rich_text = 1;
-               fmt.text_position = TEXT_POSITION_NORMAL;
-               fmt.justification = 0;
-               fmt.cs.font_size = 1;
-               fmt.cs.font = 1;
-               fmt.cs.text_position = 1;
-               fmt.cs.justification = 1;
-               wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &fmt);
-       }
-
-       if (!to) {
-               gtk_widget_grab_focus (priv->to_field);
+       body = modest_tny_msg_get_body (msg, TRUE);
+
+       if ((body == NULL)||(body[0] == '\0')) {
+               g_free (body);
+               body = modest_text_utils_convert_to_html ("");
+       }
+       wp_text_buffer_load_document_begin (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
+       wp_text_buffer_load_document_write (WP_TEXT_BUFFER (priv->text_buffer),
+                                           (gchar *) body,
+                                           strlen (body));
+       wp_text_buffer_load_document_end (WP_TEXT_BUFFER (priv->text_buffer));
+       g_free (body);
+
+       /* Get the default format required from configuration */
+       if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) {
+               wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
+       }
+
+       /* 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);
        }
@@ -476,19 +631,83 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
           value that comes from msg <- not sure, should it be
           allowed? */
        
-       /* TODO: set attachments */
+       /* Add attachments to the view */
+       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));
+       if (priv->attachments == NULL) {
+               gtk_widget_hide (priv->attachments_caption);
+       } else {
+               gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
+               gtk_widget_show_all (priv->attachments_caption);
+       }
+
+       gtk_text_buffer_get_start_iter (priv->text_buffer, &iter);
+       gtk_text_buffer_place_cursor (priv->text_buffer, &iter);
+
+       reset_modified (self);
+
+       update_dimmed (self);
+       text_buffer_can_undo (priv->text_buffer, FALSE, self);
+
+       priv->draft_msg = msg;
+}
+
+static void
+menu_tool_button_clicked_popup (GtkMenuToolButton *item,
+                               gpointer data)
+{
+       GList *item_children, *node;
+       GtkWidget *bin_child;
+
+       bin_child = gtk_bin_get_child (GTK_BIN(item));
+
+       item_children = gtk_container_get_children (GTK_CONTAINER (bin_child));
+       
+       for (node = item_children; node != NULL; node = g_list_next (node)) {
+               if (GTK_IS_TOGGLE_BUTTON (node->data)) {
+                       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (node->data), TRUE);
+               }
+       }
+       g_list_free (item_children);
+}
+
+static void
+menu_tool_button_dont_expand (GtkMenuToolButton *item)
+{
+       GtkWidget *box;
+       GList *item_children, *node;
+
+       box = gtk_bin_get_child (GTK_BIN (item));
+       gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
+       item_children = gtk_container_get_children (GTK_CONTAINER (box));
+       
+       for (node = item_children; node != NULL; node = g_list_next (node)) {
+               gtk_box_set_child_packing (GTK_BOX (box), GTK_WIDGET (node->data), TRUE, TRUE, 0, GTK_PACK_START);
+               if (GTK_IS_TOGGLE_BUTTON (node->data))
+                       gtk_button_set_alignment (GTK_BUTTON (node->data), 0.0, 0.5);
+               else if (GTK_IS_BUTTON (node->data))
+                       gtk_button_set_alignment (GTK_BUTTON (node->data), 1.0, 0.5);
+       }
+       g_list_free (item_children);
 }
 
+
 static void
 modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
 {
        ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       GtkWidget *font_placeholder;
+       GtkWidget *placeholder;
        GtkWidget *tool_item;
        gint insert_index;
+       gchar size_text[5];
        gint size_index;
        gint font_index;
+       GtkWidget *sizes_menu;
+       GtkWidget *fonts_menu;
+       GSList *radio_group = NULL;
+       GSList *node = NULL;
+       gchar *markup;
 
        /* Toolbar */
        parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
@@ -498,39 +717,120 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_TOOLBAR, NULL))
                gtk_widget_hide (parent_priv->toolbar);
 
-       /* Font management toolbar elements */
-       font_placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FontAttributes");
-       insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(font_placeholder));
+       /* Font color placeholder */
+       placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FontColor");
+       insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
 
        /* font color */
        tool_item = GTK_WIDGET (gtk_tool_item_new ());
        priv->font_color_button = hildon_color_button_new ();
+       GTK_WIDGET_UNSET_FLAGS (tool_item, GTK_CAN_FOCUS);
+       GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS);
        gtk_container_add (GTK_CONTAINER (tool_item), priv->font_color_button);
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
        gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index);
        g_signal_connect_swapped (G_OBJECT (priv->font_color_button), "notify::color", G_CALLBACK (modest_msg_edit_window_color_button_change), window);
 
+       /* Font size and face placeholder */
+       placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FontAttributes");
+       insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
        /* font_size */
-       priv->size_combobox = gtk_combo_box_new_text ();
-       gtk_widget_set_size_request (priv->size_combobox, DEFAULT_SIZE_COMBOBOX_WIDTH, -1);
+       tool_item = GTK_WIDGET (gtk_menu_tool_button_new (NULL, NULL));
+       priv->size_tool_button_label = gtk_label_new (NULL);
+       snprintf(size_text, sizeof(size_text), "%d", wp_font_size[DEFAULT_FONT_SIZE]);
+       markup = g_strconcat ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>",
+                             size_text,"</span>", NULL);
+       gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
+       g_free (markup);
+       gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->size_tool_button_label);
+       sizes_menu = gtk_menu_new ();
+       priv->size_items_group = NULL;
+       radio_group = NULL;
        for (size_index = 0; size_index < WP_FONT_SIZE_COUNT; size_index++) {
-               gchar size_text[5];
+               GtkWidget *size_menu_item;
+
                snprintf(size_text, sizeof(size_text), "%d", wp_font_size[size_index]);
-               gtk_combo_box_append_text (GTK_COMBO_BOX (priv->size_combobox), size_text);
+               size_menu_item = gtk_radio_menu_item_new_with_label (radio_group, size_text);
+               radio_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (size_menu_item));
+               gtk_menu_shell_append (GTK_MENU_SHELL (sizes_menu), size_menu_item);
+               gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (size_menu_item), (wp_font_size[size_index] == 12));
+               gtk_widget_show (size_menu_item);
+
+               priv->size_items_group = g_slist_prepend (priv->size_items_group, size_menu_item);
+                       
+       }
+
+       for (node = radio_group; node != NULL; node = g_slist_next (node)) {
+               GtkWidget *item = (GtkWidget *) node->data;
+               g_signal_connect (G_OBJECT (item), "toggled", G_CALLBACK (modest_msg_edit_window_size_change),
+                                 window);
        }
-       gtk_combo_box_set_active (GTK_COMBO_BOX (priv->size_combobox), wp_get_font_size_index(12, 4));
-       tool_item = GTK_WIDGET (gtk_tool_item_new ());
-       gtk_container_add (GTK_CONTAINER (tool_item), priv->size_combobox);
-       gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index);
-       g_signal_connect_swapped (G_OBJECT (priv->size_combobox), "changed", G_CALLBACK (modest_msg_edit_window_size_combobox_change), window);
 
-       priv->font_combobox = gtk_combo_box_new_text ();
+       priv->size_items_group = g_slist_reverse (priv->size_items_group);
+       gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), sizes_menu);
+       g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (menu_tool_button_clicked_popup), NULL);
+       gtk_toolbar_insert (GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index);
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
+       menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item));
+       priv->font_size_toolitem = tool_item;
+
+       /* font face */
+       tool_item = GTK_WIDGET (gtk_menu_tool_button_new (NULL, NULL));
+       priv->font_tool_button_label = gtk_label_new (NULL);
+       markup = g_strconcat ("<span font_family='", wp_get_font_name(DEFAULT_FONT), "'>Tt</span>", NULL);
+       gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
+       g_free(markup);
+       gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->font_tool_button_label);
+       fonts_menu = gtk_menu_new ();
+       priv->font_items_group = NULL;
+       radio_group = NULL;
        for (font_index = 0; font_index < wp_get_font_count (); font_index++) {
-               gtk_combo_box_append_text (GTK_COMBO_BOX (priv->font_combobox), wp_get_font_name (font_index));
+               GtkWidget *font_menu_item;
+               GtkWidget *child_label;
+
+               font_menu_item = gtk_radio_menu_item_new_with_label (radio_group, "");
+               child_label = gtk_bin_get_child (GTK_BIN (font_menu_item));
+               markup = g_strconcat ("<span font_family='", wp_get_font_name (font_index),"'>", 
+                                     wp_get_font_name (font_index), "</span>", NULL);
+               gtk_label_set_markup (GTK_LABEL (child_label), markup);
+               g_free (markup);
+               
+               radio_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (font_menu_item));
+               gtk_menu_shell_append (GTK_MENU_SHELL (fonts_menu), font_menu_item);
+               gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (font_menu_item), (font_index == DEFAULT_FONT));
+               gtk_widget_show (font_menu_item);
+
+               priv->font_items_group = g_slist_prepend (priv->font_items_group, font_menu_item);
+                       
        }
-       tool_item = GTK_WIDGET (gtk_tool_item_new ());
-       gtk_container_add (GTK_CONTAINER (tool_item), priv->font_combobox);
+       for (node = radio_group; node != NULL; node = g_slist_next (node)) {
+               GtkWidget *item = (GtkWidget *) node->data;
+               g_signal_connect (G_OBJECT (item), "toggled", G_CALLBACK (modest_msg_edit_window_font_change),
+                                 window);
+       }
+       priv->font_items_group = g_slist_reverse (priv->font_items_group);
+       gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), fonts_menu);
+       g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (menu_tool_button_clicked_popup), NULL);
        gtk_toolbar_insert (GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index);
-       g_signal_connect_swapped (G_OBJECT (priv->font_combobox), "changed", G_CALLBACK (modest_msg_edit_window_font_combobox_change), window);
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
+       menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item));
+       priv->font_face_toolitem = tool_item;
+
+       /* 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), TRUE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
+       tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsBold");
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
+       tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsItalics");
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
+
+
 }
 
 
@@ -543,8 +843,15 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
        ModestMsgEditWindowPrivate *priv;
        GtkActionGroup *action_group;
        GError *error = NULL;
+       GdkPixbuf *window_icon = NULL;
+       GtkAction *action;
+       ModestConf *conf;
+       gboolean prefer_formatted;
+       gint file_format;
+       ModestPair *account_pair = NULL;
 
        g_return_val_if_fail (msg, NULL);
+       g_return_val_if_fail (account_name, NULL);
        
        obj = g_object_new(MODEST_TYPE_MSG_EDIT_WINDOW, NULL);
 
@@ -553,6 +860,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
 
        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,
@@ -575,15 +883,27 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
                                            100,
                                            G_CALLBACK (modest_ui_actions_on_change_zoom),
                                            obj);
+       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),
+                                           obj);
+       gtk_action_group_add_radio_actions (action_group,
+                                           modest_msg_edit_file_format_action_entries,
+                                           G_N_ELEMENTS (modest_msg_edit_file_format_action_entries),
+                                           modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL),
+                                           G_CALLBACK (modest_ui_actions_msg_edit_on_change_file_format),
+                                           obj);
        gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0);
        g_object_unref (action_group);
 
        /* Load the UI definition */
-       gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-msg-edit-window-ui.xml", &error);
+       gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-msg-edit-window-ui.xml",
+                                        &error);
        if (error != NULL) {
                g_warning ("Could not merge modest-msg-edit-window-ui.xml: %s", error->message);
-               g_error_free (error);
-               error = NULL;
+               g_clear_error (&error);
        }
 
        /* Add accelerators */
@@ -599,21 +919,64 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
 
        restore_settings (MODEST_MSG_EDIT_WINDOW(obj));
                
-       gtk_window_set_title (GTK_WINDOW(obj), "Modest");
        gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
 
-       g_signal_connect (G_OBJECT(obj), "delete-event",
-                         G_CALLBACK(on_delete_event), obj);
-
        modest_window_set_active_account (MODEST_WINDOW(obj), account_name);
 
        modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj));
 
+       setup_insensitive_handlers (MODEST_MSG_EDIT_WINDOW (obj));
+
+       account_pair = modest_pair_list_find_by_first_as_string (priv->from_field_protos, account_name);
+       if (account_pair != NULL)
+               modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->from_field), account_pair->first);
+
        set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg);
 
        text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (obj));
+
+       /* Set window icon */
+       window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON);
+       gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
+
+       /* 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);
+
+       /* Update select all */
+       update_select_all_dimming (MODEST_MSG_EDIT_WINDOW (obj));
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu");
+       g_signal_connect (G_OBJECT (action), "activate", G_CALLBACK (edit_menu_activated), obj);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu");
+       g_signal_connect (G_OBJECT (action), "activate", G_CALLBACK (view_menu_activated), obj);
+
+       /* set initial state of cc and bcc */
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewCcFieldMenu");
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                     modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL));
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewBccFieldMenu");
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                     modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL));
+
+       /* Setup the file format */
+       conf = modest_runtime_get_conf ();
+       prefer_formatted = modest_conf_get_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, &error);
+       if (error) {
+               g_clear_error (&error);
+               file_format = MODEST_FILE_FORMAT_FORMATTED_TEXT;
+       } else
+               file_format = (prefer_formatted) ? 
+                       MODEST_FILE_FORMAT_FORMATTED_TEXT : 
+                       MODEST_FILE_FORMAT_PLAIN_TEXT;
+       modest_msg_edit_window_set_file_format (MODEST_MSG_EDIT_WINDOW (obj), file_format);
+
+       update_paste_dimming (MODEST_MSG_EDIT_WINDOW (obj));
        
-       return (ModestWindow*)obj;
+       return (ModestWindow*) obj;
 }
 
 static gint
@@ -626,6 +989,9 @@ get_formatted_data_cb (const gchar *buffer, gpointer user_data)
        return 0;
 }
 
+/**
+ * @result: A new string which should be freed with g_free().
+ */
 static gchar *
 get_formatted_data (ModestMsgEditWindow *edit_window)
 {
@@ -645,8 +1011,6 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
 {
        MsgData *data;
        const gchar *account_name;
-       GtkTextBuffer *buf;
-       GtkTextIter b, e;
        ModestMsgEditWindowPrivate *priv;
        
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window), NULL);
@@ -656,33 +1020,62 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        account_name = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
        g_return_val_if_fail (account_name, 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    =  modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
                                                             account_name);
-       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 =  (gchar *) gtk_text_buffer_get_text (priv->text_buffer, &b, &e, FALSE);
-       data->html_body  =  get_formatted_data (edit_window);
-       data->attachments = priv->attachments;
+       data->account_name = g_strdup (account_name);
+       data->to      =  g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->to_field)));
+       data->cc      =  g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field)));
+       data->bcc     =  g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->bcc_field)));
+       data->subject =  g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->subject_field)));
+       if (priv->draft_msg) {
+               data->draft_msg = g_object_ref (priv->draft_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);
+       data->plain_body = g_strdup (gtk_text_buffer_get_text (priv->text_buffer, &b, &e, FALSE)); /* returns a copy */
+
+       if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)))
+               data->html_body = get_formatted_data (edit_window); /* returns a copy. */
+       else
+               data->html_body = NULL;
+
+       data->attachments = priv->attachments; /* TODO: copy and free ? */
+       data->priority_flags = priv->priority_flags;
 
        return data;
 }
 
+/* TODO: We must duplicate this implementation for GNOME and Maemo, but that is unwise. */
 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);
-       g_free (data->html_body);
+       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);
+       if (data->draft_msg != NULL) {
+               g_object_unref (data->draft_msg);
+               data->draft_msg = NULL;
+       }
+       g_free (data->account_name);
+
+       /* TODO: Free data->attachments? */
+
        g_slice_free (MsgData, data);
 }
 
@@ -812,7 +1205,7 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self,
                wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BOLD, (gpointer) (buffer_format->font));
        }
        if (buffer_format->cs.bullet) {
-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BULLET, (gpointer) (buffer_format->bullet));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BULLET, (gpointer) ((int)buffer_format->bullet));
        }
 /*     wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), buffer_format); */
        wp_text_buffer_thaw (WP_TEXT_BUFFER (priv->text_buffer));
@@ -849,10 +1242,22 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
        GtkAction *action;
        ModestWindowPrivate *parent_priv;
        ModestMsgEditWindowPrivate *priv;
+       GtkWidget *new_size_menuitem;
+       GtkWidget *new_font_menuitem;
        
        parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
+       if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))) {
+               action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatFormattedTextMenu");
+               if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
+                       toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE);
+       } else {
+               action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatPlainTextMenu");
+               if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
+                       toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE);
+       }
+
        wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE);
        
        action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsBold");
@@ -861,7 +1266,7 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
        action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsItalics");
        toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->italic);
 
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsBulletedList");
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu");
        toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bullet);
 
        g_signal_handlers_block_by_func (G_OBJECT (priv->font_color_button), 
@@ -872,26 +1277,49 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
                                           G_CALLBACK (modest_msg_edit_window_color_button_change),
                                           window);
 
-       g_signal_handlers_block_by_func (G_OBJECT (priv->size_combobox), 
-                                        G_CALLBACK (modest_msg_edit_window_size_combobox_change),
-                                        window);
-       gtk_combo_box_set_active (GTK_COMBO_BOX (priv->size_combobox), buffer_format->font_size);
-       g_signal_handlers_unblock_by_func (G_OBJECT (priv->size_combobox), 
-                                          G_CALLBACK (modest_msg_edit_window_size_combobox_change),
-                                          window);
+       new_size_menuitem = GTK_WIDGET ((g_slist_nth (priv->size_items_group, 
+                                                     buffer_format->font_size))->data);
+       if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (new_size_menuitem))) {
+               GtkWidget *label;
+               gchar *markup;
+
+               label = gtk_bin_get_child (GTK_BIN (new_size_menuitem));
+               markup = g_strconcat ("<span font_family='Serif'>", gtk_label_get_text (GTK_LABEL (label)), "</span>", NULL);
+               gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
+               g_free (markup);
+               g_signal_handlers_block_by_func (G_OBJECT (new_size_menuitem),
+                                                G_CALLBACK (modest_msg_edit_window_size_change),
+                                                window);
+               gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (new_size_menuitem), TRUE);
+               g_signal_handlers_unblock_by_func (G_OBJECT (new_size_menuitem),
+                                                  G_CALLBACK (modest_msg_edit_window_size_change),
+                                                  window);
+       }
 
-       g_signal_handlers_block_by_func (G_OBJECT (priv->font_combobox), 
-                                        G_CALLBACK (modest_msg_edit_window_font_combobox_change),
-                                        window);
-       gtk_combo_box_set_active (GTK_COMBO_BOX (priv->font_combobox), buffer_format->font);
-       g_signal_handlers_unblock_by_func (G_OBJECT (priv->font_combobox), 
-                                          G_CALLBACK (modest_msg_edit_window_font_combobox_change),
-                                          window);
+       new_font_menuitem = GTK_WIDGET ((g_slist_nth (priv->font_items_group, 
+                                                     buffer_format->font))->data);
+       if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (new_font_menuitem))) {
+               GtkWidget *label;
+               gchar *markup;
+
+               label = gtk_bin_get_child (GTK_BIN (new_font_menuitem));
+               markup = g_strconcat ("<span font_family='", gtk_label_get_text (GTK_LABEL (label)),"'>Tt</span>", NULL);
+               gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
+               g_free (markup);
+               g_signal_handlers_block_by_func (G_OBJECT (new_font_menuitem),
+                                                G_CALLBACK (modest_msg_edit_window_font_change),
+                                                window);
+               gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (new_font_menuitem), TRUE);
+               g_signal_handlers_unblock_by_func (G_OBJECT (new_font_menuitem),
+                                                  G_CALLBACK (modest_msg_edit_window_font_change),
+                                                  window);
+       }
 
        g_free (buffer_format);
 
 }
 
+
 void
 modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
 {
@@ -905,15 +1333,28 @@ modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE);
        
+#ifdef MODEST_HILDON_VERSION_0 
        dialog = hildon_color_selector_new (GTK_WINDOW (window));
-       hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), & (buffer_format->color));
+       hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), &(buffer_format->color));
+#else
+       dialog = hildon_color_chooser_new ();
+       hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog), &(buffer_format->color));
+#endif /*MODEST_HILDON_VERSION_0*/             
        g_free (buffer_format);
 
        response = gtk_dialog_run (GTK_DIALOG (dialog));
        switch (response) {
-       case GTK_RESPONSE_OK:
+       case GTK_RESPONSE_OK: {
+#ifdef MODEST_HILDON_VERSION_0
                new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
-               break;
+#else
+               GdkColor col;
+               hildon_color_chooser_get_color (HILDON_COLOR_CHOOSER(dialog), &col);
+               new_color = &col;
+#endif /*MODEST_HILDON_VERSION_0*/
+       }
+
+       break;
        default:
                break;
        }
@@ -931,19 +1372,31 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
        ModestMsgEditWindowPrivate *priv;
        GtkWidget *dialog = NULL;
        gint response;
-       const GdkColor *old_color = NULL;
+       GdkColor *old_color = NULL;
        const GdkColor *new_color = NULL;
        
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       old_color = wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer));
+       old_color = (GdkColor*)wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer));
        
+#ifdef MODEST_HILDON_VERSION_0 
        dialog = hildon_color_selector_new (GTK_WINDOW (window));
-       hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), (GdkColor *) old_color);
+       hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog),(GdkColor*)old_color);
+#else
+       dialog = hildon_color_chooser_new ();
+       hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog),(GdkColor*)old_color);
+#endif /*MODEST_HILDON_VERSION_9*/             
 
        response = gtk_dialog_run (GTK_DIALOG (dialog));
        switch (response) {
-       case GTK_RESPONSE_OK:
+       case GTK_RESPONSE_OK: {
+#ifdef MODEST_HILDON_VERSION_0
                new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
+#else
+               GdkColor col;
+               hildon_color_chooser_get_color (HILDON_COLOR_CHOOSER(dialog), &col);
+               new_color = &col;
+#endif /*MODEST_HILDON_VERSION_0*/
+          }
                break;
        default:
                break;
@@ -955,6 +1408,7 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
 
 }
 
+
 void
 modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
 {
@@ -962,139 +1416,425 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
        ModestMsgEditWindowPrivate *priv;
        GtkWidget *dialog = NULL;
        gint response = 0;
-       gchar *filename = NULL;
+       GSList *uris = NULL;
+       GSList *uri_node = NULL;
        
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        
        dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN);
+       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ia_select_inline_image_title"));
+       gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
+
+       modest_maemo_utils_setup_images_filechooser (GTK_FILE_CHOOSER (dialog));
 
        response = gtk_dialog_run (GTK_DIALOG (dialog));
        switch (response) {
        case GTK_RESPONSE_OK:
-               filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+               uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog));
                break;
        default:
                break;
        }
        gtk_widget_destroy (dialog);
 
-       if (filename) {
-               GdkPixbuf *pixbuf = NULL;
+       for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) {
+               const gchar *uri;
+               GnomeVFSHandle *handle = NULL;
+               GnomeVFSResult result;
                GtkTextIter position;
                GtkTextMark *insert_mark;
 
-               pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-               if (pixbuf) {
-                       gint image_file_id;
-                       GdkPixbufFormat *pixbuf_format;
-
-                       image_file_id = g_open (filename, O_RDONLY, 0);
-                       pixbuf_format = gdk_pixbuf_get_file_info (filename, NULL, NULL);
-                       if ((image_file_id != -1)&&(pixbuf_format != NULL)) {
-                               TnyMimePart *image_part;
-                               TnyStream *image_stream;
-                               gchar **mime_types;
-                               gchar *mime_type;
-                               gchar *basename;
-                               gchar *content_id;
-
-                               mime_types = gdk_pixbuf_format_get_mime_types (pixbuf_format);
-                               if ((mime_types != NULL) && (mime_types[0] != NULL)) {
-                                       mime_type = mime_types[0];
-                               } else {
-                                       mime_type = "image/unknown";
-                               }
-                               image_part = tny_platform_factory_new_mime_part
-                                       (modest_runtime_get_platform_factory ());
-                               image_stream = TNY_STREAM (tny_fs_stream_new (image_file_id));
-
-                               tny_mime_part_construct_from_stream (image_part, image_stream, mime_type);
-                               g_strfreev (mime_types);
-
-                               content_id = g_strdup_printf ("%d", priv->last_cid);
-                               tny_mime_part_set_content_id (image_part, content_id);
-                               g_free (content_id);
-                               priv->last_cid++;
-
-                               basename = g_path_get_basename (filename);
-                               tny_mime_part_set_filename (image_part, basename);
-                               g_free (basename);
-                               
+               uri = (const gchar *) uri_node->data;
+               result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+               if (result == GNOME_VFS_OK) {
+                       GdkPixbufLoader *loader;
+                       GdkPixbuf *pixbuf;
+                       GnomeVFSFileInfo info;
+                       gchar *filename, *basename;
+                       TnyMimePart *mime_part;
+                       TnyStream *stream;
+                       gchar *content_id;
+                       const gchar *mime_type = NULL;
+
+                       filename = g_filename_from_uri (uri, NULL, NULL);
+                       if (gnome_vfs_get_file_info_from_handle (handle, &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_from_stream (mime_part, stream, mime_type);
+                       
+                       content_id = g_strdup_printf ("%d", priv->last_cid);
+                       tny_mime_part_set_content_id (mime_part, content_id);
+                       g_free (content_id);
+                       priv->last_cid++;
+                       
+                       basename = g_path_get_basename (filename);
+                       tny_mime_part_set_filename (mime_part, basename);
+                       g_free (basename);
+                       
+                       priv->attachments = g_list_prepend (priv->attachments, mime_part);
+                       modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                                               mime_part);
+                       gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
+                       gtk_widget_show_all (priv->attachments_caption);
+                       gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+                       g_free (filename);
+
+                       loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
+                       while (!tny_stream_is_eos (TNY_STREAM (stream))) {
+                               char read_buffer[128];
+                               gint readed;
+                               readed = tny_stream_read (TNY_STREAM (stream), read_buffer, 128);
+                               if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, NULL))
+                                       break;
+                       }
+                       pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+                       g_object_ref (pixbuf);
+                       gdk_pixbuf_loader_close (loader, NULL);
+                       g_object_unref (loader);
+
+                       if (gdk_pixbuf_get_width (pixbuf) > IMAGE_MAX_WIDTH) {
+                               GdkPixbuf *new_pixbuf;
+                               gint new_height;
+                               new_height = (gdk_pixbuf_get_height (pixbuf) * IMAGE_MAX_WIDTH) /
+                                       gdk_pixbuf_get_width (pixbuf);
+                               new_pixbuf = gdk_pixbuf_scale_simple (pixbuf, IMAGE_MAX_WIDTH, new_height, GDK_INTERP_BILINEAR);
+                               g_object_unref (pixbuf);
+                               pixbuf = new_pixbuf;
+                       }
+
+                       if (pixbuf != NULL) {
                                insert_mark = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer));
                                gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer), &position, insert_mark);
-                               wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (image_part)), pixbuf);
-                               priv->attachments = g_list_prepend (priv->attachments, image_part);
-                       } else if (image_file_id == -1) {
-                               close (image_file_id);
-                       }
+                               wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (mime_part)), pixbuf);
+                       } 
                }
        }
 
 
 }
 
-static void
-modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window,
-                                           gpointer userdata)
+void
+modest_msg_edit_window_attach_file (ModestMsgEditWindow *window)
 {
+       
        ModestMsgEditWindowPrivate *priv;
-       GdkColor *new_color;
-
+       GtkWidget *dialog = NULL;
+       gint response = 0;
+       GSList *uris = NULL;
+       GSList *uri_node;
+       
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       new_color = hildon_color_button_get_color (HILDON_COLOR_BUTTON (priv->font_color_button));
+       
+       dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN);
+       gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
 
-       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) new_color);
-       gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body);
+       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;
+               GnomeVFSHandle *handle = NULL;
+               GnomeVFSResult result;
+
+               uri = (const gchar *) uri_node->data;
+               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 *filename;
+                       gchar *content_id;
+                       GnomeVFSFileInfo info;
+
+                       filename = g_filename_from_uri (uri, NULL, NULL);
+                       
+                       if (gnome_vfs_get_file_info_from_handle (handle, &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_from_stream (mime_part, stream, mime_type);
+                       
+                       content_id = g_strdup_printf ("%d", priv->last_cid);
+                       tny_mime_part_set_content_id (mime_part, content_id);
+                       g_free (content_id);
+                       priv->last_cid++;
+                       
+                       basename = g_path_get_basename (filename);
+                       tny_mime_part_set_filename (mime_part, basename);
+                       g_free (basename);
+                       
+                       priv->attachments = g_list_prepend (priv->attachments, mime_part);
+                       modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                                               mime_part);
+                       gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
+                       gtk_widget_show_all (priv->attachments_caption);
+                       gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+                       g_free (filename);
+
+               } 
+       }
+       g_slist_foreach (uris, (GFunc) g_free, NULL);
+       g_slist_free (uris);
 }
 
-static void
-modest_msg_edit_window_size_combobox_change (ModestMsgEditWindow *window,
-                                            gpointer userdata)
+void
+modest_msg_edit_window_attach_file_noninteractive (
+               ModestMsgEditWindow *window,
+               const gchar *file_uri)
 {
+       
        ModestMsgEditWindowPrivate *priv;
-       gint new_size_index;
-
+       
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body));
 
-       new_size_index = gtk_combo_box_get_active (GTK_COMBO_BOX (priv->size_combobox));
+       if (file_uri) {
+               gint file_id = 0;
+               
+               /* TODO: We should probably try to use only the URI,
+                * instead of using a filename.
+                */
+               gchar* filename = g_filename_from_uri (file_uri, NULL, NULL);
+               if (!filename) {
+                       g_warning("%s: g_filename_from_uri(%s) failed.\n", __FUNCTION__, file_uri);
+               }
 
-       if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE, (gpointer) new_size_index))
-               wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
+               file_id = g_open (filename, O_RDONLY, 0);
+               if (file_id != -1) {
+                       TnyMimePart *mime_part;
+                       TnyStream *stream;
+                       const gchar *mime_type;
+                       gchar *basename;
+                       gchar *content_id;
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
+                       mime_type = gnome_vfs_get_mime_type(filename);
+#else
+                       mime_type = gnome_vfs_get_file_mime_type_fast (filename, NULL);
+#endif
+                       mime_part = tny_platform_factory_new_mime_part
+                               (modest_runtime_get_platform_factory ());
+                       stream = TNY_STREAM (tny_fs_stream_new (file_id));
+                       
+                       tny_mime_part_construct_from_stream (mime_part, stream, mime_type);
+                       
+                       content_id = g_strdup_printf ("%d", priv->last_cid);
+                       tny_mime_part_set_content_id (mime_part, content_id);
+                       g_free (content_id);
+                       priv->last_cid++;
+                       
+                       basename = g_path_get_basename (filename);
+                       tny_mime_part_set_filename (mime_part, basename);
+                       g_free (basename);
+                       
+                       priv->attachments = g_list_prepend (priv->attachments, mime_part);
+                       modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                                               mime_part);
+                       gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
+                       gtk_widget_show_all (priv->attachments_caption);
+               } else if (file_id == -1) {
+                       close (file_id);
+                       g_warning("file to be attached does not exist: %s", filename);
+               }
 
-       text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));;
+               g_free (filename);
+       }
 }
 
-static void
-modest_msg_edit_window_font_combobox_change (ModestMsgEditWindow *window,
-                                            gpointer userdata)
+void
+modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
+                                         GList *att_list)
 {
        ModestMsgEditWindowPrivate *priv;
-       gint new_font_index;
+       gboolean clean_list = FALSE;
 
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body));
 
-       new_font_index = gtk_combo_box_get_active (GTK_COMBO_BOX (priv->font_combobox));
+       if (att_list == NULL) {
+               att_list = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+               clean_list = TRUE;
+       }
 
-       if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, (gpointer) new_font_index))
-               wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
+       if (att_list == NULL) {
+               hildon_banner_show_information (NULL, NULL, _("TODO: no attachments selected to remove"));
+       } else {
+               GtkWidget *confirmation_dialog = NULL;
+               gboolean dialog_response;
+               GList *node;
+               gchar *message = NULL;
+               const gchar *filename = NULL;
+
+               if (att_list->next == NULL) {
+                       filename = tny_mime_part_get_filename (TNY_MIME_PART (att_list->data));
+               } else {
+                       filename = "";
+               }
+               message = g_strdup_printf (ngettext("emev_nc_delete_attachment", "emev_nc_delete_attachments",
+                                                   att_list->next == NULL), filename);
+               confirmation_dialog = hildon_note_new_confirmation (GTK_WINDOW (window), message);
+               g_free (message);
+               dialog_response = (gtk_dialog_run (GTK_DIALOG (confirmation_dialog))==GTK_RESPONSE_OK);
+               gtk_widget_destroy (confirmation_dialog);
+               if (!dialog_response) {
+                       if (clean_list)
+                               g_list_free (att_list);
+                       return;
+               }
+               hildon_banner_show_information (NULL, NULL, _("mcen_ib_removing_attachment"));
+
+               for (node = att_list; node != NULL; node = g_list_next (node)) {
+                       TnyMimePart *mime_part = (TnyMimePart *) node->data;
+                       const gchar *att_id;
+                       priv->attachments = g_list_remove (priv->attachments, mime_part);
+
+                       modest_attachments_view_remove_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                                                  mime_part);
+                       if (priv->attachments == NULL)
+                               gtk_widget_hide (priv->attachments_caption);
+                       att_id = tny_mime_part_get_content_id (mime_part);
+                       if (att_id != NULL)
+                               text_buffer_delete_images_by_id (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body)),
+                                                                att_id);
+                       g_object_unref (mime_part);
+                       gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+               }
+       }
 
-       text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
+       if (clean_list)
+               g_list_free (att_list);
 }
 
 static void
-modest_msg_edit_window_set_zoom (ModestWindow *window,
-                                gdouble zoom)
+modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window,
+                                           gpointer userdata)
 {
        ModestMsgEditWindowPrivate *priv;
-     
-       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
-
+       GdkColor *new_color;
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       
+#ifdef MODEST_HAVE_HILDON0_WIDGETS     
+       new_color = hildon_color_button_get_color (HILDON_COLOR_BUTTON (priv->font_color_button));
+#else 
+       GdkColor col;
+       hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), &col);
+       new_color = &col;
+#endif /*#ifdef MODEST_HAVE_HILDON0_WIDGETS*/
+
+       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) new_color);
+       
+       gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body);
+
+}
+
+static void
+modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item,
+                                   gpointer userdata)
+{
+       ModestMsgEditWindowPrivate *priv;
+       gint new_size_index;
+       ModestMsgEditWindow *window;
+       GtkWidget *label;
+       
+       window = MODEST_MSG_EDIT_WINDOW (userdata);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body));
+
+       if (gtk_check_menu_item_get_active (menu_item)) {
+               gchar *markup;
+               WPTextBufferFormat format;
+
+               memset (&format, 0, sizeof (format));
+               wp_text_buffer_get_current_state (WP_TEXT_BUFFER (priv->text_buffer), &format);
+
+               label = gtk_bin_get_child (GTK_BIN (menu_item));
+               
+               new_size_index = atoi (gtk_label_get_text (GTK_LABEL (label)));
+               format.cs.font_size = TRUE;
+               format.cs.text_position = TRUE;
+               format.cs.font = TRUE;
+               format.font_size = wp_get_font_size_index (new_size_index, DEFAULT_FONT_SIZE);
+               wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &format);
+
+/*             if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE, */
+/*                                                (gpointer) wp_get_font_size_index (new_size_index, 12))) */
+/*                     wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body)); */
+               
+               text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
+               markup = g_strconcat ("<span font_family='Serif'>", gtk_label_get_text (GTK_LABEL (label)), "</span>", NULL);
+               gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
+               g_free (markup);
+       }
+}
+
+static void
+modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item,
+                                   gpointer userdata)
+{
+       ModestMsgEditWindowPrivate *priv;
+       gint new_font_index;
+       ModestMsgEditWindow *window;
+       GtkWidget *label;
+       
+       window = MODEST_MSG_EDIT_WINDOW (userdata);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body));
+
+       if (gtk_check_menu_item_get_active (menu_item)) {
+               gchar *markup;
+
+               label = gtk_bin_get_child (GTK_BIN (menu_item));
+               
+               new_font_index = wp_get_font_index (gtk_label_get_text (GTK_LABEL (label)), DEFAULT_FONT);
+
+               if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, 
+                                                  (gpointer) new_font_index))
+                       wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
+               
+               text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
+                   markup = g_strconcat ("<span font_family='",gtk_label_get_text (GTK_LABEL (label)),"'>Tt</span>", NULL);
+               gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
+               g_free (markup);
+       }
+}
+
+static void
+modest_msg_edit_window_set_zoom (ModestWindow *window,
+                                gdouble zoom)
+{
+       ModestMsgEditWindowPrivate *priv;
+       ModestWindowPrivate *parent_priv;
+       GtkRadioAction *zoom_radio_action;
+     
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        priv->zoom_level = zoom;
        wp_text_buffer_set_font_scaling_factor (WP_TEXT_BUFFER (priv->text_buffer), zoom);
+
+       /* Zoom level menu options should be updated with the current zoom level */
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       zoom_radio_action = GTK_RADIO_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                                                                        "/MenuBar/ViewMenu/ZoomMenu/Zoom50Menu"));
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
+       /* FIXME: Not availible before Gtk 2.10 */
+#else
+       gtk_radio_action_set_current_value (zoom_radio_action, (gint) (zoom*100.0+0.1));
+#endif
 }
 
 static gdouble
@@ -1109,12 +1849,27 @@ modest_msg_edit_window_get_zoom (ModestWindow *window)
 }
 
 static gboolean
+zoom_allowed (ModestMsgEditWindow *window)
+{
+       GtkWidget *focus;
+
+       focus = gtk_window_get_focus (GTK_WINDOW (window));
+       return (focus != NULL && WP_IS_TEXT_VIEW (focus));
+}
+
+static gboolean
 modest_msg_edit_window_zoom_plus (ModestWindow *window)
 {
        ModestWindowPrivate *parent_priv;
        GtkRadioAction *zoom_radio_action;
        GSList *group, *node;
 
+       /* First we check if the text view is focused. If not, zooming is not allowed */
+       if (!zoom_allowed (MODEST_MSG_EDIT_WINDOW (window))) {
+               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
+               return FALSE;
+       }
+
        parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        zoom_radio_action = GTK_RADIO_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, 
                                                                         "/MenuBar/ViewMenu/ZoomMenu/Zoom50Menu"));
@@ -1122,7 +1877,7 @@ modest_msg_edit_window_zoom_plus (ModestWindow *window)
        group = gtk_radio_action_get_group (zoom_radio_action);
 
        if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (group->data))) {
-               hildon_banner_show_information (NULL, NULL, _("mcen_ib_max_zoom_level"));
+               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_max_zoom_level_reached"));
                return FALSE;
        }
 
@@ -1142,6 +1897,12 @@ modest_msg_edit_window_zoom_minus (ModestWindow *window)
        GtkRadioAction *zoom_radio_action;
        GSList *group, *node;
 
+       /* First we check if the text view is focused. If not, zooming is not allowed */
+       if (!zoom_allowed (MODEST_MSG_EDIT_WINDOW (window))) {
+               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
+               return FALSE;
+       }
+
        parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        zoom_radio_action = GTK_RADIO_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, 
                                                                         "/MenuBar/ViewMenu/ZoomMenu/Zoom50Menu"));
@@ -1154,7 +1915,7 @@ modest_msg_edit_window_zoom_minus (ModestWindow *window)
                                gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->next->data), TRUE);
                                return TRUE;
                        } else
-                               hildon_banner_show_information (NULL, NULL, _("mcen_ib_min_zoom_level"));
+                               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_min_zoom_level_reached"));
                        break;
                }
        }
@@ -1176,7 +1937,7 @@ modest_msg_edit_window_window_state_event (GtkWidget *widget, GdkEventWindowStat
 
                parent_priv = MODEST_WINDOW_GET_PRIVATE (widget);
                
-               fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ShowToggleFullscreenMenu");
+               fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewToggleFullscreenMenu");
                active = (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action)))?1:0;
                if (is_fullscreen != active)
                        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), is_fullscreen);
@@ -1195,7 +1956,7 @@ modest_msg_edit_window_toggle_fullscreen (ModestMsgEditWindow *window)
 
        parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
 
-       fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ShowToggleFullscreenMenu");
+       fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewToggleFullscreenMenu");
        active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action));
        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), !active);
 }
@@ -1205,13 +1966,17 @@ modest_msg_edit_window_show_cc (ModestMsgEditWindow *window,
                                gboolean show)
 {
        ModestMsgEditWindowPrivate *priv = NULL;
+       const gchar *recipients;
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       if (show)
+       gtk_widget_set_no_show_all (priv->cc_caption, TRUE);
+       recipients = modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field));
+       if ((show) || ((recipients != NULL) && (recipients[0] != '\0')))
                gtk_widget_show (priv->cc_caption);
        else
                gtk_widget_hide (priv->cc_caption);
+       modest_conf_set_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, show, NULL);
 }
 
 void
@@ -1219,12 +1984,858 @@ modest_msg_edit_window_show_bcc (ModestMsgEditWindow *window,
                                 gboolean show)
 {
        ModestMsgEditWindowPrivate *priv = NULL;
+       const gchar *recipients;
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       if (show)
+       gtk_widget_set_no_show_all (priv->bcc_caption, TRUE);
+       recipients = modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->bcc_field));
+       if ((show) || ((recipients != NULL) && (recipients[0] != '\0')))
                gtk_widget_show (priv->bcc_caption);
        else
                gtk_widget_hide (priv->bcc_caption);
+       modest_conf_set_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, show, NULL);
+}
+
+static void
+modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window,
+                                        ModestRecptEditor *editor)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       g_return_if_fail ((editor == NULL) || (MODEST_IS_RECPT_EDITOR (editor)));
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       if (editor == NULL) {
+               GtkWidget *view_focus;
+               view_focus = gtk_window_get_focus (GTK_WINDOW (window));
+
+               /* This code should be kept in sync with ModestRecptEditor. The
+                  textview inside the recpt editor is the one that really gets the
+                  focus. As it's inside a scrolled window, and this one inside the
+                  hbox recpt editor inherits from, we'll need to go up in the 
+                  hierarchy to know if the text view is part of the recpt editor
+                  or if it's a different text entry */
+
+               if (gtk_widget_get_parent (view_focus)) {
+                       GtkWidget *first_parent;
+
+                       first_parent = gtk_widget_get_parent (view_focus);
+                       if (gtk_widget_get_parent (first_parent) && 
+                           MODEST_IS_RECPT_EDITOR (gtk_widget_get_parent (first_parent))) {
+                               editor = MODEST_RECPT_EDITOR (gtk_widget_get_parent (first_parent));
+                       }
+               }
+
+               if (editor == NULL)
+                       editor = MODEST_RECPT_EDITOR (priv->to_field);
+
+       }
+
+       modest_address_book_select_addresses (editor);
+
+}
+
+void
+modest_msg_edit_window_select_contacts (ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       modest_msg_edit_window_open_addressbook (window, NULL);
+}
+
+static void
+modest_msg_edit_window_show_toolbar (ModestWindow *self,
+                                    gboolean show_toolbar)
+{
+       ModestWindowPrivate *parent_priv;
+       
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
+       parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+       /* FIXME: we can not just use the code of
+          modest_msg_edit_window_setup_toolbar because it has a
+          mixture of both initialization and creation code. */
+
+       if (show_toolbar)
+               gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
+       else
+               gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
+}
+
+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));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       priority_flags = priority_flags & (TNY_HEADER_FLAG_PRIORITY);
+
+       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_set_file_format (ModestMsgEditWindow *window,
+                                       gint file_format)
+{
+       ModestMsgEditWindowPrivate *priv;
+       gint current_format;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       current_format = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))
+               ? MODEST_FILE_FORMAT_FORMATTED_TEXT : MODEST_FILE_FORMAT_PLAIN_TEXT;
+
+       if (current_format != file_format) {
+               switch (file_format) {
+               case MODEST_FILE_FORMAT_FORMATTED_TEXT:
+                       wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
+                       break;
+               case MODEST_FILE_FORMAT_PLAIN_TEXT:
+               {
+                       GtkWidget *dialog;
+                       gint response;
+                       dialog = hildon_note_new_confirmation (NULL, _("emev_nc_formatting_lost"));
+                       response = gtk_dialog_run (GTK_DIALOG (dialog));
+                       gtk_widget_destroy (dialog);
+                       if (response == GTK_RESPONSE_OK)
+                               wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
+               }
+                       break;
+               }
+               update_dimmed (window);
+       }
+}
+
+void
+modest_msg_edit_window_select_font (ModestMsgEditWindow *window)
+{
+       GtkWidget *dialog;
+       ModestMsgEditWindowPrivate *priv;
+       WPTextBufferFormat oldfmt, fmt;
+       gint old_position = 0;
+       gint response = 0;
+       gint position = 0;
+       gint font_size;
+       GdkColor *color = NULL;
+       gboolean bold, bold_set, italic, italic_set;
+       gboolean underline, underline_set;
+       gboolean strikethrough, strikethrough_set;
+       gboolean position_set;
+       gboolean font_size_set, font_set, color_set;
+       gchar *font_name;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       
+       dialog = hildon_font_selection_dialog_new (GTK_WINDOW (window), NULL);
+
+       /* First we get the currently selected font information */
+       wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), &oldfmt, TRUE);
+       g_object_set (G_OBJECT (dialog), "font-scaling", priv->zoom_level, NULL);
+
+       switch (oldfmt.text_position) {
+       case TEXT_POSITION_NORMAL:
+               old_position = 0;
+               break;
+       case TEXT_POSITION_SUPERSCRIPT:
+               old_position = 1;
+               break;
+       default:
+               old_position = -1;
+               break;
+       }
+
+       g_object_set (G_OBJECT (dialog),
+                     "bold", oldfmt.bold != FALSE,
+                     "bold-set", !oldfmt.cs.bold,
+                     "underline", oldfmt.underline != FALSE,
+                     "underline-set", !oldfmt.cs.underline,
+                     "italic", oldfmt.italic != FALSE,
+                     "italic-set", !oldfmt.cs.italic,
+                     "strikethrough", oldfmt.strikethrough != FALSE,
+                     "strikethrough-set", !oldfmt.cs.strikethrough,
+                     "color", &oldfmt.color,
+                     "color-set", !oldfmt.cs.color,
+                     "size", wp_font_size[oldfmt.font_size],
+                     "size-set", !oldfmt.cs.font_size,
+                     "position", old_position,
+                     "position-set", !oldfmt.cs.text_position,
+                     "family", wp_get_font_name (oldfmt.font),
+                     "family-set", !oldfmt.cs.font,
+                     NULL);
+
+       gtk_widget_show_all (dialog);
+       response = gtk_dialog_run (GTK_DIALOG (dialog));
+       if (response == GTK_RESPONSE_OK) {
+
+               g_object_get( dialog,
+                             "bold", &bold,
+                             "bold-set", &bold_set,
+                             "underline", &underline,
+                             "underline-set", &underline_set,
+                             "italic", &italic,
+                             "italic-set", &italic_set,
+                             "strikethrough", &strikethrough,
+                             "strikethrough-set", &strikethrough_set,
+                             "color", &color,
+                             "color-set", &color_set,
+                             "size", &font_size,
+                             "size-set", &font_size_set,
+                             "family", &font_name,
+                             "family-set", &font_set,
+                             "position", &position,
+                             "position-set", &position_set,
+                             NULL );
+               
+       }       
+
+       if (response == GTK_RESPONSE_OK) {
+               memset(&fmt, 0, sizeof(fmt));
+               if (bold_set) {
+                       fmt.bold = bold;
+                       fmt.cs.bold = TRUE;
+               }
+               if (italic_set) {
+                       fmt.italic = italic;
+                       fmt.cs.italic = TRUE;
+               }
+               if (underline_set) {
+                       fmt.underline = underline;
+                       fmt.cs.underline = TRUE;
+               }
+               if (strikethrough_set) {
+                       fmt.strikethrough = strikethrough;
+                       fmt.cs.strikethrough = TRUE;
+               }
+               if (position_set) {
+                       fmt.text_position =
+                               ( position == 0 )
+                               ? TEXT_POSITION_NORMAL
+                               : ( ( position == 1 )
+                                   ? TEXT_POSITION_SUPERSCRIPT
+                                   : TEXT_POSITION_SUBSCRIPT );
+                       fmt.cs.text_position = TRUE;
+               }
+               if (color_set) {
+                       fmt.color = *color;
+                       fmt.cs.color = TRUE;
+               }
+               if (font_set) {
+                       fmt.font = wp_get_font_index(font_name,
+                                                    DEFAULT_FONT);
+                       fmt.cs.font = TRUE;
+               }
+               g_free(font_name);
+               if (font_size_set) {
+                       fmt.font_size = wp_get_font_size_index(
+                               font_size, DEFAULT_FONT_SIZE);
+                       fmt.cs.font_size = TRUE;
+               }
+               wp_text_buffer_set_format(WP_TEXT_BUFFER(priv->text_buffer), &fmt);
+       }
+       gtk_widget_destroy (dialog);
+       
+       gtk_widget_grab_focus(GTK_WIDGET(priv->msg_body));
+}
+
+void
+modest_msg_edit_window_undo (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       
+       wp_text_buffer_undo (WP_TEXT_BUFFER (priv->text_buffer));
+
+       update_dimmed (window);
+
+}
+
+static void
+update_dimmed (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       GtkAction *action;
+       GtkWidget *widget;
+       gboolean rich_text;
+       gboolean editor_focused;
+
+       rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+       editor_focused = gtk_widget_is_focus (priv->msg_body);
+
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/SelectFontMenu");
+       gtk_action_set_sensitive (action, rich_text && editor_focused);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu");
+       gtk_action_set_sensitive (action, rich_text && editor_focused);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu");
+       gtk_action_set_sensitive (action, rich_text && editor_focused);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentLeftMenu");
+       gtk_action_set_sensitive (action, rich_text && editor_focused);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentCenterMenu");
+       gtk_action_set_sensitive (action, rich_text && editor_focused);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentRightMenu");
+       gtk_action_set_sensitive (action, rich_text && editor_focused);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/InsertImageMenu");
+       gtk_action_set_sensitive (action, rich_text && editor_focused);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsBold");
+       gtk_action_set_sensitive (action, rich_text && editor_focused);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsItalics");
+       gtk_action_set_sensitive (action, rich_text && editor_focused);
+       widget = priv->font_color_button;
+       gtk_widget_set_sensitive (widget, rich_text && editor_focused);
+       widget = priv->font_size_toolitem;
+       gtk_widget_set_sensitive (widget, rich_text && editor_focused);
+       widget = priv->font_face_toolitem;
+       gtk_widget_set_sensitive (widget, rich_text && editor_focused);
+}
+
+static void
+setup_insensitive_handlers (ModestMsgEditWindow *window)
+{
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       GtkWidget *widget;
+
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSend");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (send_insensitive_press), window);
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/EmailMenu/SendMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (send_insensitive_press), window);
+
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/SelectFontMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentLeftMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentCenterMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentRightMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/InsertImageMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsBold");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsItalics");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
+       widget = priv->font_color_button;
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
+       widget = priv->font_size_toolitem;
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
+       widget = priv->font_face_toolitem;
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
+
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (remove_attachment_insensitive_press), window);
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/ViewMenu/ZoomMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (zoom_insensitive_press), window);
+
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/EditMenu/PasteMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (paste_insensitive_press), window);
+}
+
+static void  
+text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window)
+{
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       GtkAction *action;
+
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/UndoMenu");
+       gtk_action_set_sensitive (action, can_undo);
+}
+
+static void
+text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id)
+{
+       GtkTextIter iter;
+       GtkTextIter match_start, match_end;
+
+       if (image_id == NULL)
+               return;
+
+       gtk_text_buffer_get_start_iter (buffer, &iter);
+
+       while (gtk_text_iter_forward_search (&iter, "\xef\xbf\xbc", 0, &match_start, &match_end, NULL)) {
+               GSList *tags = gtk_text_iter_get_tags (&match_start);
+               GSList *node;
+               for (node = tags; node != NULL; node = g_slist_next (node)) {
+                       GtkTextTag *tag = (GtkTextTag *) node->data;
+                       if (g_object_get_data (G_OBJECT (tag), "image-set") != NULL) {
+                               gchar *cur_image_id = g_object_get_data (G_OBJECT (tag), "image-index");
+                               if ((cur_image_id != NULL) && (strcmp (image_id, cur_image_id)==0)) {
+                                       gint offset;
+                                       offset = gtk_text_iter_get_offset (&match_start);
+                                       gtk_text_buffer_delete (buffer, &match_start, &match_end);
+                                       gtk_text_buffer_get_iter_at_offset (buffer, &iter, offset);
+                               }
+                       }
+               }
+               gtk_text_iter_forward_char (&iter);
+       }
+}
+
+static void
+text_buffer_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, gpointer userdata)
+{
+       ModestMsgEditWindow *window = (ModestMsgEditWindow *) userdata;
+       GtkTextIter real_start, real_end;
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       if (gtk_text_iter_compare (start, end) > 0) {
+               real_start = *end;
+               real_end = *start;
+       } else {
+               real_start = *start;
+               real_end = *end;
+       }
+       do {
+               GSList *tags = gtk_text_iter_get_tags (&real_start);
+               GSList *node;
+               for (node = tags; node != NULL; node = g_slist_next (node)) {
+                       GtkTextTag *tag = (GtkTextTag *) node->data;
+                       if (g_object_get_data (G_OBJECT (tag), "image-set") != NULL) {
+                               gchar *image_id = g_object_get_data (G_OBJECT (tag), "image-index");
+
+                               modest_attachments_view_remove_attachment_by_id (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                                                                image_id);
+                               gtk_text_buffer_remove_tag (buffer, tag, start, end);
+                       }
+               }
+       } while (gtk_text_iter_forward_char (&real_start)&&
+                (gtk_text_iter_compare (&real_start, &real_end)<=0));
 }
 
+static gboolean
+msg_body_focus (GtkWidget *focus,
+               GdkEventFocus *event,
+               gpointer userdata)
+{
+       
+       update_dimmed (MODEST_MSG_EDIT_WINDOW (userdata));
+       return FALSE;
+}
+
+static void
+recpt_field_changed (GtkTextBuffer *buffer,
+                 ModestMsgEditWindow *editor)
+{
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (editor);
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
+       GtkTextBuffer *to_buffer, *cc_buffer, *bcc_buffer;
+       gboolean dim = FALSE;
+       GtkAction *action;
+
+       to_buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field));
+       cc_buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field));
+       bcc_buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field));
+       
+       dim = ((gtk_text_buffer_get_char_count (to_buffer) + 
+               gtk_text_buffer_get_char_count (cc_buffer) +
+               gtk_text_buffer_get_char_count (bcc_buffer)) == 0);
+                       
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSend");
+       gtk_action_set_sensitive (action, !dim);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EmailMenu/SendMenu");
+       gtk_action_set_sensitive (action, !dim);
+}
+
+static void  
+send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
+{
+       hildon_banner_show_information (NULL, NULL, _("mcen_ib_add_recipients_first"));
+}
+
+static void  
+zoom_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
+{
+       hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
+}
+
+static void  
+remove_attachment_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
+{
+       ModestWindowPrivate *parent_priv;
+       ModestMsgEditWindowPrivate *priv;
+       GList *selected_attachments = NULL;
+       gint n_att_selected = 0;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (editor);
+
+       selected_attachments = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+       n_att_selected = g_list_length (selected_attachments);
+       g_list_free (selected_attachments);
+
+       if (n_att_selected > 1)
+               hildon_banner_show_information (NULL, NULL, _("mcen_ib_unable_to_display_more"));
+       else if (n_att_selected == 0)
+               hildon_banner_show_information (NULL, NULL, _("TODO: select one attachment"));
+               
+}
+
+static void
+style_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
+{
+       gboolean rich_text, editor_focused;
+
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
+       rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+       editor_focused = gtk_widget_is_focus (priv->msg_body);
+
+       if (!rich_text)
+               hildon_banner_show_information (NULL, NULL, _("mcen_ib_item_unavailable_plaintext"));
+       else if (!editor_focused)
+               hildon_banner_show_information (NULL, NULL, _("mcen_ib_move_cursor_to_message"));
+}
+
+static void
+reset_modified (ModestMsgEditWindow *editor)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
+       GtkTextBuffer *buffer;
+
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->to_field));
+       gtk_text_buffer_set_modified (buffer, FALSE);
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->cc_field));
+       gtk_text_buffer_set_modified (buffer, FALSE);
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->bcc_field));
+       gtk_text_buffer_set_modified (buffer, FALSE);
+       gtk_text_buffer_set_modified (priv->text_buffer, FALSE);
+}
+
+gboolean
+modest_msg_edit_window_is_modified (ModestMsgEditWindow *editor)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
+       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;
+
+       return FALSE;
+}
+
+gboolean
+modest_msg_edit_window_check_names (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       /* check if there's no recipient added */
+       if ((gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))) == 0) &&
+           (gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))) == 0) &&
+           (gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field))) == 0)) {
+               /* no recipient contents, then select contacts */
+               modest_msg_edit_window_open_addressbook (window, NULL);
+               return FALSE;
+       }
+
+       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field)))
+               return FALSE;
+       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field)))
+               return FALSE;
+       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field)))
+               return FALSE;
+
+       modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
+
+       return TRUE;
+
+}
+
+static void
+modest_msg_edit_window_add_attachment_clicked (GtkButton *button,
+                                              ModestMsgEditWindow *window)
+{
+       modest_msg_edit_window_attach_file (window);
+}
+
+static void
+modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard,
+                                              GdkEvent *event,
+                                              ModestMsgEditWindow *window)
+{
+       ModestWindowPrivate *parent_priv;
+       ModestMsgEditWindowPrivate *priv;
+       GtkAction *action;
+       gchar *selection;
+       GtkWidget *focused;
+       GList *selected_attachments = NULL;
+       gint n_att_selected = 0;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       selection = gtk_clipboard_wait_for_text (clipboard);
+       focused = gtk_window_get_focus (GTK_WINDOW (window));
+
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu");
+       gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
+       gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
+
+       selected_attachments = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+       n_att_selected = g_list_length (selected_attachments);
+       g_list_free (selected_attachments);
+
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu");
+       gtk_action_set_sensitive (action, n_att_selected == 1);
+       
+
+       update_paste_dimming (window);
+}
+
+static void 
+update_window_title (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+       const gchar *subject;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       subject = gtk_entry_get_text (GTK_ENTRY (priv->subject_field));
+       if (subject == NULL || subject[0] == '\0')
+               subject = _("mail_va_new_email");
+
+       gtk_window_set_title (GTK_WINDOW (window), subject);
+
+}
+
+static void  
+subject_field_changed (GtkEditable *editable, 
+                      ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       update_window_title (window);
+       gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+}
+
+void
+modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window,
+                                           gboolean show)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       gtk_widget_set_no_show_all (priv->find_toolbar, FALSE);
+       if (show) {
+               gtk_widget_show_all (priv->find_toolbar);
+               hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
+       } else {
+               gtk_widget_hide_all (priv->find_toolbar);
+               gtk_widget_grab_focus (priv->msg_body);
+       }
+    
+}
+
+static void 
+modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
+                                           ModestMsgEditWindow *window)
+{
+       gchar *current_search = NULL;
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       gboolean result;
+       GtkTextIter selection_start, selection_end;
+       GtkTextIter match_start, match_end;
+
+       g_object_get (G_OBJECT (widget), "prefix", &current_search, NULL);
+       if ((current_search == NULL) && (strcmp (current_search, "") == 0)) {
+               g_free (current_search);
+               return;
+       }
+
+       gtk_text_buffer_get_selection_bounds (priv->text_buffer, &selection_start, &selection_end);
+       result = gtk_text_iter_forward_search (&selection_end, current_search, GTK_TEXT_SEARCH_VISIBLE_ONLY, &match_start, &match_end, NULL);
+       if (!result) {
+               GtkTextIter buffer_start;
+               gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start);
+               result = gtk_text_iter_forward_search (&buffer_start, current_search, GTK_TEXT_SEARCH_VISIBLE_ONLY, &match_start, &match_end, &selection_start);
+       }
+       if (result) {
+               gtk_text_buffer_select_range (priv->text_buffer, &match_start, &match_end);
+               gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (priv->msg_body), &match_start, 0.0, TRUE, 0.0, 0.0);
+       } else {
+               /* TODO: warning about non succesful search */
+       }
+       g_free (current_search);
+}
+
+static void
+modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
+                                          ModestMsgEditWindow *window)
+{
+       GtkToggleAction *toggle;
+       ModestWindowPrivate *parent_priv;
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+       toggle = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/FindInMessageMenu"));
+       gtk_toggle_action_set_active (toggle, FALSE);
+}
+
+
+static void 
+update_paste_dimming (ModestMsgEditWindow *window)
+{
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       GtkAction *action = NULL;
+       GtkClipboard *clipboard = NULL;
+       GtkWidget *focused;
+       gboolean active;
+
+       focused = gtk_window_get_focus (GTK_WINDOW (window));
+
+       clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+       active = gtk_clipboard_wait_is_text_available (clipboard);
+
+       if (active) {
+               if (MODEST_IS_ATTACHMENTS_VIEW (focused))
+                       active = FALSE;
+       }
+
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/PasteMenu");
+       gtk_action_set_sensitive (action, active);
+
+}
+
+static void  
+paste_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
+{
+       GtkWidget *focused = gtk_window_get_focus (GTK_WINDOW (editor));
+
+       if (MODEST_IS_ATTACHMENTS_VIEW (focused))
+               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_unable_to_paste_here"));
+       else
+               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ecoc_ib_edwin_nothing_to_paste"));
+               
+}
+
+
+static void
+modest_msg_edit_window_system_clipboard_owner_change (GtkClipboard *clipboard,
+                                                     GdkEvent *event,
+                                                     ModestMsgEditWindow *window)
+{
+       update_paste_dimming (window);
+}
+
+static void 
+update_select_all_dimming (ModestMsgEditWindow *window)
+{
+       GtkWidget *focused;
+       gboolean dimmed = FALSE;
+       GtkAction *action;
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+       focused = gtk_window_get_focus (GTK_WINDOW (window));
+       if (GTK_IS_ENTRY (focused)) {
+               const gchar *current_text;
+               current_text = gtk_entry_get_text (GTK_ENTRY (focused));
+               dimmed = ((current_text == NULL) || (current_text[0] == '\0'));
+       } else if (GTK_IS_TEXT_VIEW (focused)) {
+               GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused));
+               dimmed = (gtk_text_buffer_get_char_count (buffer) < 1);
+       } else if (MODEST_IS_ATTACHMENTS_VIEW (focused)) {
+               dimmed = FALSE;
+       }
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/SelectAllMenu");
+       gtk_action_set_sensitive (action, !dimmed);
+}
+
+static void 
+update_zoom_dimming (ModestMsgEditWindow *window)
+{
+       GtkWidget *focused;
+       gboolean dimmed = FALSE;
+       GtkAction *action;
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+       focused = gtk_window_get_focus (GTK_WINDOW (window));
+       dimmed = ! WP_IS_TEXT_VIEW (focused);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ZoomMenu");
+       gtk_action_set_sensitive (action, !dimmed);
+}
+
+static void
+edit_menu_activated (GtkAction *action,
+                    gpointer userdata)
+{
+       ModestMsgEditWindow *window = MODEST_MSG_EDIT_WINDOW (userdata);
+
+       update_select_all_dimming (window);
+}
+static void
+view_menu_activated (GtkAction *action,
+                    gpointer userdata)
+{
+       ModestMsgEditWindow *window = MODEST_MSG_EDIT_WINDOW (userdata);
+
+       update_zoom_dimming (window);
+}
+
+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;
+}