* src/maemo/modest-msg-edit-window.c:
[modest] / src / maemo / modest-msg-edit-window.c
index 645422b..efbc641 100644 (file)
 #include "modest-tny-platform-factory.h"
 #include "modest-tny-msg.h"
 #include "modest-tny-folder.h"
+#include "modest-tny-account.h"
 #include "modest-address-book.h"
 #include "modest-text-utils.h"
 #include <tny-simple-list.h>
 #include <wptextview.h>
 #include <wptextbuffer.h>
 #include "modest-scroll-area.h"
+#include "modest-msg-edit-window-ui-dimming.h"
 
 #include "modest-hildon-includes.h"
 #ifdef MODEST_HAVE_HILDON0_WIDGETS
@@ -73,6 +75,7 @@
 #else
 #include <libgnomevfs/gnome-vfs-mime.h>
 #endif
+#include <modest-utils.h>
 #include "modest-maemo-utils.h"
 
 
@@ -85,6 +88,8 @@
 #define IMAGE_MAX_WIDTH 560
 #define DEFAULT_FONT_SCALE 1.5
 
+static gboolean is_wp_text_buffer_started = FALSE;
+
 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);
@@ -92,10 +97,6 @@ static void  modest_msg_edit_window_finalize     (GObject *obj);
 static gboolean msg_body_focus (GtkWidget *focus, GdkEventFocus *event, gpointer userdata);
 static void  body_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor);
 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  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_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window);
@@ -103,6 +104,11 @@ static void  text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, Mod
 static void  text_buffer_apply_tag (GtkTextBuffer *buffer, GtkTextTag *tag, 
                                    GtkTextIter *start, GtkTextIter *end,
                                    gpointer userdata);
+static void  text_buffer_insert_text (GtkTextBuffer *buffer,
+                                     GtkTextIter *location,
+                                     gchar *text,
+                                     gint len,
+                                     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  subject_field_insert_text (GtkEditable *editable, 
@@ -127,22 +133,17 @@ static void modest_msg_edit_window_add_attachment_clicked (GtkButton *button,
 
 /* ModestWindow methods implementation */
 static void modest_msg_edit_window_disconnect_signals (ModestWindow *window);
-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 subject_field_move_cursor (GtkEntry *entry,
+                                      GtkMovementStep step,
+                                      gint a1,
+                                      gboolean a2,
+                                      gpointer userdata);
 static void update_window_title (ModestMsgEditWindow *window);
-static void update_dimmed (ModestMsgEditWindow *window);
-static void update_paste_dimming (ModestMsgEditWindow *window);
-static void update_copy_cut_dimming (ModestMsgEditWindow *window);
-static void update_select_all_dimming (ModestMsgEditWindow *window);
-static void update_zoom_dimming (ModestMsgEditWindow *window);
-static void update_send_dimming (ModestMsgEditWindow *window);
 
 /* Find toolbar */
 static void modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
@@ -153,13 +154,41 @@ static gboolean gtk_text_iter_forward_search_insensitive (const GtkTextIter *ite
                                                          const gchar *str,
                                                          GtkTextIter *match_start,
                                                          GtkTextIter *match_end);
-                                                         
+
+static void remove_tags (WPTextBuffer *buffer);
+
+static void on_account_removed (TnyAccountStore *account_store, 
+                               TnyAccount *account,
+                               gpointer user_data);
+
+static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
+static void set_zoom_do_nothing (ModestWindow *window, gdouble zoom);
+static gdouble get_zoom_do_nothing (ModestWindow *window);
+
+static void init_window (ModestMsgEditWindow *obj);
+
+gboolean scroll_drag_timeout (gpointer userdata);
+static void correct_scroll (ModestMsgEditWindow *w);
+static void correct_scroll_without_drag_check (ModestMsgEditWindow *w);
+static void text_buffer_end_user_action (GtkTextBuffer *buffer,
+                                        ModestMsgEditWindow *userdata);
+static void text_buffer_mark_set (GtkTextBuffer *buffer,
+                                 GtkTextIter *iter,
+                                 GtkTextMark *mark,
+                                 ModestMsgEditWindow *userdata);
+void vadj_changed (GtkAdjustment *adj, 
+                  ModestMsgEditWindow *window);
+
+
+
+
+
 static void DEBUG_BUFFER (WPTextBuffer *buffer)
 {
 #ifdef DEBUG
        GtkTextIter iter;
-
        g_message ("BEGIN BUFFER OF SIZE %d", gtk_text_buffer_get_char_count (GTK_TEXT_BUFFER (buffer)));
+
        gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &iter);
        while (!gtk_text_iter_is_end (&iter)) {
                GString *output = g_string_new ("");
@@ -199,11 +228,6 @@ static void DEBUG_BUFFER (WPTextBuffer *buffer)
 /*             GdkEventKey *event, */
 /*             gpointer user_data); */
 
-static void edit_menu_activated (GtkAction *action,
-                                gpointer userdata);
-static void view_menu_activated (GtkAction *action,
-                                gpointer userdata);
-
 /* list my signals */
 enum {
        /* MY_SIGNAL_1, */
@@ -214,6 +238,7 @@ enum {
 typedef struct _ModestMsgEditWindowPrivate ModestMsgEditWindowPrivate;
 struct _ModestMsgEditWindowPrivate {
        GtkWidget   *msg_body;
+       GtkWidget   *frame;
        GtkWidget   *header_box;
        
        ModestPairList *from_field_protos;
@@ -246,17 +271,22 @@ struct _ModestMsgEditWindowPrivate {
        gchar       *last_search;
 
        GtkWidget   *scroll;
-       GtkWidget   *scroll_area;
-       gint        last_vadj_upper;
+       guint        scroll_drag_timeout_id;
+       gdouble      last_upper;
 
        gint last_cid;
-       GList *attachments;
+       TnyList *attachments;
+       TnyList *images;
+       guint64 images_size;
+       gint images_count;
 
        TnyHeaderFlags priority_flags;
-
-       gdouble zoom_level;
        
+       gboolean    can_undo, can_redo;
        gulong      clipboard_change_handler_id;
+       gulong      default_clipboard_change_handler_id;
+       gulong      account_removed_handler_id;
+       gchar       *clipboard_text;
 
        TnyMsg      *draft_msg;
        TnyMsg      *outbox_msg;
@@ -295,7 +325,6 @@ modest_msg_edit_window_get_type (void)
                                                  "ModestMsgEditWindow",
                                                  &my_info, 0);
 
-               wp_text_buffer_library_init ();
        }
        return my_type;
 }
@@ -311,7 +340,37 @@ save_state (ModestWindow *self)
 static void
 restore_settings (ModestMsgEditWindow *self)
 {
-       modest_widget_memory_restore (modest_runtime_get_conf(),
+       ModestConf *conf = NULL;
+       GtkAction *action;
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
+
+       conf = modest_runtime_get_conf ();
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                                           "/MenuBar/ViewMenu/ShowToolbarMenu/ViewShowToolbarNormalScreenMenu");
+       modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action),
+                                     modest_conf_get_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, NULL));
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                                           "/MenuBar/ViewMenu/ShowToolbarMenu/ViewShowToolbarFullScreenMenu");
+       modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action),
+                                     modest_conf_get_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL));
+
+       /* set initial state of cc and bcc */
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewCcFieldMenu");
+       modest_utils_toggle_action_set_active_block_notify (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");
+       modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action),
+                                              modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL));
+
+       /* Dim at start clipboard actions */
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu");
+       gtk_action_set_sensitive (action, FALSE);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
+       gtk_action_set_sensitive (action, FALSE);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu");
+       gtk_action_set_sensitive (action, FALSE);
+
+       modest_widget_memory_restore (conf,
                                      G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY);
 }
 
@@ -327,10 +386,10 @@ modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass)
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_msg_edit_window_finalize;
 
-       modest_window_class->set_zoom_func = modest_msg_edit_window_set_zoom;
-       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->set_zoom_func = set_zoom_do_nothing;
+       modest_window_class->get_zoom_func = get_zoom_do_nothing;
+       modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented;
+       modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented;
        modest_window_class->show_toolbar_func = modest_msg_edit_window_show_toolbar;
        modest_window_class->save_state_func = save_state;
        modest_window_class->disconnect_signals_func = modest_msg_edit_window_disconnect_signals;
@@ -345,14 +404,17 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
 
        priv->msg_body      = NULL;
+       priv->frame         = NULL;
        priv->from_field    = NULL;
        priv->to_field      = NULL;
        priv->cc_field      = NULL;
        priv->bcc_field     = NULL;
        priv->subject_field = NULL;
-       priv->attachments   = NULL;
+       priv->attachments   = TNY_LIST (tny_simple_list_new ());
+       priv->images        = TNY_LIST (tny_simple_list_new ());
+       priv->images_size   = 0;
+       priv->images_count  = 0;
        priv->last_cid      = 0;
-       priv->zoom_level    = 1.0;
 
        priv->cc_caption    = NULL;
        priv->bcc_caption    = NULL;
@@ -366,10 +428,30 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        priv->draft_msg = NULL;
        priv->outbox_msg = NULL;
        priv->msg_uid = NULL;
+
+       priv->can_undo = FALSE;
+       priv->can_redo = FALSE;
        priv->clipboard_change_handler_id = 0;
+       priv->default_clipboard_change_handler_id = 0;
+       priv->account_removed_handler_id = 0;
+       priv->clipboard_text = NULL;
        priv->sent = FALSE;
 
