* Fix some detected memory leaks
[modest] / src / maemo / modest-msg-edit-window.c
index b25552c..45f2738 100644 (file)
@@ -42,6 +42,8 @@
 
 #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-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>
-#include "widgets/modest-msg-edit-window-ui.h"
-
-#ifdef MODEST_HILDON_VERSION_0
-#include <hildon-widgets/hildon-file-chooser-dialog.h>
-#else
-#include <hildon/hildon-file-chooser-dialog.h>
-
-#endif /*MODEST_HILDON_VERSION_0 */
+#include "modest-scroll-area.h"
 
+#include "modest-hildon-includes.h"
+#include "widgets/modest-msg-edit-window-ui.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
@@ -80,25 +76,38 @@ static void  modest_msg_edit_window_class_init   (ModestMsgEditWindowClass *klas
 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  to_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  setup_insensitive_handlers (ModestMsgEditWindow *editor);
+static void  reset_modified (ModestMsgEditWindow *editor);
+static gboolean is_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_can_undo (GtkTextBuffer *buffer, gboolean can_undo, 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);
 
 /* 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 update_dimmed (ModestMsgEditWindow *window);
 
 
 /* list my signals */
@@ -117,22 +126,34 @@ struct _ModestMsgEditWindowPrivate {
        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   *scroll;
 
        gint last_cid;
        GList *attachments;
 
+       TnyHeaderFlags priority_flags;
+
        gdouble zoom_level;
+
+       TnyMsg      *draft_msg;
 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -185,6 +206,7 @@ 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));
 }
@@ -207,6 +229,10 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
 
        priv->cc_caption    = NULL;
        priv->bcc_caption    = NULL;
+
+       priv->priority_flags = 0;
+
+       priv->draft_msg = NULL;
 }
 
 
@@ -215,7 +241,7 @@ static void
 save_settings (ModestMsgEditWindow *self)
 {
        modest_widget_memory_save (modest_runtime_get_conf(),
-                                  G_OBJECT(self), "modest-edit-msg-window");
+                                  G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY);
 }
 
 
@@ -223,7 +249,7 @@ static void
 restore_settings (ModestMsgEditWindow *self)
 {
        modest_widget_memory_restore (modest_runtime_get_conf(),
-                                     G_OBJECT(self), "modest-edit-msg-window");
+                                     G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY);
 }
 
 
@@ -236,7 +262,8 @@ get_transports (void)
        GSList *cursor, *accounts;
        
        account_mgr = modest_runtime_get_account_mgr();
-       cursor = accounts = modest_account_mgr_account_names (account_mgr); 
+       cursor = accounts = modest_account_mgr_account_names (account_mgr, 
+                                               TRUE /* only enabled accounts. */); 
        while (cursor) {
                gchar *account_name = (gchar*)cursor->data;
                gchar *from_string  = modest_account_mgr_get_from_string (account_mgr,
@@ -303,6 +330,10 @@ init_window (ModestMsgEditWindow *obj)
        ModestMsgEditWindowPrivate *priv;
        ModestPairList *protos;
        GtkSizeGroup *size_group;
+       GtkWidget *frame;
+       GtkWidget *scroll_area;
+       GtkWidget *subject_box;
+       GtkWidget *attachment_icon;
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
 
@@ -312,29 +343,50 @@ init_window (ModestMsgEditWindow *obj)
        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);
+       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);
+       g_object_set (G_OBJECT (priv->subject_field), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL);
+       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 ();
@@ -344,22 +396,40 @@ 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);
+
        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), "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->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 (to_field_changed), obj);
+       to_field_changed (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field)), MODEST_MSG_EDIT_WINDOW (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)));
@@ -371,6 +441,10 @@ init_window (ModestMsgEditWindow *obj)
                gtk_widget_hide (priv->bcc_field);
 
        gtk_container_add (GTK_CONTAINER(obj), priv->scroll);