-       priv->last_vadj_upper = 0;
+       priv->scroll_drag_timeout_id = 0;
+       priv->last_upper = 0.0;
+
+       modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
+                                           GTK_WINDOW(obj),"applications_email_editor");
+
+       if (!is_wp_text_buffer_started) {
+               is_wp_text_buffer_started = TRUE;
+               wp_text_buffer_library_init ();
+       }
+
+       init_window (obj);
+       
+       hildon_program_add_window (hildon_program_get_instance(),
+                                  HILDON_WINDOW(obj));
 }
 
 
@@ -410,40 +492,197 @@ get_transports (void)
        return transports;
 }
 
+static void window_focus (GtkWindow *window,
+                         GtkWidget *widget,
+                         gpointer userdata)
+{
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (userdata), MODEST_DIMMING_RULES_CLIPBOARD);
+}
+
+gboolean
+scroll_drag_timeout (gpointer userdata)
+{
+       ModestMsgEditWindow *win = (ModestMsgEditWindow *) userdata;
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(win);
+
+       correct_scroll_without_drag_check (win);
+
+       priv->scroll_drag_timeout_id = 0;
+
+       return FALSE;
+}
+
+static void
+correct_scroll_without_drag_check (ModestMsgEditWindow *w)
+{
+       ModestMsgEditWindowPrivate *priv;
+       GtkTextMark *insert;
+       GtkTextIter iter;
+       GdkRectangle rectangle;
+       GtkAdjustment *vadj;
+       gdouble new_value;
+       gint offset;
+       GdkWindow *window;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w);
+
+       if (!gtk_widget_is_focus (priv->msg_body))
+               return;
+
+       insert = gtk_text_buffer_get_insert (priv->text_buffer);
+       gtk_text_buffer_get_iter_at_mark (priv->text_buffer, &iter, insert);
+
+       gtk_text_view_get_iter_location (GTK_TEXT_VIEW (priv->msg_body), &iter, &rectangle);
+       vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll));
+       offset = priv->msg_body->allocation.y;
+
+       new_value = vadj->value;
+       
+       if ((offset + rectangle.y + rectangle.height) > 
+           ((gint) (vadj->value +vadj->page_size))) {
+               new_value = (offset + rectangle.y) + vadj->page_size * 0.75;
+               if (new_value > vadj->upper - vadj->page_size)
+                       new_value = vadj->upper - vadj->page_size;
+       } else if ((offset + rectangle.y) < ((gint) vadj->value)) {
+               new_value = (offset + rectangle.y - vadj->page_size * 0.75);
+               if (((gint) (new_value + vadj->page_size)) < (offset + rectangle.y + rectangle.height))
+                       new_value = offset + rectangle.y + rectangle.height - (gint) vadj->page_size;
+               if (new_value < 0.0)
+                       new_value = 0.0;
+               if (new_value > vadj->value)
+                       new_value = vadj->value;
+       }
+
+       if (vadj->value != new_value) {
+               g_signal_emit_by_name (GTK_TEXT_VIEW(priv->msg_body)->layout,
+                                      "invalidated");
+               vadj->value = new_value;
+               gtk_adjustment_value_changed (vadj);
+               /* invalidate body */
+               window = gtk_widget_get_parent_window (priv->msg_body);
+               if (window)
+                       gdk_window_invalidate_rect (window, NULL, TRUE);
+       }
+
+}
+
+static void
+correct_scroll (ModestMsgEditWindow *w)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w);
+       if (gtk_grab_get_current () == priv->msg_body) {
+               if (priv->scroll_drag_timeout_id == 0) {
+                       priv->scroll_drag_timeout_id = g_timeout_add (500, (GSourceFunc) scroll_drag_timeout,
+                                                                     (gpointer) w);
+               }
+               return;
+       }
+
+       correct_scroll_without_drag_check (w);
+}
+
+static void
+text_buffer_end_user_action (GtkTextBuffer *buffer,
+                            ModestMsgEditWindow *userdata)
+{
+
+       correct_scroll (userdata);
+}
+
+static void
+text_buffer_mark_set (GtkTextBuffer *buffer,
+                     GtkTextIter *iter,
+                     GtkTextMark *mark,
+                     ModestMsgEditWindow *userdata)
+{
+       gtk_text_buffer_begin_user_action (buffer);
+       gtk_text_buffer_end_user_action (buffer);
+}
+
 void vadj_changed (GtkAdjustment *adj,
                   ModestMsgEditWindow *window)
 {
-       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       ModestMsgEditWindowPrivate *priv;
 
-       GdkRectangle rectangle, cursor_rectangle;
-       GtkTextIter position;
-       gboolean visible;
-       gint cursor_bottom;
-
-       /* We detect if cursor is visible using the full height, not only the center. This
-          seems to work */
-       gtk_text_view_get_visible_rect (GTK_TEXT_VIEW (priv->msg_body), &rectangle);
-       gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer),
-                                         &position,
-                                         gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer)));
-       gtk_text_view_get_iter_location (GTK_TEXT_VIEW (priv->msg_body), &position, &cursor_rectangle);
-
-       cursor_bottom = (cursor_rectangle.y + cursor_rectangle.height);
-       visible = (cursor_rectangle.y >= rectangle.y) && (cursor_bottom < (rectangle.y + rectangle.height));
-
-       if (gtk_widget_is_focus (priv->msg_body) && 
-           !visible) {
-               if (priv->last_vadj_upper != adj->upper) {
-                       GtkTextMark *insert;
-                       
-                       insert = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer));
-                       gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (priv->msg_body), 
-                                                     insert, 0.1, FALSE, 0.0, 0.0);
-               }
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       if (priv->last_upper != adj->upper) {
+               priv->last_upper = adj->upper;
+               correct_scroll (window);
        }
-       priv->last_vadj_upper = adj->upper;
 }
 
+static void
+connect_signals (ModestMsgEditWindow *obj)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
+
+       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), "can-undo",
+                         G_CALLBACK (text_buffer_can_undo), obj);
+       g_signal_connect (G_OBJECT (priv->text_buffer), "can-redo",
+                         G_CALLBACK (text_buffer_can_redo), obj);
+       g_signal_connect (G_OBJECT (priv->text_buffer), "changed",
+                          G_CALLBACK (body_changed), obj);
+       g_signal_connect (G_OBJECT (priv->text_buffer), "insert-text", 
+                         G_CALLBACK (text_buffer_insert_text), obj);
+       g_signal_connect (G_OBJECT (obj), "window-state-event",
+                         G_CALLBACK (modest_msg_edit_window_window_state_event),
+                         NULL);
+       g_signal_connect (G_OBJECT (priv->text_buffer), "end-user-action",
+                         G_CALLBACK (text_buffer_end_user_action), obj);
+       g_signal_connect (G_OBJECT (priv->text_buffer), "mark-set",
+                         G_CALLBACK (text_buffer_mark_set), obj);
+       g_signal_connect_after (G_OBJECT (priv->text_buffer), "apply-tag",
+                               G_CALLBACK (text_buffer_apply_tag), obj);
+       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 (obj), "set-focus", G_CALLBACK (window_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);
+       g_signal_connect (G_OBJECT (priv->subject_field), "changed", G_CALLBACK (subject_field_changed), obj);
+       g_signal_connect_after (G_OBJECT (priv->subject_field), "move-cursor", G_CALLBACK (subject_field_move_cursor), obj);
+       g_signal_connect (G_OBJECT (priv->subject_field), "insert-text", G_CALLBACK (subject_field_insert_text), 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);
+
+       g_signal_connect (G_OBJECT (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll))),
+                         "changed",
+                         G_CALLBACK (vadj_changed),
+                         obj);
+
+       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->default_clipboard_change_handler_id = 
+               g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD)), "owner-change",
+                                 G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj);
+
+}
 
 static void
 init_window (ModestMsgEditWindow *obj)
@@ -451,9 +690,12 @@ init_window (ModestMsgEditWindow *obj)
        GtkWidget *from_caption, *to_caption, *subject_caption;
        GtkWidget *main_vbox;
        ModestMsgEditWindowPrivate *priv;
+       GtkActionGroup *action_group;
+       ModestWindowPrivate *parent_priv;
+       GdkPixbuf *window_icon = NULL;
+       GError *error = NULL;
 
        GtkSizeGroup *size_group;
-       GtkWidget *frame;
        GtkWidget *subject_box;
        GtkWidget *attachment_icon;
        GtkWidget *window_box;
@@ -461,15 +703,62 @@ init_window (ModestMsgEditWindow *obj)
        GdkAtom deserialize_type;
 #endif
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (obj);
+
+       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,
+                                     modest_msg_edit_action_entries,
+                                     G_N_ELEMENTS (modest_msg_edit_action_entries),
+                                     obj);
+       gtk_action_group_add_toggle_actions (action_group,
+                                            modest_msg_edit_toggle_action_entries,
+                                            G_N_ELEMENTS (modest_msg_edit_toggle_action_entries),
+                                            obj);
+       gtk_action_group_add_radio_actions (action_group,
+                                           modest_msg_edit_alignment_radio_action_entries,
+                                           G_N_ELEMENTS (modest_msg_edit_alignment_radio_action_entries),
+                                           GTK_JUSTIFY_LEFT,
+                                           G_CALLBACK (modest_ui_actions_on_change_justify),
+                                           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);
+       if (error != NULL) {
+               g_warning ("Could not merge modest-msg-edit-window-ui.xml: %s", error->message);
+               g_clear_error (&error);
+       }
+
+       /* Add accelerators */
+       gtk_window_add_accel_group (GTK_WINDOW (obj), 
+                                   gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
+
+       parent_priv->menubar = NULL;
 
        size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
        /* 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->from_field    = modest_combo_box_new (NULL, g_str_equal);
 
        priv->to_field      = modest_recpt_editor_new ();
        priv->cc_field      = modest_recpt_editor_new ();
@@ -538,46 +827,6 @@ init_window (ModestMsgEditWindow *obj)
 
 /*     g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */
 
-       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), "can-undo",
-                         G_CALLBACK (text_buffer_can_undo), obj);
-       g_signal_connect (G_OBJECT (priv->text_buffer), "can-redo",
-                         G_CALLBACK (text_buffer_can_redo), obj);
-       g_signal_connect (G_OBJECT (priv->text_buffer), "changed",
-                          G_CALLBACK (body_changed), obj);
-       g_signal_connect (G_OBJECT (obj), "window-state-event",
-                         G_CALLBACK (modest_msg_edit_window_window_state_event),
-                         NULL);
-       g_signal_connect_after (G_OBJECT (priv->text_buffer), "apply-tag",
-                               G_CALLBACK (text_buffer_apply_tag), obj);
-       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->subject_field), "insert-text", G_CALLBACK (subject_field_insert_text), 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_NEVER, GTK_POLICY_AUTOMATIC);
        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scroll), GTK_SHADOW_NONE);
@@ -586,26 +835,26 @@ init_window (ModestMsgEditWindow *obj)
        main_vbox = gtk_vbox_new  (FALSE, DEFAULT_MAIN_VBOX_SPACING);
 
        gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0);
-       frame = gtk_frame_new (NULL);
-       gtk_box_pack_start (GTK_BOX(main_vbox), frame, TRUE, TRUE, 0);
+       priv->frame = gtk_frame_new (NULL);
+       gtk_box_pack_start (GTK_BOX(main_vbox), priv->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)));
-       g_signal_connect (G_OBJECT (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll))),
-                         "changed",
-                         G_CALLBACK (vadj_changed),
-                         obj);
        gtk_widget_show_all (GTK_WIDGET(priv->scroll));
        
        window_box = gtk_vbox_new (FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (window_box), priv->scroll, TRUE, TRUE, 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);
-       
-       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);
 
+       gtk_box_pack_start (GTK_BOX (window_box), priv->scroll, TRUE, TRUE, 0);
+
+       gtk_container_add (GTK_CONTAINER (priv->frame), priv->msg_body);
+
+       /* Set window icon */
+       window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG); 
+       if (window_icon) {
+               gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
+               g_object_unref (window_icon);
+       }       
 }
        
 static void
@@ -613,20 +862,37 @@ modest_msg_edit_window_disconnect_signals (ModestWindow *window)
 {
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
-       if (g_signal_handler_is_connected (gtk_clipboard_get (GDK_SELECTION_PRIMARY), 
+       if (gtk_clipboard_get (GDK_SELECTION_PRIMARY) &&
+           g_signal_handler_is_connected (gtk_clipboard_get (GDK_SELECTION_PRIMARY), 
                                           priv->clipboard_change_handler_id))
                g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_PRIMARY), 
                                             priv->clipboard_change_handler_id);
+       if (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD) &&
+           g_signal_handler_is_connected (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), 
+                                          priv->default_clipboard_change_handler_id))
+               g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), 
+                                            priv->default_clipboard_change_handler_id);
+
+       if (priv->account_removed_handler_id && 
+           g_signal_handler_is_connected (modest_runtime_get_account_store (), 
+                                          priv->account_removed_handler_id))
+               g_signal_handler_disconnect(modest_runtime_get_account_store (), 
+                                          priv->account_removed_handler_id);
 }
 
 static void
 modest_msg_edit_window_finalize (GObject *obj)
 {
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj);
-
+       
        /* Sanity check: shouldn't be needed, the window mgr should
           call this function before */
        modest_msg_edit_window_disconnect_signals (MODEST_WINDOW (obj));
+
+       if (priv->clipboard_text != NULL) {
+               g_free (priv->clipboard_text);
+               priv->clipboard_text = NULL;
+       }
        
        if (priv->draft_msg != NULL) {
                TnyHeader *header = tny_msg_get_header (priv->draft_msg);
@@ -646,10 +912,16 @@ modest_msg_edit_window_finalize (GObject *obj)
                g_object_unref (priv->outbox_msg);
                priv->outbox_msg = NULL;
        }
-       if (priv->msg_uid != NULL) {
-               g_free (priv->msg_uid);
-               priv->msg_uid = NULL;
+       if (priv->scroll_drag_timeout_id > 0) {
+               g_source_remove (priv->scroll_drag_timeout_id);
+               priv->scroll_drag_timeout_id = 0;
        }
+       g_free (priv->msg_uid);
+       g_free (priv->last_search);
+       g_slist_free (priv->font_items_group);
+       g_slist_free (priv->size_items_group);
+       g_object_unref (priv->attachments);
+       g_object_unref (priv->images);
 
        /* This had to stay alive for as long as the combobox that used it: */
        modest_pair_list_free (priv->from_field_protos);
@@ -657,47 +929,29 @@ modest_msg_edit_window_finalize (GObject *obj)
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
-static GtkWidget *
-menubar_to_menu (GtkUIManager *ui_manager)
-{
-       GtkWidget *main_menu;
-       GtkWidget *menubar;
-       GList *iter;
-
-       /* Create new main menu */
-       main_menu = gtk_menu_new();
-
-       /* Get the menubar from the UI manager */
-       menubar = gtk_ui_manager_get_widget (ui_manager, "/MenuBar");
-
-       iter = gtk_container_get_children (GTK_CONTAINER (menubar));
-       while (iter) {
-               GtkWidget *menu;
-
-               menu = GTK_WIDGET (iter->data);
-               gtk_widget_reparent(menu, main_menu);
-
-               iter = g_list_next (iter);
-       }
-       return main_menu;
-}
-
 static GdkPixbuf *
-pixbuf_from_stream (TnyStream *stream, const gchar *mime_type)
+pixbuf_from_stream (TnyStream *stream, const gchar *mime_type, guint64 *stream_size)
 {
        GdkPixbufLoader *loader;
        GdkPixbuf *pixbuf;
+       guint64 size;
+       
+       size = 0;
 
        loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
 
-       if (loader == NULL)
+       if (loader == NULL) {
+               if (stream_size)
+                       *stream_size = 0;
                return NULL;
+       }
 
        tny_stream_reset (TNY_STREAM (stream));
        while (!tny_stream_is_eos (TNY_STREAM (stream))) {
                unsigned char read_buffer[128];
                gint readed;
                readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128);
+               size += readed;
                if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, NULL))
                        break;
        }
@@ -717,42 +971,111 @@ pixbuf_from_stream (TnyStream *stream, const gchar *mime_type)
                pixbuf = new_pixbuf;
        }
 
+       if (stream_size)
+               *stream_size = size;
+
        return pixbuf;
 }
 
 static void
-replace_with_attachments (ModestMsgEditWindow *self, GList *attachments)
+replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
 {
        ModestMsgEditWindowPrivate *priv;
-       GList *node;
+       TnyIterator *iter;
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 
-       for (node = attachments; node != NULL; node = g_list_next (node)) {
-               TnyMimePart *part = (TnyMimePart *) node->data;
+       for (iter = tny_list_create_iterator (attachments);
+            !tny_iterator_is_done (iter);
+            tny_iterator_next (iter)) {
+               TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (iter);
                const gchar *cid = tny_mime_part_get_content_id (part);
                const gchar *mime_type = tny_mime_part_get_content_type (part);
                if ((cid != NULL)&&(mime_type != NULL)) {
+                       guint64 stream_size;
                        TnyStream *stream = tny_mime_part_get_stream (part);
-                       GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type);
+                       GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size);
+
+
                        g_object_unref (stream);
 
                        if (pixbuf != NULL) {
-/*                             wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf); */
+                               priv->images_count ++;
+                               priv->images_size += stream_size;
+                               wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf);
                                g_object_unref (pixbuf);
                        }
                }
+               g_object_unref (part);
        }
+       g_object_unref (iter);
 }
 
 static void