+       scroll_area = modest_scroll_area_new (priv->scroll, priv->msg_body);
+       gtk_container_add (GTK_CONTAINER (frame), scroll_area);
+       gtk_container_set_focus_vadjustment (GTK_CONTAINER (scroll_area), 
+                                            gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)));
 }
        
 
@@ -386,8 +460,39 @@ modest_msg_edit_window_finalize (GObject *obj)
 static gboolean
 on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgEditWindow *self)
 {
+       GtkWidget *close_dialog;
+       ModestMsgEditWindowPrivate *priv;
+       gint response;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
        save_settings (self);
-       return FALSE;
+       if (is_modified (self)) {
+               close_dialog = hildon_note_new_confirmation (GTK_WINDOW (self), _("mcen_nc_no_email_message_modified_save_changes"));
+               response = gtk_dialog_run (GTK_DIALOG (close_dialog));
+               gtk_widget_destroy (close_dialog);
+
+               if (response != GTK_RESPONSE_CANCEL) {
+                       modest_ui_actions_on_save_to_drafts (NULL, self);
+               }
+       } 
+/*     /\* remove old message from drafts *\/ */
+/*     if (priv->draft_msg) { */
+/*             TnyHeader *header = tny_msg_get_header (priv->draft_msg); */
+/*             TnyAccount *account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(), */
+/*                                                                                        account_name, */
+/*                                                                                        TNY_ACCOUNT_TYPE_STORE); */
+/*             TnyFolder *folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS); */
+/*             g_return_val_if_fail (TNY_IS_HEADER (header), FALSE); */
+/*             g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); */
+/*             tny_folder_remove_msg (folder, header, NULL); */
+/*             g_object_unref (folder); */
+/*             g_object_unref (header); */
+/*             g_object_unref (priv->draft_msg); */
+/*             priv->draft_msg = NULL; */
+/*     } */
+       gtk_widget_destroy (GTK_WIDGET (self));
+       
+       return TRUE;
 }
 
 static GtkWidget *
@@ -420,8 +525,10 @@ 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;
        
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
        g_return_if_fail (TNY_IS_MSG (msg));
@@ -435,40 +542,37 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
        subject = tny_header_get_subject (header);
 
        if (to)
-               gtk_entry_set_text (GTK_ENTRY(priv->to_field),  to);
+               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field),  to);
        if (cc)
-               gtk_entry_set_text (GTK_ENTRY(priv->cc_field),  cc);
+               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field),  cc);
        if (bcc)
-               gtk_entry_set_text (GTK_ENTRY(priv->bcc_field), bcc);
+               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
        if (subject)
                gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);   
 
 /*     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 ((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);
        }
 
-       if (!to) {
-               gtk_widget_grab_focus (priv->to_field);
+       /* 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);
        }
@@ -477,19 +581,77 @@ 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);
+       if (priv->attachments == NULL)
+               gtk_widget_hide_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;
+       gchar *markup;
 
        /* Toolbar */
        parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
@@ -499,39 +661,110 @@ 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_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);
-       }
-       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);
+               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->font_combobox = gtk_combo_box_new_text ();
+               priv->size_items_group = g_slist_prepend (priv->size_items_group, size_menu_item);
+                       
+               g_signal_connect (G_OBJECT (size_menu_item), "toggled", G_CALLBACK (modest_msg_edit_window_size_change),
+                                 window);
+       }
+       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);
+                       
+               g_signal_connect (G_OBJECT (font_menu_item), "toggled", G_CALLBACK (modest_msg_edit_window_font_change),
+                                 window);
        }
-       tool_item = GTK_WIDGET (gtk_tool_item_new ());
-       gtk_container_add (GTK_CONTAINER (tool_item), priv->font_combobox);
+       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);
+
+
 }
 
 
@@ -555,6 +788,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,
@@ -577,6 +811,18 @@ 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);
 
@@ -611,6 +857,8 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
 
        modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj));
 
+       setup_insensitive_handlers (MODEST_MSG_EDIT_WINDOW (obj));
+
        set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg);
 
        text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (obj));