-update_last_cid (ModestMsgEditWindow *self, GList *attachments)
+get_related_images (ModestMsgEditWindow *self, TnyMsg *msg)
 {
-       GList *node;
+       TnyMimePart *parent = NULL;
+       const gchar *content_type = NULL;
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 
-       for (node = attachments; node != NULL; node = g_list_next (node)) {
-               TnyMimePart *part = (TnyMimePart *) node->data;
+       content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
+       
+       if (content_type && !g_strcasecmp (content_type, "multipart/related")) {
+               parent = g_object_ref (msg);
+       } else if (content_type && !g_strcasecmp (content_type, "multipart/mixed")) {
+               TnyList *parts = TNY_LIST (tny_simple_list_new ());
+               TnyIterator *iter;
+
+               tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+               iter = tny_list_create_iterator (parts);
+               while (!tny_iterator_is_done (iter)) {
+                       TnyMimePart *part;
+                       part = TNY_MIME_PART (tny_iterator_get_current (iter));
+                       content_type = tny_mime_part_get_content_type (part);
+                       if (content_type && !g_strcasecmp (content_type, "multipart/related")) {
+                               parent = part;
+                               break;
+                       } else {
+                               g_object_unref (part);
+                       }
+                       tny_iterator_next (iter);
+               }
+               g_object_unref (iter);
+               g_object_unref (parts);
+       }
+
+       if (parent != NULL) {
+               TnyList *parts = TNY_LIST (tny_simple_list_new ());
+               TnyIterator *iter;
+
+               tny_mime_part_get_parts (TNY_MIME_PART (parent), parts);
+               iter = tny_list_create_iterator (parts);
+               while (!tny_iterator_is_done (iter)) {
+                       TnyMimePart *part;
+                       part = TNY_MIME_PART (tny_iterator_get_current (iter));
+                       content_type = tny_mime_part_get_content_type (part);
+                       if (content_type && g_str_has_prefix (content_type, "image/")) {
+                               tny_list_prepend (priv->images, (GObject *) part);
+                       } 
+                       g_object_unref (part);
+                       tny_iterator_next (iter);
+               }
+               g_object_unref (iter);
+               g_object_unref (parts);
+               g_object_unref (parent);
+       }
+}
+
+static void
+update_last_cid (ModestMsgEditWindow *self, TnyList *attachments)
+{
+       TnyIterator *iter;
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+       for (iter = tny_list_create_iterator (attachments) ; 
+            !tny_iterator_is_done (iter);
+            tny_iterator_next (iter)) {
+               TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (iter);
                const gchar *cid = tny_mime_part_get_content_id (part);
                if (cid != NULL) {
                        char *invalid = NULL;
@@ -761,8 +1084,9 @@ update_last_cid (ModestMsgEditWindow *self, GList *attachments)
                                priv->last_cid = int_cid;
                        }
                }
-               
+               g_object_unref (part);
        }
+       g_object_unref (iter);
 }
 
 static void
@@ -787,7 +1111,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        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;
+       priority_flags = tny_header_get_priority (header);
 
        if (to)
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field),  to);
@@ -829,6 +1153,20 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        wp_text_buffer_load_document_end (WP_TEXT_BUFFER (priv->text_buffer));
        g_free (body);
 
+       /* 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 (tny_list_get_length (priv->attachments) == 0) {
+               gtk_widget_hide (priv->attachments_caption);
+       } else {
+               gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
+               gtk_widget_show_all (priv->attachments_caption);
+       }
+       get_related_images (self, msg);
+       update_last_cid (self, priv->attachments);
+       update_last_cid (self, priv->images);
+       replace_with_images (self, priv->images);
+
        if (preserve_is_rich && !is_html) {
                wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
        /* Get the default format required from configuration */
@@ -847,26 +1185,15 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
           value that comes from msg <- not sure, should it be
           allowed? */
        
-       /* 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);
-               replace_with_attachments (self, priv->attachments);
-       }
-       update_last_cid (self, priv->attachments);
-
        DEBUG_BUFFER (WP_TEXT_BUFFER (priv->text_buffer));
 
        gtk_text_buffer_get_start_iter (priv->text_buffer, &iter);
        gtk_text_buffer_place_cursor (priv->text_buffer, &iter);
 
-       reset_modified (self);
+       modest_msg_edit_window_reset_modified (self);
 
-       update_dimmed (self);
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
        text_buffer_can_undo (priv->text_buffer, FALSE, self);
        text_buffer_can_redo (priv->text_buffer, FALSE, self);
 
@@ -880,6 +1207,9 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        if (msg_folder) {               
                if (modest_tny_folder_is_local_folder (msg_folder)) {
                        TnyFolderType type = modest_tny_folder_get_local_or_mmc_folder_type (msg_folder);
+                       if (type == TNY_FOLDER_TYPE_INVALID)
+                               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+                       
                        if (type == TNY_FOLDER_TYPE_DRAFTS) 
                                priv->draft_msg = g_object_ref(msg);
                        if (type == TNY_FOLDER_TYPE_OUTBOX)
@@ -951,10 +1281,6 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
        hildon_window_add_toolbar (HILDON_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar));
 
-       /* should we hide the toolbar? */
-       if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_TOOLBAR, NULL))
-               gtk_widget_hide (parent_priv->toolbar);
-
        /* 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));
@@ -968,7 +1294,10 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        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);
+       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");
@@ -1068,7 +1397,15 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
        gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
 
+       /* Explicitelly show all the toolbar (a normal gtk_widget_show
+          will not show the tool items added to the placeholders) */
+       gtk_widget_show_all (parent_priv->toolbar);
 
+       /* Set the no show all *after* showing all items. We do not
+          want the toolbar to be shown with a show all because it
+          could go agains the gconf setting regarding showing or not
+          the toolbar of the editor window */
+       gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE);
 }
 
 
@@ -1079,145 +1416,97 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre
        GObject *obj;
        ModestWindowPrivate *parent_priv;
        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;
+       ModestDimmingRulesGroup *menu_rules_group = NULL;
+       ModestDimmingRulesGroup *toolbar_rules_group = NULL;
+       ModestDimmingRulesGroup *clipboard_rules_group = NULL;
+       ModestWindowMgr *mgr = 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);
-
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj);
-       parent_priv = MODEST_WINDOW_GET_PRIVATE (obj);
-
-       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,
-                                     modest_msg_edit_action_entries,
-                                     G_N_ELEMENTS (modest_msg_edit_action_entries),
-                                     obj);
-       gtk_action_group_add_toggle_actions (action_group,
-                                            modest_msg_edit_toggle_action_entries,
-                                            G_N_ELEMENTS (modest_msg_edit_toggle_action_entries),
-                                            obj);
-       gtk_action_group_add_radio_actions (action_group,
-                                           modest_msg_edit_alignment_radio_action_entries,
-                                           G_N_ELEMENTS (modest_msg_edit_alignment_radio_action_entries),
-                                           GTK_JUSTIFY_LEFT,
-                                           G_CALLBACK (modest_ui_actions_on_change_justify),
-                                           obj);
-       gtk_action_group_add_radio_actions (action_group,
-                                           modest_msg_edit_zoom_action_entries,
-                                           G_N_ELEMENTS (modest_msg_edit_zoom_action_entries),
-                                           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);
-       if (error != NULL) {
-               g_warning ("Could not merge modest-msg-edit-window-ui.xml: %s", error->message);
-               g_clear_error (&error);
-       }
-
-       /* Add accelerators */
-       gtk_window_add_accel_group (GTK_WINDOW (obj), 
-                                   gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
+       g_return_val_if_fail (msg, NULL);
+       g_return_val_if_fail (account_name, NULL);
+
+       mgr = modest_runtime_get_window_mgr ();
+       
+       obj = G_OBJECT (modest_window_mgr_get_msg_edit_window (mgr));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (obj);
 
-       /* Menubar */
-       parent_priv->menubar = menubar_to_menu (parent_priv->ui_manager);
+       /* Menubar. Update the state of some toggles */
+       parent_priv->menubar = modest_maemo_utils_get_manager_menubar_as_menu (parent_priv->ui_manager, "/MenuBar");
        hildon_window_set_menu (HILDON_WINDOW (obj), GTK_MENU (parent_priv->menubar));
+       priv->from_field_protos = get_transports ();
+       modest_combo_box_set_pair_list (MODEST_COMBO_BOX (priv->from_field), priv->from_field_protos);
+       modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj));
+       hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar));
 
        /* Init window */
-       init_window (MODEST_MSG_EDIT_WINDOW(obj));
+       connect_signals (MODEST_MSG_EDIT_WINDOW(obj));
 
        restore_settings (MODEST_MSG_EDIT_WINDOW(obj));
                
        modest_window_set_active_account (MODEST_WINDOW(obj), account_name);
 
-       modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj));
-       hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar));
-
-       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);
 
+       parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new ();
+       menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE);
+       toolbar_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_TOOLBAR, TRUE);
+       clipboard_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_CLIPBOARD, FALSE);
+       /* Add common dimming rules */
+       modest_dimming_rules_group_add_rules (menu_rules_group, 
+                                             modest_msg_edit_window_menu_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_edit_window_menu_dimming_entries),
+                                             MODEST_WINDOW (obj));
+       modest_dimming_rules_group_add_rules (toolbar_rules_group, 
+                                             modest_msg_edit_window_toolbar_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_edit_window_toolbar_dimming_entries),
+                                             MODEST_WINDOW (obj));
+       modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_color_button,
+                                                   G_CALLBACK (modest_ui_dimming_rules_on_set_style),
+                                                   MODEST_WINDOW (obj));
+       modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_size_toolitem,
+                                                   G_CALLBACK (modest_ui_dimming_rules_on_set_style),
+                                                   MODEST_WINDOW (obj));
+       modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_face_toolitem,
+                                                   G_CALLBACK (modest_ui_dimming_rules_on_set_style),
+                                                   MODEST_WINDOW (obj));
+       modest_dimming_rules_group_add_rules (clipboard_rules_group, 
+                                             modest_msg_edit_window_clipboard_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_edit_window_clipboard_dimming_entries),
+                                             MODEST_WINDOW (obj));
+       /* Insert dimming rules group for this window */
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group);
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group);
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group);
+        /* Checks the dimming rules */
+       g_object_unref (menu_rules_group);
+       g_object_unref (toolbar_rules_group);
+       g_object_unref (clipboard_rules_group);
+       gtk_widget_show_all (GTK_WIDGET (obj));
+       modest_msg_edit_window_clipboard_owner_change (NULL, NULL, MODEST_MSG_EDIT_WINDOW (obj));
+
        set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg, preserve_is_rich);
 
        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);
-       if (window_icon) {
-               gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
-               g_object_unref (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");
-       modest_maemo_toggle_action_set_active_block_notify (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");
-       modest_maemo_toggle_action_set_active_block_notify (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));
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (obj));
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), MODEST_DIMMING_RULES_CLIPBOARD);
        priv->update_caption_visibility = TRUE;
 
-       reset_modified (MODEST_MSG_EDIT_WINDOW (obj));
+       modest_msg_edit_window_reset_modified (MODEST_MSG_EDIT_WINDOW (obj));
+
+       /* Track account-removed signal, this window should be closed
+          in the case we're creating a mail associated to the account
+          that is deleted */
+       priv->account_removed_handler_id = 
+               g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
+                                 "account_removed",
+                                 G_CALLBACK(on_account_removed),
+                                 obj);
        
        return (ModestWindow*) obj;
 }
@@ -1245,6 +1534,8 @@ get_formatted_data (ModestMsgEditWindow *edit_window)
 
        wp_text_buffer_save_document (WP_TEXT_BUFFER(priv->text_buffer), get_formatted_data_cb, &string_buffer);
 
+       gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+
        return g_string_free (string_buffer, FALSE);
                                                                        
 }
@@ -1255,6 +1546,7 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        MsgData *data;
        const gchar *account_name;
        ModestMsgEditWindowPrivate *priv;
+       TnyIterator *att_iter;
        
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window), NULL);
 
@@ -1292,18 +1584,54 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
                data->html_body = NULL;
 
        /* deep-copy the data */
-       GList *cursor = priv->attachments;
+       att_iter = tny_list_create_iterator (priv->attachments);
        data->attachments = NULL;
-       while (cursor) {
-               if (!(TNY_IS_MIME_PART(cursor->data))) {
+       while (!tny_iterator_is_done (att_iter)) {
+               TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (att_iter);
+               if (!(TNY_IS_MIME_PART(part))) {
                        g_warning ("strange data in attachment list");
-                       cursor = g_list_next (cursor);
+                       g_object_unref (part);
+                       tny_iterator_next (att_iter);
                        continue;
                }
                data->attachments = g_list_append (data->attachments,
-                                                  g_object_ref (cursor->data));
-               cursor = g_list_next (cursor);
+                                                  part);
+               tny_iterator_next (att_iter);
+       }
+       g_object_unref (att_iter);
+
+       GtkTextTagTable *tag_table = gtk_text_buffer_get_tag_table (GTK_TEXT_BUFFER (priv->text_buffer));
+       att_iter = tny_list_create_iterator (priv->images);
+       data->images = NULL;
+       while (!tny_iterator_is_done (att_iter)) {
+               TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (att_iter);
+               const gchar *cid;
+               if (!(TNY_IS_MIME_PART(part))) {
+                       g_warning ("strange data in attachment list");
+                       g_object_unref (part);
+                       tny_iterator_next (att_iter);
+                       continue;
+               }
+               cid = tny_mime_part_get_content_id (part);
+               if (cid) {                      
+                       gchar *image_tag_id;
+                       GtkTextTag *image_tag;
+                       GtkTextIter iter;
+                       image_tag_id = g_strdup_printf ("image-tag-%s", cid);
+                       image_tag = gtk_text_tag_table_lookup (tag_table, image_tag_id);
+                       g_free (image_tag_id);
+                       
+                       gtk_text_buffer_get_start_iter (priv->text_buffer, &iter);
+                       if (image_tag && 
+                           ((gtk_text_iter_has_tag (&iter, image_tag))||
+                            (gtk_text_iter_forward_to_tag_toggle (&iter, image_tag))))
+                               data->images = g_list_append (data->images,
+                                                             g_object_ref (part));
+               }
+               g_object_unref (part);
+               tny_iterator_next (att_iter);
        }
+       g_object_unref (att_iter);
        
        data->priority_flags = priv->priority_flags;
 
@@ -1331,6 +1659,7 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
        g_free (data->to);
        g_free (data->cc);
        g_free (data->bcc);
+       g_free (data->from);
        g_free (data->subject);
        g_free (data->plain_body);
        g_free (data->html_body);
@@ -1343,10 +1672,29 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
        
        g_list_foreach (data->attachments, (GFunc)unref_gobject,  NULL);
        g_list_free (data->attachments);
+       g_list_foreach (data->images, (GFunc)unref_gobject,  NULL);
+       g_list_free (data->images);
        
        g_slice_free (MsgData, data);
 }
 
+void                    
+modest_msg_edit_window_get_parts_size (ModestMsgEditWindow *window,
+                                      gint *parts_count,
+                                      guint64 *parts_size)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       modest_attachments_view_get_sizes (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), parts_count, parts_size);
+
+       /* TODO: add images */
+       *parts_size += priv->images_size;
+       *parts_count += priv->images_count;
+
+}
+
 ModestMsgEditFormat
 modest_msg_edit_window_get_format (ModestMsgEditWindow *self)
 {
@@ -1442,27 +1790,34 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self,
 
        wp_text_buffer_freeze (WP_TEXT_BUFFER (priv->text_buffer));
        if (buffer_format->cs.bold) {
-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BOLD, (gpointer) (buffer_format->bold&0x1));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BOLD,
+                                             GINT_TO_POINTER (buffer_format->bold&0x1));
        }
        if (buffer_format->cs.italic) {
-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_ITALIC, (gpointer) (buffer_format->italic&0x1));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_ITALIC,
+                                             GINT_TO_POINTER (buffer_format->italic&0x1));
        }
        if (buffer_format->cs.color) {
-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) (&(buffer_format->color)));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR,
+                                             GINT_TO_POINTER (&(buffer_format->color)));
        }
        if (buffer_format->cs.font_size) {
-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE, (gpointer) (buffer_format->font_size));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE,
+                                             GINT_TO_POINTER (buffer_format->font_size));
        }
        if (buffer_format->cs.justification) {
                switch (buffer_format->justification) {
                case GTK_JUSTIFY_LEFT:
-                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_LEFT, (gpointer) TRUE);
+                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_LEFT,
+                                                     GINT_TO_POINTER(TRUE));
                        break;
                case GTK_JUSTIFY_CENTER:
-                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_CENTER, (gpointer) TRUE);
+                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_CENTER,
+                                                     GINT_TO_POINTER(TRUE));
                        break;
                case GTK_JUSTIFY_RIGHT:
-                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_RIGHT, (gpointer) TRUE);
+                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_RIGHT,
+                                                     GINT_TO_POINTER(TRUE));
                        break;
                default:
                        break;
@@ -1470,14 +1825,18 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self,
                        
        }
        if (buffer_format->cs.font) {
-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, (gpointer) (buffer_format->font));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT,
+                                             GINT_TO_POINTER (buffer_format->font));
        }
        wp_text_buffer_thaw (WP_TEXT_BUFFER (priv->text_buffer));
        if (buffer_format->cs.bullet) {
-         wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BULLET, (gpointer) ((buffer_format->bullet)?1:0));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BULLET,
+                                             GINT_TO_POINTER ((buffer_format->bullet)?1:0));
        }
 /*     wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), buffer_format); */
-
+       
+       text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), self);
+       
        g_free (current_format);
 
 }
@@ -1498,24 +1857,43 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
        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)))
-                       modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE);
+                       modest_utils_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)))
-                       modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE);
+                       modest_utils_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");
-       modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bold);
+       modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bold);
 
        action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsItalics");
-       modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->italic);
+       modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->italic);
 
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu");
-       modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bullet);
+/*     action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu"); */
+/*     modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bullet); */
 
+       action = NULL;
+       switch (buffer_format->justification)
+       {
+       case GTK_JUSTIFY_LEFT:
+               action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentLeftMenu");
+               break;
+       case GTK_JUSTIFY_CENTER:
+               action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentCenterMenu");
+               break;
+       case GTK_JUSTIFY_RIGHT:
+               action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentRightMenu");
+               break;
+       default:
+               break;
+       }
+       
+       if (action != NULL)
+               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
+       
        g_signal_handlers_block_by_func (G_OBJECT (priv->font_color_button), 
                                         G_CALLBACK (modest_msg_edit_window_color_button_change),
                                         window);
@@ -1531,7 +1909,7 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
                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);
+               markup = g_strconcat ("<span font_family='Sans'>", 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),
@@ -1566,7 +1944,7 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
 
 }
 
-
+#ifdef MODEST_HILDON_VERSION_0
 void
 modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
 {
@@ -1575,43 +1953,26 @@ modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
        ModestMsgEditWindowPrivate *priv;
        GtkWidget *dialog = NULL;
        gint response;
-       const GdkColor *new_color = NULL;
-       
+       GdkColor *new_color = NULL;
+
        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));
-#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: {
-#ifdef MODEST_HILDON_VERSION_0
+       if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) {
                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;
+               if (new_color != NULL) {
+                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR,
+                                                     (gpointer) new_color);
+               }
        }
        gtk_widget_destroy (dialog);
-
-       if (new_color != NULL)
-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) new_color);
-
 }
 
+
 void
 modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
 {
@@ -1625,36 +1986,70 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        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);
-#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: {
-#ifdef MODEST_HILDON_VERSION_0
+       if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) {
                new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
-#else
+               if (new_color != NULL)
+                       wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), new_color);
+       }
+       gtk_widget_destroy (dialog);
+
+}
+
+#else 
+void
+modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
+{
+       
+       WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
+       ModestMsgEditWindowPrivate *priv;
+       GtkWidget *dialog = NULL;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE);
+               
+       dialog = hildon_color_chooser_new ();
+       hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog), &(buffer_format->color));
+       g_free (buffer_format);
+
+       if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
                GdkColor col;
                hildon_color_chooser_get_color (HILDON_COLOR_CHOOSER(dialog), &col);