@@ -669,13 +917,17 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        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->to      =  (gchar*) modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR(priv->to_field));
+       data->cc      =  (gchar*) modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR(priv->cc_field));
+       data->bcc     =  (gchar*) modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR(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);
+       if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)))
+               data->html_body = get_formatted_data (edit_window);
+       else
+               data->html_body = NULL;
        data->attachments = priv->attachments;
+       data->priority_flags = priv->priority_flags;
 
        return data;
 }
@@ -855,10 +1107,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");
@@ -867,7 +1131,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), 
@@ -878,26 +1142,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)
 {
@@ -911,15 +1198,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;
        }
@@ -937,19 +1237,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;
@@ -1030,6 +1342,10 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
                                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);
+                               modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                                                       image_part);
+                               gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
+                               gtk_widget_show_all (priv->attachments_caption);
                        } else if (image_file_id == -1) {
                                close (image_file_id);
                        }
@@ -1045,49 +1361,82 @@ modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window,
 {
        ModestMsgEditWindowPrivate *priv;
        GdkColor *new_color;
-
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       
+#ifdef MODEST_HILDON_VERSION_0 
        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 /*MODEST_HILDON_VERSION_0*/
 
        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_combobox_change (ModestMsgEditWindow *window,
-                                            gpointer userdata)
+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));
 
-       new_size_index = gtk_combo_box_get_active (GTK_COMBO_BOX (priv->size_combobox));
+       if (gtk_check_menu_item_get_active (menu_item)) {
+               gchar *markup;
 
-       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));
+               label = gtk_bin_get_child (GTK_BIN (menu_item));
+               
+               new_size_index = atoi (gtk_label_get_text (GTK_LABEL (label)));
 
-       text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));;
+               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_combobox_change (ModestMsgEditWindow *window,
-                                            gpointer userdata)
+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));
 
-       new_font_index = gtk_combo_box_get_active (GTK_COMBO_BOX (priv->font_combobox));
+       if (gtk_check_menu_item_get_active (menu_item)) {
+               gchar *markup;
 
-       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));
+               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);
 
-       text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
+               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
@@ -1234,3 +1583,480 @@ modest_msg_edit_window_show_bcc (ModestMsgEditWindow *window,
                gtk_widget_hide (priv->bcc_caption);
 }
 
+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_VIEW_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;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       priority_flags = priority_flags & (TNY_HEADER_FLAG_HIGH_PRIORITY);
+
+       if (priv->priority_flags != priority_flags) {
+
+               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);
+                       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);
+                       break;
+               default:
+                       gtk_widget_hide (priv->priority_icon);
+                       break;
+               }
+       }
+}
+
+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 (NULL, 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 );
+               
+       }       
+
+       gtk_widget_destroy (dialog);
+       
+       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;
+               }
+               gdk_color_free(color);
+               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;
+               }
+               gtk_widget_grab_focus(GTK_WIDGET(priv->msg_body));
+               wp_text_buffer_set_format(WP_TEXT_BUFFER(priv->text_buffer), &fmt);
+       }
+
+}
+
+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);
+
+}
+
+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 gboolean
+msg_body_focus (GtkWidget *focus,
+               GdkEventFocus *event,
+               gpointer userdata)
+{
+       update_dimmed (MODEST_MSG_EDIT_WINDOW (userdata));
+       return FALSE;
+}
+
+static void
+to_field_changed (GtkTextBuffer *buffer,
+                 ModestMsgEditWindow *editor)
+{
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (editor);
+       GtkAction *action;
+
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSend");
+       gtk_action_set_sensitive (action, gtk_text_buffer_get_char_count (buffer) != 0);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EmailMenu/SendMenu");
+       gtk_action_set_sensitive (action, gtk_text_buffer_get_char_count (buffer) != 0);
+}
+
+static void  
+send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
+{
+       hildon_banner_show_information (NULL, NULL, _("mcen_ib_add_recipients_first"));
+}
+
+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);
+}
+
+static gboolean
+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;
+
+}