-               new_color = &col;
-#endif /*MODEST_HILDON_VERSION_0*/
-          }
-               break;
-       default:
-               break;
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR,
+                                             (gpointer) &col);
        }
        gtk_widget_destroy (dialog);
+}
+
 
-       if (new_color != NULL)
-               wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), new_color);
+void
+modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
+{
+       
+       ModestMsgEditWindowPrivate *priv;
+       GtkWidget *dialog = NULL;
+       GdkColor *old_color = NULL;
+       
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       old_color = (GdkColor*)wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer));
+       
+       dialog = hildon_color_chooser_new ();
+       hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog),(GdkColor*)old_color);
 
+       if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { 
+               GdkColor col;
+               hildon_color_chooser_get_color (HILDON_COLOR_CHOOSER(dialog), &col);
+               wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), &col);
+       }
+       gtk_widget_destroy (dialog);
 }
 
+#endif /*!MODEST_HILDON_VERSION_0*/
+
+
+
 static TnyStream* create_stream_for_uri (const gchar* uri)
 {
        if (!uri)
@@ -1712,12 +2107,13 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
                result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
                if (result == GNOME_VFS_OK) {
                        GdkPixbuf *pixbuf;
-                       GnomeVFSFileInfo info;
+                       GnomeVFSFileInfo *info;
                        gchar *filename, *basename, *escaped_filename;
                        TnyMimePart *mime_part;
                        gchar *content_id;
                        const gchar *mime_type = NULL;
                        GnomeVFSURI *vfs_uri;
+                       guint64 stream_size;
 
                        vfs_uri = gnome_vfs_uri_new (uri);
 
@@ -1725,17 +2121,18 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
                        filename = gnome_vfs_unescape_string_for_display (escaped_filename);
                        g_free (escaped_filename);
                        gnome_vfs_uri_unref (vfs_uri);
+                       info = gnome_vfs_file_info_new ();
 
-                       if (gnome_vfs_get_file_info (uri, &info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE
+                       if (gnome_vfs_get_file_info (uri, info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE
                                                     | GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE) 
                            == GNOME_VFS_OK)
-                               mime_type = gnome_vfs_file_info_get_mime_type (&info);
+                               mime_type = gnome_vfs_file_info_get_mime_type (info);
 
                        mime_part = tny_platform_factory_new_mime_part
                                (modest_runtime_get_platform_factory ());
                                
                        TnyStream *stream = create_stream_for_uri (uri);
-                       tny_mime_part_construct_from_stream (mime_part, stream, mime_type);
+                       tny_mime_part_construct (mime_part, stream, mime_type, "base64");
                        
                        content_id = g_strdup_printf ("%d", priv->last_cid);
                        tny_mime_part_set_content_id (mime_part, content_id);
@@ -1746,21 +2143,21 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
                        tny_mime_part_set_filename (mime_part, basename);
                        g_free (basename);
 
-                       pixbuf = pixbuf_from_stream (stream, mime_type);
+                       pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size);
                        
                        if (pixbuf != NULL) {
+                               priv->images_size += stream_size;
+                               priv->images_count ++;
                                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 (mime_part)), pixbuf);
                        } 
 
-                       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);
+                       tny_list_prepend (priv->images, (GObject *) mime_part);
                        gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
                        g_free (filename);
+                       g_object_unref (mime_part);
+                       gnome_vfs_file_info_unref (info);
 
                }
        }
@@ -1770,16 +2167,12 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
 
 void
 modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window)
-{
-       
-       ModestMsgEditWindowPrivate *priv;
+{      
        GtkWidget *dialog = NULL;
        gint response = 0;
        GSList *uris = NULL;
        GSList *uri_node;
        
-       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_ti_select_attachment_title"));
        gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
@@ -1807,14 +2200,16 @@ modest_msg_edit_window_attach_file_one (
                ModestMsgEditWindow *window,
                const gchar *uri)
 {
+       GnomeVFSHandle *handle = NULL;
+       ModestMsgEditWindowPrivate *priv;
+       GnomeVFSResult result;
+
        g_return_if_fail (window);
        g_return_if_fail (uri);
                
-       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        
-       GnomeVFSHandle *handle = NULL;
-       GnomeVFSResult result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+       result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
        if (result == GNOME_VFS_OK) {
                TnyMimePart *mime_part;
                TnyStream *stream;
@@ -1823,7 +2218,7 @@ modest_msg_edit_window_attach_file_one (
                gchar *escaped_filename;
                gchar *filename;
                gchar *content_id;
-               GnomeVFSFileInfo info;
+               GnomeVFSFileInfo *info;
                GnomeVFSURI *vfs_uri;
 
                vfs_uri = gnome_vfs_uri_new (uri);
@@ -1833,18 +2228,21 @@ modest_msg_edit_window_attach_file_one (
                filename = gnome_vfs_unescape_string_for_display (escaped_filename);
                g_free (escaped_filename);
                gnome_vfs_uri_unref (vfs_uri);
+
+               info = gnome_vfs_file_info_new ();
                
                if (gnome_vfs_get_file_info (uri, 
-                                            &info, 
-                                            GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
-                                            GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE)
+                                            info, 
+                                            GNOME_VFS_FILE_INFO_GET_MIME_TYPE)
                    == GNOME_VFS_OK)
-                       mime_type = gnome_vfs_file_info_get_mime_type (&info);
+                       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);
+               tny_mime_part_construct (mime_part, stream, mime_type, "base64");
+
+               g_object_unref (stream);
                
                content_id = g_strdup_printf ("%d", priv->last_cid);
                tny_mime_part_set_content_id (mime_part, content_id);
@@ -1855,78 +2253,103 @@ modest_msg_edit_window_attach_file_one (
                tny_mime_part_set_filename (mime_part, basename);
                g_free (basename);
                
-               priv->attachments = g_list_prepend (priv->attachments, mime_part);
+               tny_list_prepend (priv->attachments, (GObject *) mime_part);
                modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
-                                                       mime_part);
+                                                       mime_part,
+                                                       info->size == 0, info->size);
                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_object_unref (mime_part);
+               gnome_vfs_file_info_unref (info);
        }
 }
 
 void
 modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
-                                         GList *att_list)
+                                          TnyList *att_list)
 {
        ModestMsgEditWindowPrivate *priv;
-       gboolean clean_list = FALSE;
+       TnyIterator *iter;
 
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
        if (att_list == NULL) {
                att_list = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
-               clean_list = TRUE;
+       } else {
+               g_object_ref (att_list);
        }
 
-       if (att_list == NULL) {
+       if (tny_list_get_length (att_list) == 0) {
                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));
+               gchar *filename = NULL;
+
+               if (tny_list_get_length (att_list) == 1) {
+                       TnyMimePart *part;
+                       iter = tny_list_create_iterator (att_list);
+                       part = (TnyMimePart *) tny_iterator_get_current (iter);
+                       g_object_unref (iter);
+                       if (TNY_IS_MSG (part)) {
+                               TnyHeader *header = tny_msg_get_header (TNY_MSG (part));
+                               if (header) {
+                                       filename = g_strdup (tny_header_get_subject (header));
+                                       g_object_unref (header);
+                               }
+                               if (filename == NULL) {
+                                       filename = g_strdup (_("mail_va_no_subject"));
+                               }
+                       } else {
+                               filename = g_strdup (tny_mime_part_get_filename (TNY_MIME_PART (part)));
+                       }
+                       g_object_unref (part);
                } else {
-                       filename = "";
+                       filename = g_strdup ("");
                }
                message = g_strdup_printf (ngettext("emev_nc_delete_attachment", "emev_nc_delete_attachments",
-                                                   att_list->next == NULL), filename);
+                                                   (tny_list_get_length (att_list) == 1)), filename);
+               g_free (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);
+                       g_object_unref (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;
+               
+               for (iter = tny_list_create_iterator (att_list);
+                    !tny_iterator_is_done (iter);
+                    tny_iterator_next (iter)) {
+                       TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter);
                        const gchar *att_id;
-                       priv->attachments = g_list_remove (priv->attachments, mime_part);
+                       tny_list_remove (priv->attachments, (GObject *) mime_part);
 
                        modest_attachments_view_remove_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
                                                                   mime_part);
-                       if (priv->attachments == NULL)
+                       if (tny_list_get_length (priv->attachments) == 0)
                                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);
+                       g_object_unref (mime_part);
                }
+               g_object_unref (iter);
        }
 
-       if (clean_list)
-               g_list_free (att_list);
+       g_object_unref (att_list);
+
+       /* if the last attachment has been removed, focus the Subject: field */
+       if (!modest_attachments_view_has_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view))) 
+               gtk_widget_grab_focus (priv->subject_field);
 }
 
 static void
@@ -1981,156 +2404,45 @@ modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item,
 /*             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='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>", 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))
+                                                  GINT_TO_POINTER (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='",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*DEFAULT_FONT_SCALE);
-
-       /* 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
-modest_msg_edit_window_get_zoom (ModestWindow *window)
-{
-       ModestMsgEditWindowPrivate *priv;
-     
-       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), 1.0);
-
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       return priv->zoom_level;
-}
-
-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"));
-
-       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, dgettext("hildon-common-strings", "ckct_ib_max_zoom_level_reached"));
-               return FALSE;
-       }
-
-       for (node = group; node != NULL; node = g_slist_next (node)) {
-               if ((node->next != NULL) && gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (node->next->data))) {
-                       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->data), TRUE);
-                       return TRUE;
-               }
+               
+               text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
+               markup = g_strconcat ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>", gtk_label_get_text (GTK_LABEL (label)), "</span>", NULL);
+               gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
+               g_free (markup);
        }
-       return FALSE;
 }
 
-static gboolean
-modest_msg_edit_window_zoom_minus (ModestWindow *window)
+static void
+modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item,
+                                   gpointer userdata)
 {
-       ModestWindowPrivate *parent_priv;
-       GtkRadioAction *zoom_radio_action;
-       GSList *group, *node;
+       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));
 
-       /* 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;
-       }
+       if (gtk_check_menu_item_get_active (menu_item)) {
+               gchar *markup;
 
-       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"));
-
-       group = gtk_radio_action_get_group (zoom_radio_action);
-
-       for (node = group; node != NULL; node = g_slist_next (node)) {
-               if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (node->data))) {
-                       if (node->next != NULL) {
-                               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->next->data), TRUE);
-                               return TRUE;
-                       } else
-                               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_min_zoom_level_reached"));
-                       break;
-               }
+               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, 
+                                                  GINT_TO_POINTER(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);
        }
-       return FALSE;
 }
 
 static gboolean
@@ -2159,20 +2471,6 @@ modest_msg_edit_window_window_state_event (GtkWidget *widget, GdkEventWindowStat
 }
 
 void
-modest_msg_edit_window_toggle_fullscreen (ModestMsgEditWindow *window)
-{
-       ModestWindowPrivate *parent_priv;
-       GtkAction *fs_toggle_action;
-       gboolean active;
-
-       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-
-       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);
-}
-
-void
 modest_msg_edit_window_show_cc (ModestMsgEditWindow *window, 
                                gboolean show)
 {
@@ -2265,18 +2563,34 @@ modest_msg_edit_window_show_toolbar (ModestWindow *self,
                                     gboolean show_toolbar)
 {
        ModestWindowPrivate *parent_priv;
+       const gchar *action_name;
+       GtkAction *action;
        
        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
+       /* 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));
+
+       /* Update also the actions (to update the toggles in the
+          menus), we have to do it manually because some other window
+          of the same time could have changed it (remember that the
+          toolbar fullscreen mode is shared by all the windows of the
+          same type */
+       if (modest_window_mgr_get_fullscreen_mode (modest_runtime_get_window_mgr ()))
+               action_name = "/MenuBar/ViewMenu/ShowToolbarMenu/ViewShowToolbarFullScreenMenu";
+       else
+               action_name = "/MenuBar/ViewMenu/ShowToolbarMenu/ViewShowToolbarNormalScreenMenu";
+       
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, action_name);
+       modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action),
+                                                           show_toolbar);
+
 }
 
 void
@@ -2290,7 +2604,6 @@ modest_msg_edit_window_set_priority_flags (ModestMsgEditWindow *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;
@@ -2341,6 +2654,7 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
                switch (file_format) {
                case MODEST_FILE_FORMAT_FORMATTED_TEXT:
                        wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
+                       remove_tags (WP_TEXT_BUFFER (priv->text_buffer));
                        break;
                case MODEST_FILE_FORMAT_PLAIN_TEXT:
                {
@@ -2353,12 +2667,12 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
                                wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
                        } else {
                                GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatFormattedTextMenu"));
-                               modest_maemo_toggle_action_set_active_block_notify (action, TRUE);
+                               modest_utils_toggle_action_set_active_block_notify (action, TRUE);
                        }
                }
                        break;
                }
-               update_dimmed (window);
+               modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
        }
 }
 
@@ -2387,7 +2701,6 @@ modest_msg_edit_window_select_font (ModestMsgEditWindow *window)
 
        /* 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:
@@ -2471,6 +2784,7 @@ modest_msg_edit_window_select_font (ModestMsgEditWindow *window)
                                    ? TEXT_POSITION_SUPERSCRIPT
                                    : TEXT_POSITION_SUBSCRIPT );
                        fmt.cs.text_position = TRUE;
+                       fmt.font_size = oldfmt.font_size;
                }
                if (color_set) {
                        fmt.color = *color;
@@ -2483,11 +2797,11 @@ modest_msg_edit_window_select_font (ModestMsgEditWindow *window)
                }
                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;
+                       fmt.font_size = wp_get_font_size_index(font_size, DEFAULT_FONT_SIZE);
                }
                wp_text_buffer_set_format(WP_TEXT_BUFFER(priv->text_buffer), &fmt);
+               text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), window);
        }
        gtk_widget_destroy (dialog);
        
@@ -2504,7 +2818,8 @@ modest_msg_edit_window_undo (ModestMsgEditWindow *window)
        
        wp_text_buffer_undo (WP_TEXT_BUFFER (priv->text_buffer));
 
-       update_dimmed (window);
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
 
 }
 
@@ -2518,91 +2833,48 @@ modest_msg_edit_window_redo (ModestMsgEditWindow *window)
        
        wp_text_buffer_redo (WP_TEXT_BUFFER (priv->text_buffer));
 
-       update_dimmed (window);
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
 
 }
 
-static void
-update_dimmed (ModestMsgEditWindow *window)
+static void  
+text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, 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);
+       priv->can_undo = can_undo;
 }
 
-static void
-setup_insensitive_handlers (ModestMsgEditWindow *window)
+static void  
+text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, 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, "/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);
 
+       priv->can_redo = can_redo;
 }
 
-static void  
-text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window)
+gboolean            
+modest_msg_edit_window_can_undo (ModestMsgEditWindow *window)
 {
-       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-       GtkAction *action;
+       ModestMsgEditWindowPrivate *priv;
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/UndoMenu");
-       gtk_action_set_sensitive (action, can_undo);
+       return priv->can_undo;
 }
 
-static void  
-text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, ModestMsgEditWindow *window)
+gboolean            
+modest_msg_edit_window_can_redo (ModestMsgEditWindow *window)
 {
-       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-       GtkAction *action;
+       ModestMsgEditWindowPrivate *priv;
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/RedoMenu");
-       gtk_action_set_sensitive (action, can_redo);
+       return priv->can_redo;
 }
 
+
 static void
 text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id)
 {
@@ -2658,7 +2930,9 @@ msg_body_focus (GtkWidget *focus,
                gpointer userdata)
 {
        
-       update_dimmed (MODEST_MSG_EDIT_WINDOW (userdata));
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (userdata));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (userdata));
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (userdata), MODEST_DIMMING_RULES_CLIPBOARD);
        return FALSE;
 }
 
@@ -2666,44 +2940,19 @@ static void
 recpt_field_changed (GtkTextBuffer *buffer,
                  ModestMsgEditWindow *editor)
 {
-        update_send_dimming (editor);
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (editor));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (editor));
 }
 
 static void
 body_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor)
 {
-        update_send_dimming (editor);
-}
-
-static void  
-send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
-{
-       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
-        const gchar *subject = gtk_entry_get_text (GTK_ENTRY (priv->subject_field));
-        if (message_is_empty(editor) || (subject == NULL || subject[0] == '\0')) {
-                hildon_banner_show_information (NULL, NULL, _("mcen_ib_subject_or_body_not_modified"));
-        } else {
-                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"));
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (editor));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (editor));
 }
 
-static void
-reset_modified (ModestMsgEditWindow *editor)
+void
+modest_msg_edit_window_reset_modified (ModestMsgEditWindow *editor)
 {
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
        GtkTextBuffer *buffer;
@@ -2738,6 +2987,9 @@ modest_msg_edit_window_is_modified (ModestMsgEditWindow *editor)
        return FALSE;
 }
 
+
+
+
 gboolean
 modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook)
 {
@@ -2783,32 +3035,45 @@ modest_msg_edit_window_add_attachment_clicked (GtkButton *button,
        modest_msg_edit_window_offer_attach_file (window);
 }
 
+const gchar *
+modest_msg_edit_window_get_clipboard_text (ModestMsgEditWindow *win)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (win);
+
+       return priv->clipboard_text;
+}
+
 static void
 modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard,
                                               GdkEvent *event,
                                               ModestMsgEditWindow *window)
 {
-       ModestWindowPrivate *parent_priv;
-       ModestMsgEditWindowPrivate *priv;
-       GtkAction *action;
-       GList *selected_attachments = NULL;
-       gint n_att_selected = 0;
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       GtkClipboard *selection_clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+       gchar *text = NULL;
+       if (!GTK_WIDGET_VISIBLE (window))
+               return;
 
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       text = gtk_clipboard_wait_for_text (selection_clipboard);
+
+       if (priv->clipboard_text != NULL) {
+               g_free (priv->clipboard_text);
+       }
+       priv->clipboard_text = text;
 
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
+}
+static void 
+subject_field_move_cursor (GtkEntry *entry,
+                          GtkMovementStep step,
+                          gint a1,
+                          gboolean a2,
+                          gpointer window)
+{
        if (!GTK_WIDGET_VISIBLE (window))
                return;
 
-       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_copy_cut_dimming (window);
-       update_paste_dimming (window);
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
 }
 
 static void 
@@ -2833,7 +3098,8 @@ subject_field_changed (GtkEditable *editable,
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        update_window_title (window);
        gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
-        update_send_dimming (window);
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
 }
 
 static void  
@@ -2846,6 +3112,11 @@ subject_field_insert_text (GtkEditable *editable,
        GString *result = g_string_new ("");
        gchar *current;
        gint result_len = 0;
+       const gchar *entry_text = NULL;
+       gint old_length;
+
+       entry_text = gtk_entry_get_text (GTK_ENTRY (editable));
+       old_length = g_utf8_strlen (entry_text, -1);
 
        for (current = new_text; current != NULL && *current != '\0'; current = g_utf8_next_char (current)) {
                gunichar c = g_utf8_get_char_validated (current, 8);
@@ -2862,14 +3133,67 @@ subject_field_insert_text (GtkEditable *editable,
        if (MIN (result_len, 1000) != g_utf8_strlen (new_text, 1000)) {
                g_signal_stop_emission_by_name (G_OBJECT (editable), "insert-text");
                if (result_len > 0)
+               {
+                       /* Prevent endless recursion */
+                       g_signal_handlers_block_by_func(G_OBJECT(editable), G_CALLBACK(subject_field_insert_text), window);
                        g_signal_emit_by_name (editable, "insert-text", 
-                                              (gpointer) result->str, (gpointer) strlen (result->str), 
+                                              (gpointer) result->str, (gpointer) result->len,
                                               (gpointer) position, (gpointer) window);
+                      g_signal_handlers_unblock_by_func(G_OBJECT(editable), G_CALLBACK(subject_field_insert_text), window);
+               }
+       }
+
+       if (result_len + old_length > 1000) {
+               hildon_banner_show_information (GTK_WIDGET (window), NULL, 
+                                               dgettext("hildon-common-strings",
+                                                        "ckdg_ib_maximum_characters_reached"));
        }
        
        g_string_free (result, TRUE);
 }
 
+static void  
+text_buffer_insert_text (GtkTextBuffer *buffer, 
+                        GtkTextIter *iter,
+                        gchar *new_text,
+                        gint new_text_length,
+                        ModestMsgEditWindow *window)
+{
+       GString *result = g_string_new ("");
+       gchar *current;
+       gint result_len = 0;
+       gboolean changed = FALSE;
+
+       for (current = new_text; current != NULL && *current != '\0'; current = g_utf8_next_char (current)) {
+               gunichar c = g_utf8_get_char_validated (current, 8);
+               /* Invalid unichar, stop */
+               if (c == -1)
+                       break;
+               /* a bullet */
+               switch (c) {
+               case 0x2022:
+                       result = g_string_append_c (result, ' ');
+                       changed = TRUE;
+                       break;
+               default:
+                       result = g_string_append_unichar (result, c);
+               }
+               result_len++;
+       }
+
+       if (changed) {
+               g_signal_stop_emission_by_name (G_OBJECT (buffer), "insert-text");
+               g_signal_handlers_block_by_func(G_OBJECT(buffer), G_CALLBACK(text_buffer_insert_text), window);
+               g_signal_emit_by_name (buffer, "insert-text", 
+                                      (gpointer) iter,
+                                      (gpointer) result->str, (gpointer) result->len,
+                                      (gpointer) window);
+               g_signal_handlers_unblock_by_func(G_OBJECT(buffer), G_CALLBACK(text_buffer_insert_text), window);
+       }
+
+       g_string_free (result, TRUE);
+}
+
 void
 modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window,
                                            gboolean show)
@@ -3021,147 +3345,6 @@ modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
        gtk_toggle_action_set_active (toggle, FALSE);
 }
 
-
-static void 
-update_copy_cut_dimming (ModestMsgEditWindow *window)
-{
-       ModestWindowPrivate *parent_priv = NULL;
-       ModestMsgEditWindowPrivate *priv = NULL;
-       GtkClipboard *clipboard = NULL;
-       GtkAction *action = NULL;
-       gboolean has_selection = FALSE;
-       GtkWidget *focused = NULL;
-       gchar *selection = NULL;
-
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-       clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-       focused = gtk_window_get_focus (GTK_WINDOW (window));
-
-       has_selection = gtk_clipboard_wait_for_targets (clipboard, NULL, NULL);
-
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu");
-       gtk_action_set_sensitive (action, (has_selection) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
-       gtk_action_set_sensitive (action, (has_selection) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
-
-       if (selection != NULL) 
-               g_free(selection);
-}
-
-static void 
-update_paste_dimming (ModestMsgEditWindow *window)
-{
-       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-       GtkAction *action = NULL;
-       GtkClipboard *clipboard = NULL;
-       ModestEmailClipboard *e_clipboard;
-       GtkWidget *focused;
-       gboolean active;
-
-       focused = gtk_window_get_focus (GTK_WINDOW (window));
-
-       e_clipboard = modest_runtime_get_email_clipboard ();
-       if (!modest_email_clipboard_cleared (e_clipboard)) {
-               active = TRUE;
-       } else {
-               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 
-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
-update_send_dimming (ModestMsgEditWindow *window)
-{
-        ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-        GtkTextBuffer *to_buffer, *cc_buffer, *bcc_buffer;
-        const gchar *subject;
-       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));
-        subject = gtk_entry_get_text (GTK_ENTRY (priv->subject_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)
-          || (subject == NULL || subject[0] == '\0')
-          || message_is_empty(window);
-
-       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
-edit_menu_activated (GtkAction *action,
-                    gpointer userdata)
-{
-       ModestMsgEditWindow *window = MODEST_MSG_EDIT_WINDOW (userdata);
-
-       update_select_all_dimming (window);
-       update_copy_cut_dimming (window);
-       update_paste_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)
 {
@@ -3196,23 +3379,19 @@ modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
        ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
 
        if (priv->draft_msg != NULL) {
-               header = tny_msg_get_header (priv->draft_msg);
-               if (TNY_IS_HEADER (header)) {
-                       modest_window_mgr_unregister_header (mgr, header);
-               }
                g_object_unref (priv->draft_msg);
        }
 
        if (draft != NULL) {
                g_object_ref (draft);
                header = tny_msg_get_header (draft);
-               if (TNY_IS_HEADER (header))
-                       modest_window_mgr_register_header (mgr, header);
                if (priv->msg_uid) {
                        g_free (priv->msg_uid);
                        priv->msg_uid = NULL;
                }
                priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
+               if (GTK_WIDGET_REALIZED (window))
+                       modest_window_mgr_register_window (mgr, MODEST_WINDOW (window));
        }
 
        priv->draft_msg = draft;
@@ -3230,7 +3409,7 @@ text_buffer_apply_tag (GtkTextBuffer *buffer, GtkTextTag *tag,
        if (tag == NULL+13) return;
        g_object_get (G_OBJECT (tag), "name", &tag_name, NULL);
        if ((tag_name != NULL) && (g_str_has_prefix (tag_name, "image-tag-replace-"))) {
-               replace_with_attachments (window, priv->attachments);
+               replace_with_images (window, priv->images);
        }
 }
 
@@ -3241,9 +3420,8 @@ modest_msg_edit_window_add_part (ModestMsgEditWindow *window,
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
        g_return_if_fail (TNY_IS_MIME_PART (part));
-       priv->attachments = g_list_prepend (priv->attachments, part);
-       g_object_ref (part);
-       modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), part);
+       tny_list_prepend (priv->attachments, (GObject *) part);
+       modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), part, TRUE, 0);
        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);
@@ -3259,3 +3437,89 @@ modest_msg_edit_window_get_message_uid (ModestMsgEditWindow *window)
 
        return priv->msg_uid;
 }
+
+GtkWidget *
+modest_msg_edit_window_get_child_widget (ModestMsgEditWindow *win,
+                                        ModestMsgEditWindowWidgetType widget_type)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (win), NULL);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (win);
+
+       switch (widget_type) {
+       case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BODY:
+               return priv->msg_body;
+               break;
+       case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_TO:
+               return priv->to_field;
+               break;
+       case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_CC:
+               return priv->cc_field;
+               break;
+       case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BCC:
+               return priv->bcc_field;
+               break;
+       case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_SUBJECT:
+               return priv->subject_field;
+               break;
+       case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_ATTACHMENTS:
+               return priv->attachments_view;
+               break;
+       default:
+               return NULL;
+       }
+}
+
+static void 
+remove_tags (WPTextBuffer *buffer)
+{
+       GtkTextIter start, end;
+
+       gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &start);
+       gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (buffer), &end);
+
+       gtk_text_buffer_remove_all_tags (GTK_TEXT_BUFFER (buffer), &start, &end);
+}
+
+static void
+on_account_removed (TnyAccountStore *account_store, 
+                   TnyAccount *account,
+                   gpointer user_data)
+{
+       /* Do nothing if it's a store account, because we use the
+          transport to send the messages */
+       if (tny_account_get_account_type(account) == TNY_ACCOUNT_TYPE_TRANSPORT) {
+               const gchar *parent_acc = NULL;
+               const gchar *our_acc = NULL;
+
+               our_acc = modest_window_get_active_account (MODEST_WINDOW (user_data));
+               parent_acc = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+               /* Close this window if I'm showing a message of the removed account */
+               if (strcmp (parent_acc, our_acc) == 0)
+                       modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (user_data));
+       }
+}
+
+static gboolean
+on_zoom_minus_plus_not_implemented (ModestWindow *window)
+{
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+
+       hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
+       return FALSE;
+
+}
+
+static void
+set_zoom_do_nothing (ModestWindow *window,
+                                gdouble zoom)
+{
+}
+
+static gdouble
+get_zoom_do_nothing (ModestWindow *window)
+{
+       return 1.0;
+}
+