* src/maemo/modest-msg-edit-window.c:
[modest] / src / maemo / modest-msg-edit-window.c
index d4b4adb..79370b4 100644 (file)
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <tny-account-store.h>
 #include <tny-fs-stream.h>
+#include <tny-vfs-stream.h>
 
 #include <config.h>
 
 #include "modest-mail-operation.h"
 #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 <hildon-widgets/hildon-color-selector.h>
-#include <hildon-widgets/hildon-color-button.h>
-#include <hildon-widgets/hildon-banner.h>
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-note.h>
-#include <hildon-widgets/hildon-scroll-area.h>
-#include <hildon-widgets/hildon-font-selection-dialog.h>
-#include "widgets/modest-msg-edit-window-ui.h"
+#include "modest-scroll-area.h"
+#include "modest-msg-edit-window-ui-dimming.h"
 
-#ifdef MODEST_HILDON_VERSION_0
-#include <hildon-widgets/hildon-file-chooser-dialog.h>
+#include "modest-hildon-includes.h"
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#include <hildon-widgets/hildon-color-chooser.h>
+#endif
+#include "widgets/modest-msg-edit-window-ui.h"
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#include <libgnomevfs/gnome-vfs-mime-utils.h>
 #else
-#include <hildon/hildon-file-chooser-dialog.h>
-
-#endif /*MODEST_HILDON_VERSION_0 */
-
+#include <libgnomevfs/gnome-vfs-mime.h>
+#endif
+#include <modest-utils.h>
+#include "modest-maemo-utils.h"
 
 
 #define DEFAULT_FONT_SIZE 3
 #define DEFAULT_SIZE_COMBOBOX_WIDTH 80
 #define DEFAULT_MAIN_VBOX_SPACING 6
 #define SUBJECT_MAX_LENGTH 1000
+#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);
 
+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  text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *window);
-static void  text_buffer_mark_set (GtkTextBuffer *buffer, GtkTextIter *location, GtkTextMark *mark, gpointer userdata);
 static void  text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window);
+static void  text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, ModestMsgEditWindow *window);
+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, 
+                                       gchar *new_text,
+                                       gint new_text_length,
+                                       gint *position,
+                                       ModestMsgEditWindow *window);
 static void  modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window,
                                                         gpointer userdata);
 static void  modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item,
@@ -102,17 +128,108 @@ static gboolean modest_msg_edit_window_window_state_event (GtkWidget *widget,
                                                           gpointer userdata);
 static void modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window,
                                                     ModestRecptEditor *editor);
+static void modest_msg_edit_window_add_attachment_clicked (GtkButton *button,
+                                                          ModestMsgEditWindow *window);
 
 /* ModestWindow methods implementation */
-static void  modest_msg_edit_window_set_zoom (ModestWindow *window, gdouble zoom);
-static gdouble modest_msg_edit_window_get_zoom (ModestWindow *window);
-static gboolean modest_msg_edit_window_zoom_minus (ModestWindow *window);
-static gboolean modest_msg_edit_window_zoom_plus (ModestWindow *window);
+static void modest_msg_edit_window_disconnect_signals (ModestWindow *window);
 static void modest_msg_edit_window_show_toolbar   (ModestWindow *window,
                                                   gboolean show_toolbar);
-static void update_dimmed (ModestMsgEditWindow *window);
+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);
+
+/* Find toolbar */
+static void modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
+                                                       ModestMsgEditWindow *window);
+static void modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
+                                                      ModestMsgEditWindow *window);
+static gboolean gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter,
+                                                         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, gboolean only_if_focused);
+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 ModestPair *find_transport_from_message_sender (ModestPairList *transports,
+                                                      TnyMsg *msg);
+
+
+
+
+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 ("");
+               GSList *toggled_tags;
+               GSList *node;
+
+               toggled_tags = gtk_text_iter_get_toggled_tags (&iter, FALSE);
+               g_string_append_printf (output, "%d: CLOSED [ ", gtk_text_iter_get_offset (&iter));
+               for (node = toggled_tags; node != NULL; node = g_slist_next (node)) {
+                       GtkTextTag *tag = (GtkTextTag *) node->data;
+                       const gchar *name;
+                       g_object_get (G_OBJECT (tag), "name", &name, NULL);
+                       output = g_string_append (output, name);
+                       g_string_append (output, " ");
+               }
+               output = g_string_append (output, "] OPENED [ ");
+               toggled_tags = gtk_text_iter_get_toggled_tags (&iter, TRUE);
+               for (node = toggled_tags; node != NULL; node = g_slist_next (node)) {
+                       GtkTextTag *tag = (GtkTextTag *) node->data;
+                       const gchar *name;
+                       g_object_get (G_OBJECT (tag), "name", &name, NULL);
+                       output = g_string_append (output, name);
+                       g_string_append (output, " ");
+               }
+               output = g_string_append (output, "]\n");
+               g_message ("%s", output->str);
+               g_string_free (output, TRUE);
+               gtk_text_iter_forward_to_tag_toggle (&iter, NULL);
+       }
+       g_message ("END BUFFER");
+#endif
+}
 
 
+/* static gboolean */
+/* on_key_pressed (GtkWidget *self, */
+/*             GdkEventKey *event, */
+/*             gpointer user_data); */
+
 /* list my signals */
 enum {
        /* MY_SIGNAL_1, */
@@ -123,8 +240,13 @@ enum {
 typedef struct _ModestMsgEditWindowPrivate ModestMsgEditWindowPrivate;
 struct _ModestMsgEditWindowPrivate {
        GtkWidget   *msg_body;
+       GtkWidget   *frame;
        GtkWidget   *header_box;
+       
+       ModestPairList *from_field_protos;
        GtkWidget   *from_field;
+       const gchar *original_account_name;
+       
        GtkWidget   *to_field;
        GtkWidget   *cc_field;
        GtkWidget   *bcc_field;
@@ -135,6 +257,7 @@ struct _ModestMsgEditWindowPrivate {
 
        GtkWidget   *cc_caption;
        GtkWidget   *bcc_caption;
+       gboolean     update_caption_visibility;
        GtkWidget   *attachments_caption;
 
        GtkTextBuffer *text_buffer;
@@ -146,15 +269,33 @@ struct _ModestMsgEditWindowPrivate {
        GtkWidget   *font_tool_button_label;
        GSList      *size_items_group;
        GtkWidget   *size_tool_button_label;
+       
+       GtkWidget   *find_toolbar;
+       gchar       *last_search;
 
        GtkWidget   *scroll;
+       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;
+       
+       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;
+       gchar       *msg_uid;
 
-       gdouble zoom_level;
+       gboolean    sent;
 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -187,12 +328,57 @@ modest_msg_edit_window_get_type (void)
                                                  "ModestMsgEditWindow",
                                                  &my_info, 0);
 
-               wp_text_buffer_library_init ();
        }
        return my_type;
 }
 
 static void
+save_state (ModestWindow *self)
+{
+       modest_widget_memory_save (modest_runtime_get_conf(),
+                                  G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY);
+}
+
+
+static void
+restore_settings (ModestMsgEditWindow *self)
+{
+       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);
+}
+
+
+static void
 modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass)
 {
        GObjectClass *gobject_class;
@@ -203,11 +389,13 @@ 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;
 
        g_type_class_add_private (gobject_class, sizeof(ModestMsgEditWindowPrivate));
 }
@@ -219,105 +407,348 @@ 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;
+       priv->update_caption_visibility = FALSE;
 
        priv->priority_flags = 0;
-}
 
+       priv->find_toolbar = NULL;
+       priv->last_search = NULL;
 
+       priv->draft_msg = NULL;
+       priv->outbox_msg = NULL;
+       priv->msg_uid = NULL;
 
-static void
-save_settings (ModestMsgEditWindow *self)
-{
-       modest_widget_memory_save (modest_runtime_get_conf(),
-                                  G_OBJECT(self), "modest-edit-msg-window");
-}
+       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->scroll_drag_timeout_id = 0;
+       priv->last_upper = 0.0;
 
-static void
-restore_settings (ModestMsgEditWindow *self)
-{
-       modest_widget_memory_restore (modest_runtime_get_conf(),
-                                     G_OBJECT(self), "modest-edit-msg-window");
+       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));
 }
 
 
 /* FIXME: this is a dup from the one in gtk/ */
+
+/** 
+ * @result: A ModestPairList, which must be freed with modest_pair_list_free().
+ */
 static ModestPairList*
 get_transports (void)
 {
-       ModestAccountMgr *account_mgr;
        GSList *transports = NULL;
-       GSList *cursor, *accounts;
        
-       account_mgr = modest_runtime_get_account_mgr();
-       cursor = accounts = modest_account_mgr_account_names (account_mgr); 
+       ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
+       GSList *accounts = modest_account_mgr_account_names (account_mgr, 
+                                                            TRUE /* only enabled accounts. */); 
+                                               
+       GSList *cursor = accounts;
        while (cursor) {
-               gchar *account_name = (gchar*)cursor->data;
-               gchar *from_string  = modest_account_mgr_get_from_string (account_mgr,
+               gchar *account_name = cursor->data;
+               gchar *from_string  = NULL;
+               if (account_name) {
+                       from_string = modest_account_mgr_get_from_string (account_mgr,
                                                                          account_name);
-               if (!from_string)  {
-                       /* something went wrong: ignore this one */
-                       g_free (account_name);
-                       cursor->data = NULL;
-               } else {
-                       ModestPair *pair;
-                       pair = modest_pair_new ((gpointer) account_name,
+               }
+               
+               if (from_string && account_name) {
+                       gchar *name = account_name;
+                       ModestPair *pair = modest_pair_new ((gpointer) name,
                                                (gpointer) from_string , TRUE);
                        transports = g_slist_prepend (transports, pair);
-               } /* don't free account name; it's freed when the transports list is freed */
+               }
+               
                cursor = cursor->next;
        }
-       g_slist_free (accounts);
+       g_slist_free (accounts); /* only free the accounts, not the elements,
+                                 * because they are used in the pairlist */
        return transports;
 }
 
+/**
+ * Search an (account, address) ModestPairList for a pair whose
+ * address matches the one in the From: header of a TnyMsg
+ *
+ * @result: A ModestPair * with a matching address, or NULL if none found
+ */
+static ModestPair *
+find_transport_from_message_sender (ModestPairList *transports, TnyMsg *msg)
+{
+       g_return_val_if_fail (transports, NULL);
+       g_return_val_if_fail (msg, NULL);
+
+       ModestPair *account_pair = NULL;
+       TnyHeader *header = tny_msg_get_header (msg);
+
+       if (header != NULL && tny_header_get_from (header)) {
+               char *from_addr = modest_text_utils_get_email_address (tny_header_get_from (header));
+               GSList *iter;
+               for (iter = transports; iter && !account_pair; iter = iter->next) {
+                       ModestPair *pair = (ModestPair *) iter->data;
+                       char *account_addr = modest_text_utils_get_email_address ((char *) pair->second);
+                       if (account_addr && !strcasecmp(from_addr, account_addr)) {
+                               account_pair = pair;
+                       }
+                       g_free (account_addr);
+               }
+               g_free (from_addr);
+       }
+
+       if (header)
+               g_object_unref (header);
+
+       return account_pair;
+}
+
+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, TRUE);
+
+       priv->scroll_drag_timeout_id = 0;
+
+       return FALSE;
+}
 
 static void
-text_buffer_mark_set (GtkTextBuffer *buffer, GtkTextIter *iter, GtkTextMark *mark, gpointer userdata)
+correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focused)
 {
-       ModestMsgEditWindow *window;
        ModestMsgEditWindowPrivate *priv;
-       GdkRectangle location;
-       gint v_scroll_min_value = 0;
-       gint v_scroll_max_value = 0;
-       gint v_scroll_visible;
+       GtkTextMark *insert;
+       GtkTextIter iter;
+       GdkRectangle rectangle;
        GtkAdjustment *vadj;
-       GtkTextMark *insert_mark;
-       GtkTextIter insert_iter;
-       
-       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (userdata));
-       g_return_if_fail (GTK_IS_TEXT_MARK (mark));
-       window = MODEST_MSG_EDIT_WINDOW (userdata);
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-               
-       insert_mark = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer));
-       gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer), &insert_iter, insert_mark);
-       gtk_text_view_get_iter_location (GTK_TEXT_VIEW (priv->msg_body), &insert_iter, &location);
-       
-       if (priv->header_box)
-               v_scroll_min_value += priv->header_box->allocation.height + DEFAULT_MAIN_VBOX_SPACING;
-       v_scroll_min_value += location.y;
-       v_scroll_max_value = v_scroll_min_value + location.height;
+       gdouble new_value;
+       gint offset;
+       GdkWindow *window;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w);
+
+       if (only_if_focused && !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;
        
-       v_scroll_visible = GTK_WIDGET (window)->allocation.height;
+       if ((offset + rectangle.y + rectangle.height) > 
+           ((gint) (vadj->value +vadj->page_size))) {
+               new_value = (offset + rectangle.y) - vadj->page_size * 0.25;
+               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, TRUE);
+}
+
+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);
+}
+
+static void
+cut_clipboard_check (GtkTextView *text_view,
+                    gpointer userdata)
+{
+       GtkTextBuffer *buffer;
        
-       vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll));
+       buffer = gtk_text_view_get_buffer (text_view);
+       if (!modest_text_utils_buffer_selection_is_valid (buffer)) {
+               g_signal_stop_emission_by_name ((gpointer )text_view, "cut-clipboard");
+       }
+}
+
+static void
+copy_clipboard_check (GtkTextView *text_view,
+                    gpointer userdata)
+{
+       GtkTextBuffer *buffer;
        
-       if (((gdouble) v_scroll_min_value) < vadj->value)
-               gtk_adjustment_set_value (vadj, v_scroll_min_value);
-       else if (((gdouble) v_scroll_max_value) > (vadj->value + vadj->page_size))
-               gtk_adjustment_set_value (vadj, ((gdouble)v_scroll_max_value) - vadj->page_size);
+       buffer = gtk_text_view_get_buffer (text_view);
+       if (!modest_text_utils_buffer_selection_is_valid (buffer)) {
+               g_signal_stop_emission_by_name ((gpointer )text_view, "copy-clipboard");
+       }
+}
+
+void vadj_changed (GtkAdjustment *adj,
+                  ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       if (priv->last_upper != adj->upper) {
+               priv->last_upper = adj->upper;
+               correct_scroll (window);
+       }
+}
+
+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), "modified-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);
+
+       g_signal_connect (G_OBJECT (priv->msg_body), "cut-clipboard", G_CALLBACK (cut_clipboard_check), NULL);
+       g_signal_connect (G_OBJECT (priv->msg_body), "copy-clipboard", G_CALLBACK (copy_clipboard_check), NULL);
+
 }
 
 static void
@@ -326,20 +757,75 @@ init_window (ModestMsgEditWindow *obj)
        GtkWidget *from_caption, *to_caption, *subject_caption;
        GtkWidget *main_vbox;
        ModestMsgEditWindowPrivate *priv;
-       ModestPairList *protos;
+       GtkActionGroup *action_group;
+       ModestWindowPrivate *parent_priv;
+       GdkPixbuf *window_icon = NULL;
+       GError *error = NULL;
+
        GtkSizeGroup *size_group;
-       GtkWidget *frame;
-       GtkWidget *scroll_area;
        GtkWidget *subject_box;
        GtkWidget *attachment_icon;
-
+       GtkWidget *window_box;
+#if (GTK_MINOR_VERSION >= 10)
+       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);
 
-       protos = get_transports ();
-       priv->from_field    = modest_combo_box_new (protos, g_str_equal);
-       modest_pair_list_free (protos);
+       /* Note: This ModestPairList* must exist for as long as the combo
+        * that uses it, because the ModestComboBox uses the ID opaquely, 
+        * so it can't know how to manage its memory. */ 
+       priv->from_field    = modest_combo_box_new (NULL, g_str_equal);
 
        priv->to_field      = modest_recpt_editor_new ();
        priv->cc_field      = modest_recpt_editor_new ();
@@ -348,7 +834,9 @@ init_window (ModestMsgEditWindow *obj)
        priv->priority_icon = gtk_image_new ();
        gtk_box_pack_start (GTK_BOX (subject_box), priv->priority_icon, FALSE, FALSE, 0);
        priv->subject_field = gtk_entry_new_with_max_length (SUBJECT_MAX_LENGTH);
-       g_object_set (G_OBJECT (priv->subject_field), "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL);
+       g_object_set (G_OBJECT (priv->subject_field), "truncate-multiline", TRUE, NULL);
+       hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->subject_field), 
+                                        HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
        gtk_box_pack_start (GTK_BOX (subject_box), priv->subject_field, TRUE, TRUE, 0);
        priv->add_attachment_button = gtk_button_new ();
        GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (priv->add_attachment_button), GTK_CAN_FOCUS);
@@ -390,104 +878,303 @@ init_window (ModestMsgEditWindow *obj)
        priv->msg_body = wp_text_view_new ();
        gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (priv->msg_body), GTK_WRAP_WORD_CHAR);
        priv->text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
-       g_object_set (priv->text_buffer, "font_scale", 1.0, NULL);
+       g_object_set (priv->text_buffer, "font_scale", DEFAULT_FONT_SCALE, NULL);
        wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
-/*     gtk_text_buffer_set_can_paste_rich_text (priv->text_buffer, TRUE); */
+#if (GTK_MINOR_VERSION >= 10)
+       gtk_text_buffer_register_serialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), "wp-text-buffer");
+       deserialize_type = gtk_text_buffer_register_deserialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), 
+                                                                      "wp-text-buffer");
+       gtk_text_buffer_deserialize_set_can_create_tags (GTK_TEXT_BUFFER (priv->text_buffer), 
+                                                        deserialize_type, TRUE);
+#endif
        wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
 
-       g_signal_connect (G_OBJECT (priv->text_buffer), "refresh_attributes",
-                         G_CALLBACK (text_buffer_refresh_attributes), obj);
-       g_signal_connect (G_OBJECT (priv->text_buffer), "mark-set",
-                         G_CALLBACK (text_buffer_mark_set), obj);
-       g_signal_connect (G_OBJECT (priv->text_buffer), "can-undo",
-                         G_CALLBACK (text_buffer_can_undo), obj);
-       g_signal_connect (G_OBJECT (obj), "window-state-event",
-                         G_CALLBACK (modest_msg_edit_window_window_state_event),
-                         NULL);
-       g_signal_connect_swapped (G_OBJECT (priv->to_field), "open-addressbook", 
-                                 G_CALLBACK (modest_msg_edit_window_open_addressbook), obj);
-       g_signal_connect_swapped (G_OBJECT (priv->cc_field), "open-addressbook", 
-                                 G_CALLBACK (modest_msg_edit_window_open_addressbook), obj);
-       g_signal_connect_swapped (G_OBJECT (priv->bcc_field), "open-addressbook", 
-                                 G_CALLBACK (modest_msg_edit_window_open_addressbook), obj);
+       priv->find_toolbar = hildon_find_toolbar_new (NULL);
+       gtk_widget_set_no_show_all (priv->find_toolbar, TRUE);
+
+/*     g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */
 
        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);
-       
+       modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->scroll), TRUE);
+
        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)));
        gtk_widget_show_all (GTK_WIDGET(priv->scroll));
        
-       if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL))
-               gtk_widget_hide (priv->cc_field);
-       if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL))
-               gtk_widget_hide (priv->bcc_field);
+       window_box = gtk_vbox_new (FALSE, 0);
+       gtk_container_add (GTK_CONTAINER(obj), window_box);
+
+       gtk_box_pack_start (GTK_BOX (window_box), priv->scroll, TRUE, TRUE, 0);
 
-       gtk_container_add (GTK_CONTAINER(obj), priv->scroll);
-       scroll_area = hildon_scroll_area_new (priv->scroll, priv->msg_body);
-       gtk_container_add (GTK_CONTAINER (frame), scroll_area);
-       gtk_container_set_focus_vadjustment (GTK_CONTAINER (scroll_area), 
-                                            gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)));
+       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
+modest_msg_edit_window_disconnect_signals (ModestWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
+       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);
+               if (TNY_IS_HEADER (header)) {
+                       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+                       modest_window_mgr_unregister_header (mgr, header);
+               }
+               g_object_unref (priv->draft_msg);
+               priv->draft_msg = NULL;
+       }
+       if (priv->outbox_msg != NULL) {
+               TnyHeader *header = tny_msg_get_header (priv->outbox_msg);
+               if (TNY_IS_HEADER (header)) {
+                       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+                       modest_window_mgr_unregister_header (mgr, header);
+               }
+               g_object_unref (priv->outbox_msg);
+               priv->outbox_msg = NULL;
+       }
+       if (priv->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);
+       
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
-
-
-static gboolean
-on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgEditWindow *self)
+static GdkPixbuf *
+pixbuf_from_stream (TnyStream *stream, const gchar *mime_type, guint64 *stream_size)
 {
-       save_settings (self);
-       return FALSE;
-}
+       GdkPixbufLoader *loader;
+       GdkPixbuf *pixbuf;
+       guint64 size;
+       
+       size = 0;
 
-static GtkWidget *
-menubar_to_menu (GtkUIManager *ui_manager)
-{
-       GtkWidget *main_menu;
-       GtkWidget *menubar;
-       GList *iter;
+       loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
 
-       /* Create new main menu */
-       main_menu = gtk_menu_new();
+       if (loader == NULL) {
+               if (stream_size)
+                       *stream_size = 0;
+               return NULL;
+       }
 
-       /* Get the menubar from the UI manager */
-       menubar = gtk_ui_manager_get_widget (ui_manager, "/MenuBar");
+       tny_stream_reset (TNY_STREAM (stream));
+       while (!tny_stream_is_eos (TNY_STREAM (stream))) {
+               GError *error = NULL;
+               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, &error)) {
+                       break;
+               }
+       }
 
-       iter = gtk_container_get_children (GTK_CONTAINER (menubar));
-       while (iter) {
-               GtkWidget *menu;
+       pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+       if (pixbuf) 
+               g_object_ref (pixbuf);
+       gdk_pixbuf_loader_close (loader, NULL);
+       g_object_unref (loader);
+
+       if (!pixbuf)
+               return NULL;
+
+       if (gdk_pixbuf_get_width (pixbuf) > IMAGE_MAX_WIDTH) {
+               GdkPixbuf *new_pixbuf;
+               gint new_height;
+               new_height = (gdk_pixbuf_get_height (pixbuf) * IMAGE_MAX_WIDTH) /
+                       gdk_pixbuf_get_width (pixbuf);
+               new_pixbuf = gdk_pixbuf_scale_simple (pixbuf, IMAGE_MAX_WIDTH, new_height, GDK_INTERP_BILINEAR);
+               g_object_unref (pixbuf);
+               pixbuf = new_pixbuf;
+       }
 
-               menu = GTK_WIDGET (iter->data);
-               gtk_widget_reparent(menu, main_menu);
+       if (stream_size)
+               *stream_size = size;
 
-               iter = g_list_next (iter);
-       }
-       return main_menu;
+       return pixbuf;
 }
 
-
 static void
-set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
+replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
 {
-       TnyHeader *header;
-       const gchar *to, *cc, *bcc, *subject, *body;
        ModestMsgEditWindowPrivate *priv;
-       
-       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
+       TnyIterator *iter;
+
+       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);
+               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_decoded_stream (part);
+                       GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size);
+
+
+                       g_object_unref (stream);
+
+                       if (pixbuf != NULL) {
+                               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
+get_related_images (ModestMsgEditWindow *self, TnyMsg *msg)
+{
+       TnyMimePart *parent = NULL;
+       const gchar *content_type = NULL;
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+       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;
+                       gint int_cid = strtol (cid, &invalid, 10);
+                       if ((invalid != NULL) && (*invalid == '\0') && (int_cid > priv->last_cid)) {
+                               priv->last_cid = int_cid;
+                       }
+               }
+               g_object_unref (part);
+       }
+       g_object_unref (iter);
+}
+
+static void
+set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
+{
+       TnyHeader *header;
+       const gchar *to, *cc, *bcc, *subject;
+       gchar *body;
+       ModestMsgEditWindowPrivate *priv;
+       GtkTextIter iter;
+       TnyHeaderFlags priority_flags;
+       TnyFolder *msg_folder;
+       gboolean is_html = FALSE;
+       
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
        g_return_if_fail (TNY_IS_MSG (msg));
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
@@ -497,43 +1184,72 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
        cc      = tny_header_get_cc (header);
        bcc     = tny_header_get_bcc (header);
        subject = tny_header_get_subject (header);
+       priority_flags = tny_header_get_priority (header);
 
        if (to)
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field),  to);
-       if (cc)
+       if (cc) {
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field),  cc);
-       if (bcc)
+               gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
+               gtk_widget_show (priv->cc_caption);
+       } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_CC, NULL)) {
+               gtk_widget_set_no_show_all (priv->cc_caption, TRUE);
+               gtk_widget_hide (priv->cc_caption);
+       }
+       if (bcc) {
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
+               gtk_widget_set_no_show_all (priv->bcc_caption, FALSE);
+               gtk_widget_show (priv->bcc_caption);
+       } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_BCC, NULL)) {
+               gtk_widget_set_no_show_all (priv->bcc_caption, TRUE);
+               gtk_widget_hide (priv->bcc_caption);
+       } 
        if (subject)
-               gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);   
+               gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
+       modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW(self),
+                                                  priority_flags);
+
+       update_window_title (self);
 
-/*     gtk_text_buffer_set_can_paste_rich_text (priv->text_buffer, TRUE); */
        wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
-       body = modest_tny_msg_get_body (msg, FALSE);
-       if ((body!=NULL) && (body[0] != '\0')) {
-               wp_text_buffer_load_document_begin (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
-               wp_text_buffer_load_document_write (WP_TEXT_BUFFER (priv->text_buffer),
-                                                   (gchar *) body,
-                                                   -1);
-               wp_text_buffer_load_document_end (WP_TEXT_BUFFER (priv->text_buffer));
+       body = modest_tny_msg_get_body (msg, TRUE, &is_html);
+
+       if ((body == NULL)||(body[0] == '\0')) {
+               g_free (body);
+               body = modest_text_utils_convert_to_html ("");
+               is_html = FALSE;
+       }
+       wp_text_buffer_load_document_begin (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
+       wp_text_buffer_load_document_write (WP_TEXT_BUFFER (priv->text_buffer),
+                                           (gchar *) body,
+                                           strlen (body));
+       wp_text_buffer_load_document_end (WP_TEXT_BUFFER (priv->text_buffer));
+       g_free (body);
+
+       /* 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 {
-               WPTextBufferFormat fmt = {0};
+               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);
 
-               fmt.font_size = DEFAULT_FONT_SIZE;
-               fmt.font = DEFAULT_FONT;
-               fmt.rich_text = 1;
-               fmt.text_position = TEXT_POSITION_NORMAL;
-               fmt.justification = 0;
-               fmt.cs.font_size = 1;
-               fmt.cs.font = 1;
-               fmt.cs.text_position = 1;
-               fmt.cs.justification = 1;
-               wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &fmt);
+       if (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 */
+       } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) {
+               wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
        }
 
        /* Set the default focus depending on having already a To: field or not */
        if ((!to)||(*to == '\0')) {
-               gtk_widget_grab_focus (priv->to_field);
+               modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
        } else {
                gtk_widget_grab_focus (priv->msg_body);
        }
@@ -542,13 +1258,39 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
           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);
-       if (priv->attachments == NULL)
-               gtk_widget_hide_all (priv->attachments_caption);
+       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);
+
+       modest_msg_edit_window_set_modified (self, FALSE);
 
-       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);
+
+       if (priv->msg_uid) {
+               g_free (priv->msg_uid);
+               priv->msg_uid = NULL;
+       }
+
+       /* we should set a reference to the incoming message if it is a draft */
+       msg_folder = tny_msg_get_folder (msg);
+       if (msg_folder) {               
+               if (modest_tny_folder_is_local_folder (msg_folder)) {
+                       TnyFolderType type = modest_tny_folder_get_local_or_mmc_folder_type (msg_folder);
+                       if (type == TNY_FOLDER_TYPE_INVALID)
+                               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+                       
+                       if (type == TNY_FOLDER_TYPE_DRAFTS) 
+                               priv->draft_msg = g_object_ref(msg);
+                       if (type == TNY_FOLDER_TYPE_OUTBOX)
+                               priv->outbox_msg = g_object_ref(msg);
+                       priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
+               }
+               g_object_unref (msg_folder);
+       }
 }
 
 static void
@@ -605,16 +1347,13 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        GtkWidget *sizes_menu;
        GtkWidget *fonts_menu;
        GSList *radio_group = NULL;
+       GSList *node = NULL;
        gchar *markup;
 
        /* Toolbar */
        parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
        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));
@@ -622,11 +1361,16 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        /* font color */
        tool_item = GTK_WIDGET (gtk_tool_item_new ());
        priv->font_color_button = hildon_color_button_new ();
+       GTK_WIDGET_UNSET_FLAGS (tool_item, GTK_CAN_FOCUS);
+       GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS);
        gtk_container_add (GTK_CONTAINER (tool_item), priv->font_color_button);
        gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
        gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
        gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index);
-       g_signal_connect_swapped (G_OBJECT (priv->font_color_button), "notify::color", G_CALLBACK (modest_msg_edit_window_color_button_change), window);
+       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");
@@ -655,9 +1399,14 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
 
                priv->size_items_group = g_slist_prepend (priv->size_items_group, size_menu_item);
                        
-               g_signal_connect (G_OBJECT (size_menu_item), "toggled", G_CALLBACK (modest_msg_edit_window_size_change),
+       }
+
+       for (node = radio_group; node != NULL; node = g_slist_next (node)) {
+               GtkWidget *item = (GtkWidget *) node->data;
+               g_signal_connect (G_OBJECT (item), "toggled", G_CALLBACK (modest_msg_edit_window_size_change),
                                  window);
        }
+
        priv->size_items_group = g_slist_reverse (priv->size_items_group);
        gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), sizes_menu);
        g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (menu_tool_button_clicked_popup), NULL);
@@ -695,7 +1444,10 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
 
                priv->font_items_group = g_slist_prepend (priv->font_items_group, font_menu_item);
                        
-               g_signal_connect (G_OBJECT (font_menu_item), "toggled", G_CALLBACK (modest_msg_edit_window_font_change),
+       }
+       for (node = radio_group; node != NULL; node = g_slist_next (node)) {
+               GtkWidget *item = (GtkWidget *) node->data;
+               g_signal_connect (G_OBJECT (item), "toggled", G_CALLBACK (modest_msg_edit_window_font_change),
                                  window);
        }
        priv->font_items_group = g_slist_reverse (priv->font_items_group);
@@ -718,108 +1470,122 @@ 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);
 }
 
 
 
 ModestWindow*
-modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
+modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean preserve_is_rich)
 {
        GObject *obj;
        ModestWindowPrivate *parent_priv;
        ModestMsgEditWindowPrivate *priv;
-       GtkActionGroup *action_group;
-       GError *error = NULL;
-       GdkPixbuf *window_icon = NULL;
+       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);
+
+       mgr = modest_runtime_get_window_mgr ();
        
-       obj = g_object_new(MODEST_TYPE_MSG_EDIT_WINDOW, NULL);
+       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);
 
-       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_FILE_FORMAT_FORMATTED_TEXT,
-                                           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_error_free (error);
-               error = NULL;
-       }
-
-       /* Add accelerators */
-       gtk_window_add_accel_group (GTK_WINDOW (obj), 
-                                   gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
-
-       /* 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));
                
-       gtk_window_set_title (GTK_WINDOW(obj), "Modest");
-       gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
-
-       g_signal_connect (G_OBJECT(obj), "delete-event",
-                         G_CALLBACK(on_delete_event), obj);
-
        modest_window_set_active_account (MODEST_WINDOW(obj), account_name);
 
-       modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj));
-
-       set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg);
+       account_pair = find_transport_from_message_sender (priv->from_field_protos, msg);
+       if (account_pair == NULL) {
+               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);
+
+       priv->original_account_name = account_pair ? (const gchar *) account_pair->first : NULL;
+
+       parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new ();
+       menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE);
+       toolbar_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_TOOLBAR, TRUE);
+       clipboard_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_CLIPBOARD, FALSE);
+       /* Add common dimming rules */
+       modest_dimming_rules_group_add_rules (menu_rules_group, 
+                                             modest_msg_edit_window_menu_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_edit_window_menu_dimming_entries),
+                                             MODEST_WINDOW (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);
+       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);
-       gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
+       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;
+
+       modest_msg_edit_window_set_modified (MODEST_MSG_EDIT_WINDOW (obj), FALSE);
+
+       /* Track account-removed signal, this window should be closed
+          in the case we're creating a mail associated to the account
+          that is deleted */
+       priv->account_removed_handler_id = 
+               g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
+                                 "account_removed",
+                                 G_CALLBACK(on_account_removed),
+                                 obj);
        
-       return (ModestWindow*)obj;
+       return (ModestWindow*) obj;
 }
 
 static gint
@@ -832,6 +1598,9 @@ get_formatted_data_cb (const gchar *buffer, gpointer user_data)
        return 0;
 }
 
+/**
+ * @result: A new string which should be freed with g_free().
+ */
 static gchar *
 get_formatted_data (ModestMsgEditWindow *edit_window)
 {
@@ -842,6 +1611,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);
                                                                        
 }
@@ -851,9 +1622,8 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
 {
        MsgData *data;
        const gchar *account_name;
-       GtkTextBuffer *buf;
-       GtkTextIter b, e;
        ModestMsgEditWindowPrivate *priv;
+       TnyIterator *att_iter;
        
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window), NULL);
 
@@ -862,40 +1632,146 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        account_name = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
        g_return_val_if_fail (account_name, NULL);
        
-       buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));        
-       gtk_text_buffer_get_bounds (buf, &b, &e);
        
        /* don't free these (except from) */
        data = g_slice_new0 (MsgData);
        data->from    =  modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
                                                             account_name);
-       data->to      =  (gchar*) modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR(priv->to_field));
-       data->cc      =  (gchar*) modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR(priv->cc_field));
-       data->bcc     =  (gchar*) modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR(priv->bcc_field));
-       data->subject =  (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->subject_field));  
-       data->plain_body =  (gchar *) gtk_text_buffer_get_text (priv->text_buffer, &b, &e, FALSE);
+       data->account_name = g_strdup (account_name);
+       data->to      =  g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->to_field)));
+       data->cc      =  g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field)));
+       data->bcc     =  g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->bcc_field)));
+       data->subject =  g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->subject_field)));
+       if (priv->draft_msg) {
+               data->draft_msg = g_object_ref (priv->draft_msg);
+       } else if (priv->outbox_msg) {
+               data->draft_msg = g_object_ref (priv->outbox_msg);
+       } else {
+               data->draft_msg = NULL;
+       }
+
+       GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
+       GtkTextIter b, e;
+       gtk_text_buffer_get_bounds (buf, &b, &e);
+       data->plain_body = modest_text_utils_text_buffer_get_text (priv->text_buffer); /* returns a copy */
+
        if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)))
-               data->html_body = get_formatted_data (edit_window);
+               data->html_body = get_formatted_data (edit_window); /* returns a copy. */
        else
                data->html_body = NULL;
-       data->attachments = priv->attachments;
+
+       /* deep-copy the data */
+       att_iter = tny_list_create_iterator (priv->attachments);
+       data->attachments = NULL;
+       while (!tny_iterator_is_done (att_iter)) {
+               TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (att_iter);
+               if (!(TNY_IS_MIME_PART(part))) {
+                       g_warning ("strange data in attachment list");
+                       g_object_unref (part);
+                       tny_iterator_next (att_iter);
+                       continue;
+               }
+               data->attachments = g_list_append (data->attachments,
+                                                  part);
+               tny_iterator_next (att_iter);
+       }
+       g_object_unref (att_iter);
+
+       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;
 
        return data;
 }
 
+
+static void
+unref_gobject (GObject *obj, gpointer data)
+{
+       if (!G_IS_OBJECT(obj))
+               return;
+       g_object_unref (obj);
+}
+
 void 
 modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
                                                      MsgData *data)
 {
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window));
 
+       if (!data)
+               return;
+
+       g_free (data->to);
+       g_free (data->cc);
+       g_free (data->bcc);
        g_free (data->from);
-       g_free (data->html_body);
+       g_free (data->subject);
        g_free (data->plain_body);
+       g_free (data->html_body);
+       g_free (data->account_name);
+       
+       if (data->draft_msg != NULL) {
+               g_object_unref (data->draft_msg);
+               data->draft_msg = NULL;
+       }
+       
+       g_list_foreach (data->attachments, (GFunc)unref_gobject,  NULL);
+       g_list_free (data->attachments);
+       g_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)
 {
@@ -983,7 +1859,7 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self,
 
        buffer_format->cs.bold = ((buffer_format->bold&0x1) != (current_format->bold&0x1));
        buffer_format->cs.italic = ((buffer_format->italic&0x1) != (current_format->italic&0x1));
-       buffer_format->cs.color = gdk_color_equal(&(buffer_format->color), &(current_format->color));
+       buffer_format->cs.color = !gdk_color_equal(&(buffer_format->color), &(current_format->color));
        buffer_format->cs.font_size =  (buffer_format->font_size != current_format->font_size);
        buffer_format->cs.font = (buffer_format->font != current_format->font);
        buffer_format->cs.justification = (buffer_format->justification != current_format->justification);
@@ -991,27 +1867,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_BOLD, (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;
@@ -1019,40 +1902,23 @@ 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_BOLD, (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));
+               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); */
-       wp_text_buffer_thaw (WP_TEXT_BUFFER (priv->text_buffer));
-
+       
+       text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), self);
+       
        g_free (current_format);
 
 }
 
 static void
-toggle_action_set_active_block_notify (GtkToggleAction *action,
-                                      gboolean value)
-{
-       GSList *proxies = NULL;
-
-       for (proxies = gtk_action_get_proxies (GTK_ACTION (action));
-            proxies != NULL; proxies = g_slist_next (proxies)) {
-               GtkWidget *widget = (GtkWidget *) proxies->data;
-               gtk_action_block_activate_from (GTK_ACTION (action), widget);
-       }
-
-       gtk_toggle_action_set_active (action, value);
-
-       for (proxies = gtk_action_get_proxies (GTK_ACTION (action));
-            proxies != NULL; proxies = g_slist_next (proxies)) {
-               GtkWidget *widget = (GtkWidget *) proxies->data;
-               gtk_action_unblock_activate_from (GTK_ACTION (action), widget);
-       }
-}
-
-static void
 text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *window)
 {
        WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
@@ -1068,24 +1934,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)))
-                       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)))
-                       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");
-       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");
-       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");
-       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/AlignmentMenu/AlignmentLeftMenu");
+               break;
+       case GTK_JUSTIFY_CENTER:
+               action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentCenterMenu");
+               break;
+       case GTK_JUSTIFY_RIGHT:
+               action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/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);
@@ -1101,7 +1986,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),
@@ -1136,6 +2021,7 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
 
 }
 
+#ifdef MODEST_HILDON_VERSION_0
 void
 modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
 {
@@ -1144,30 +2030,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);
        
        dialog = hildon_color_selector_new (GTK_WINDOW (window));
-       hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), & (buffer_format->color));
+       hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), &(buffer_format->color));
        g_free (buffer_format);
 
-       response = gtk_dialog_run (GTK_DIALOG (dialog));
-       switch (response) {
-       case GTK_RESPONSE_OK:
+       if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) {
                new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
-               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)
 {
@@ -1175,28 +2057,92 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
        ModestMsgEditWindowPrivate *priv;
        GtkWidget *dialog = NULL;
        gint response;
-       const GdkColor *old_color = NULL;
+       GdkColor *old_color = NULL;
        const GdkColor *new_color = NULL;
        
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       old_color = wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer));
+       old_color = (GdkColor*)wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer));
        
        dialog = hildon_color_selector_new (GTK_WINDOW (window));
-       hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), (GdkColor *) old_color);
+       hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog),(GdkColor*)old_color);
 
-       response = gtk_dialog_run (GTK_DIALOG (dialog));
-       switch (response) {
-       case GTK_RESPONSE_OK:
+       if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) {
                new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
-               break;
-       default:
-               break;
+               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);
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR,
+                                             (gpointer) &col);
+       }
+       gtk_widget_destroy (dialog);
+}
+
+
+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*/
 
-       if (new_color != NULL)
-               wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), new_color);
 
+
+static TnyStream* create_stream_for_uri (const gchar* uri)
+{
+       if (!uri)
+               return NULL;
+               
+       TnyStream *result = NULL;
+
+       GnomeVFSHandle *handle = NULL;
+       GnomeVFSResult test = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+       if (test == GNOME_VFS_OK) {
+               /* Create the tinymail stream: */
+               /* Presumably tinymai will call gnome_vfs_close (handle) later. */
+               result = TNY_STREAM (tny_vfs_stream_new (handle));
+       }
+       
+       return result;
 }
 
 void
@@ -1206,92 +2152,301 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
        ModestMsgEditWindowPrivate *priv;
        GtkWidget *dialog = NULL;
        gint response = 0;
-       gchar *filename = NULL;
+       GSList *uris = NULL;
+       GSList *uri_node = NULL;
        
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        
        dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN);
+       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ia_select_inline_image_title"));
+       gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
+
+       modest_maemo_utils_setup_images_filechooser (GTK_FILE_CHOOSER (dialog));
 
        response = gtk_dialog_run (GTK_DIALOG (dialog));
        switch (response) {
        case GTK_RESPONSE_OK:
-               filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+               uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog));
                break;
        default:
                break;
        }
        gtk_widget_destroy (dialog);
 
-       if (filename) {
-               GdkPixbuf *pixbuf = NULL;
+       for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) {
+               const gchar *uri;
+               GnomeVFSHandle *handle = NULL;
+               GnomeVFSResult result;
                GtkTextIter position;
                GtkTextMark *insert_mark;
 
-               pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-               if (pixbuf) {
-                       gint image_file_id;
-                       GdkPixbufFormat *pixbuf_format;
-
-                       image_file_id = g_open (filename, O_RDONLY, 0);
-                       pixbuf_format = gdk_pixbuf_get_file_info (filename, NULL, NULL);
-                       if ((image_file_id != -1)&&(pixbuf_format != NULL)) {
-                               TnyMimePart *image_part;
-                               TnyStream *image_stream;
-                               gchar **mime_types;
-                               gchar *mime_type;
-                               gchar *basename;
-                               gchar *content_id;
-
-                               mime_types = gdk_pixbuf_format_get_mime_types (pixbuf_format);
-                               if ((mime_types != NULL) && (mime_types[0] != NULL)) {
-                                       mime_type = mime_types[0];
-                               } else {
-                                       mime_type = "image/unknown";
-                               }
-                               image_part = tny_platform_factory_new_mime_part
-                                       (modest_runtime_get_platform_factory ());
-                               image_stream = TNY_STREAM (tny_fs_stream_new (image_file_id));
-
-                               tny_mime_part_construct_from_stream (image_part, image_stream, mime_type);
-                               g_strfreev (mime_types);
-
-                               content_id = g_strdup_printf ("%d", priv->last_cid);
-                               tny_mime_part_set_content_id (image_part, content_id);
-                               g_free (content_id);
-                               priv->last_cid++;
-
-                               basename = g_path_get_basename (filename);
-                               tny_mime_part_set_filename (image_part, basename);
-                               g_free (basename);
+               uri = (const gchar *) uri_node->data;
+               result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+               if (result == GNOME_VFS_OK) {
+                       GdkPixbuf *pixbuf;
+                       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);
+
+                       escaped_filename = g_path_get_basename (gnome_vfs_uri_get_path (vfs_uri));
+                       filename = gnome_vfs_unescape_string_for_display (escaped_filename);
+                       g_free (escaped_filename);
+                       gnome_vfs_uri_unref (vfs_uri);
+                       info = gnome_vfs_file_info_new ();
+
+                       if (gnome_vfs_get_file_info (uri, info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE
+                                                    | GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE) 
+                           == GNOME_VFS_OK)
+                               mime_type = gnome_vfs_file_info_get_mime_type (info);
+
+                       mime_part = tny_platform_factory_new_mime_part
+                               (modest_runtime_get_platform_factory ());
                                
+                       TnyStream *stream = create_stream_for_uri (uri);
+                       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);
+                       g_free (content_id);
+                       priv->last_cid++;
+                       
+                       basename = g_path_get_basename (filename);
+                       tny_mime_part_set_filename (mime_part, basename);
+                       g_free (basename);
+
+                       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 (image_part)), pixbuf);
-                               priv->attachments = g_list_prepend (priv->attachments, image_part);
-                               modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
-                                                                       image_part);
-                               gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
-                               gtk_widget_show_all (priv->attachments_caption);
-                       } else if (image_file_id == -1) {
-                               close (image_file_id);
-                       }
+                               wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (mime_part)), pixbuf);
+                       } 
+
+                       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);
+
                }
        }
 
 
 }
 
-static void
+void
+modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window)
+{      
+       GtkWidget *dialog = NULL;
+       gint response = 0;
+       GSList *uris = NULL;
+       GSList *uri_node;
+       
+       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);
+
+       response = gtk_dialog_run (GTK_DIALOG (dialog));
+       switch (response) {
+       case GTK_RESPONSE_OK:
+               uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog));
+               break;
+       default:
+               break;
+       }
+       gtk_widget_destroy (dialog);
+
+       for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) {
+               const gchar *uri = (const gchar *) uri_node->data;
+               modest_msg_edit_window_attach_file_one (window, uri);
+       }
+       g_slist_foreach (uris, (GFunc) g_free, NULL);
+       g_slist_free (uris);
+}
+
+void
+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);
+               
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       
+       result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+       if (result == GNOME_VFS_OK) {
+               TnyMimePart *mime_part;
+               TnyStream *stream;
+               const gchar *mime_type = NULL;
+               gchar *basename;
+               gchar *escaped_filename;
+               gchar *filename;
+               gchar *content_id;
+               GnomeVFSFileInfo *info;
+               GnomeVFSURI *vfs_uri;
+
+               vfs_uri = gnome_vfs_uri_new (uri);
+               
+
+               escaped_filename = g_path_get_basename (gnome_vfs_uri_get_path (vfs_uri));
+               filename = gnome_vfs_unescape_string_for_display (escaped_filename);
+               g_free (escaped_filename);
+               gnome_vfs_uri_unref (vfs_uri);
+
+               info = gnome_vfs_file_info_new ();
+               
+               if (gnome_vfs_get_file_info (uri, 
+                                            info, 
+                                            GNOME_VFS_FILE_INFO_GET_MIME_TYPE)
+                   == GNOME_VFS_OK)
+                       mime_type = gnome_vfs_file_info_get_mime_type (info);
+               mime_part = tny_platform_factory_new_mime_part
+                       (modest_runtime_get_platform_factory ());
+               stream = TNY_STREAM (tny_vfs_stream_new (handle));
+               
+               tny_mime_part_construct (mime_part, stream, mime_type, "base64");
+
+               g_object_unref (stream);
+               
+               content_id = g_strdup_printf ("%d", priv->last_cid);
+               tny_mime_part_set_content_id (mime_part, content_id);
+               g_free (content_id);
+               priv->last_cid++;
+               
+               basename = g_path_get_basename (filename);
+               tny_mime_part_set_filename (mime_part, basename);
+               g_free (basename);
+               
+               tny_list_prepend (priv->attachments, (GObject *) mime_part);
+               modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                                       mime_part,
+                                                       info->size == 0, info->size);
+               gtk_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,
+                                          TnyList *att_list)
+{
+       ModestMsgEditWindowPrivate *priv;
+       TnyIterator *iter;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       if (att_list == NULL) {
+               att_list = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+       } else {
+               g_object_ref (att_list);
+       }
+
+       if (tny_list_get_length (att_list) == 0) {
+               hildon_banner_show_information (NULL, NULL, _("TODO: no attachments selected to remove"));
+       } else {
+               GtkWidget *confirmation_dialog = NULL;
+               gboolean dialog_response;
+               gchar *message = NULL;
+               gchar *filename = NULL;
+
+               if (tny_list_get_length (att_list) == 1) {
+                       TnyMimePart *part;
+                       iter = tny_list_create_iterator (att_list);
+                       part = (TnyMimePart *) tny_iterator_get_current (iter);
+                       g_object_unref (iter);
+                       if (TNY_IS_MSG (part)) {
+                               TnyHeader *header = tny_msg_get_header (TNY_MSG (part));
+                               if (header) {
+                                       filename = 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 = g_strdup ("");
+               }
+               message = g_strdup_printf (ngettext("emev_nc_delete_attachment", "emev_nc_delete_attachments",
+                                                   (tny_list_get_length (att_list) == 1)), filename);
+               g_free (filename);
+               confirmation_dialog = 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) {
+                       g_object_unref (att_list);
+                       return;
+               }
+               hildon_banner_show_information (NULL, NULL, _("mcen_ib_removing_attachment"));
+               
+               for (iter = tny_list_create_iterator (att_list);
+                    !tny_iterator_is_done (iter);
+                    tny_iterator_next (iter)) {
+                       TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter);
+                       const gchar *att_id;
+                       tny_list_remove (priv->attachments, (GObject *) mime_part);
+
+                       modest_attachments_view_remove_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                                                  mime_part);
+                       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);
+                       gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+                       g_object_unref (mime_part);
+               }
+               g_object_unref (iter);
+       }
+
+       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
 modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window,
                                            gpointer userdata)
 {
        ModestMsgEditWindowPrivate *priv;
        GdkColor *new_color;
-
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       
+#ifdef MODEST_HAVE_HILDON0_WIDGETS     
        new_color = hildon_color_button_get_color (HILDON_COLOR_BUTTON (priv->font_color_button));
+#else 
+       GdkColor col;
+       hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), &col);
+       new_color = &col;
+#endif /*#ifdef MODEST_HAVE_HILDON0_WIDGETS*/
 
        wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) new_color);
+       
        gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body);
 
 }
@@ -1311,17 +2466,26 @@ modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item,
 
        if (gtk_check_menu_item_get_active (menu_item)) {
                gchar *markup;
+               WPTextBufferFormat format;
+
+               memset (&format, 0, sizeof (format));
+               wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), &format, FALSE);
 
                label = gtk_bin_get_child (GTK_BIN (menu_item));
                
                new_size_index = atoi (gtk_label_get_text (GTK_LABEL (label)));
-
-               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)))
+               format.cs.font_size = TRUE;
+               format.cs.text_position = TRUE;
+               format.cs.font = TRUE;
+               format.font_size = wp_get_font_size_index (new_size_index, DEFAULT_FONT_SIZE);
+/*             wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &format); */
+
+               if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE,
+                                                  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='Serif'>", gtk_label_get_text (GTK_LABEL (label)), "</span>", NULL);
+               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);
        }
@@ -1348,7 +2512,7 @@ modest_msg_edit_window_font_change (GtkCheckMenuItem *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(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));
@@ -1358,83 +2522,6 @@ modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item,
        }
 }
 
-static void
-modest_msg_edit_window_set_zoom (ModestWindow *window,
-                                gdouble zoom)
-{
-       ModestMsgEditWindowPrivate *priv;
-     
-       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
-
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       priv->zoom_level = zoom;
-       wp_text_buffer_set_font_scaling_factor (WP_TEXT_BUFFER (priv->text_buffer), zoom);
-}
-
-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
-modest_msg_edit_window_zoom_plus (ModestWindow *window)
-{
-       ModestWindowPrivate *parent_priv;
-       GtkRadioAction *zoom_radio_action;
-       GSList *group, *node;
-
-       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, _("mcen_ib_max_zoom_level"));
-               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;
-               }
-       }
-       return FALSE;
-}
-
-static gboolean
-modest_msg_edit_window_zoom_minus (ModestWindow *window)
-{
-       ModestWindowPrivate *parent_priv;
-       GtkRadioAction *zoom_radio_action;
-       GSList *group, *node;
-
-       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, _("mcen_ib_min_zoom_level"));
-                       break;
-               }
-       }
-       return FALSE;
-}
-
 static gboolean
 modest_msg_edit_window_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer userdata)
 {
@@ -1461,20 +2548,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)
 {
@@ -1482,10 +2555,16 @@ modest_msg_edit_window_show_cc (ModestMsgEditWindow *window,
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       if (!priv->update_caption_visibility)
+               return;
+
+       gtk_widget_set_no_show_all (priv->cc_caption, TRUE);
        if (show)
                gtk_widget_show (priv->cc_caption);
        else
                gtk_widget_hide (priv->cc_caption);
+
+       modest_conf_set_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, show, NULL);
 }
 
 void
@@ -1496,10 +2575,16 @@ modest_msg_edit_window_show_bcc (ModestMsgEditWindow *window,
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       if (!priv->update_caption_visibility)
+               return;
+
+       gtk_widget_set_no_show_all (priv->bcc_caption, TRUE);
        if (show)
                gtk_widget_show (priv->bcc_caption);
        else
                gtk_widget_hide (priv->bcc_caption);
+
+       modest_conf_set_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, show, NULL);
 }
 
 static void
@@ -1516,12 +2601,26 @@ modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window,
                GtkWidget *view_focus;
                view_focus = gtk_window_get_focus (GTK_WINDOW (window));
 
-               if (gtk_widget_get_parent (view_focus) && 
-                   MODEST_IS_RECPT_EDITOR (gtk_widget_get_parent (view_focus))) {
-                       editor = MODEST_RECPT_EDITOR (gtk_widget_get_parent (view_focus));
-               } else {
-                       editor = MODEST_RECPT_EDITOR (priv->to_field);
+               /* This code should be kept in sync with ModestRecptEditor. The
+                  textview inside the recpt editor is the one that really gets the
+                  focus. As it's inside a scrolled window, and this one inside the
+                  hbox recpt editor inherits from, we'll need to go up in the 
+                  hierarchy to know if the text view is part of the recpt editor
+                  or if it's a different text entry */
+
+               if (gtk_widget_get_parent (view_focus)) {
+                       GtkWidget *first_parent;
+
+                       first_parent = gtk_widget_get_parent (view_focus);
+                       if (gtk_widget_get_parent (first_parent) && 
+                           MODEST_IS_RECPT_EDITOR (gtk_widget_get_parent (first_parent))) {
+                               editor = MODEST_RECPT_EDITOR (gtk_widget_get_parent (first_parent));
+                       }
                }
+
+               if (editor == NULL)
+                       editor = MODEST_RECPT_EDITOR (priv->to_field);
+
        }
 
        modest_address_book_select_addresses (editor);
@@ -1531,36 +2630,44 @@ modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window,
 void
 modest_msg_edit_window_select_contacts (ModestMsgEditWindow *window)
 {
-       GtkWidget *focused;
-       ModestMsgEditWindowPrivate *priv;
-
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       focused = gtk_window_get_focus (GTK_WINDOW (window));
 
-       if (MODEST_IS_RECPT_EDITOR (focused)) {
-               modest_msg_edit_window_open_addressbook (window, MODEST_RECPT_EDITOR (focused));
-       } else {
-               modest_msg_edit_window_open_addressbook (window, MODEST_RECPT_EDITOR (priv->to_field));
-       }
-       
+       modest_msg_edit_window_open_addressbook (window, NULL);
 }
+
 static void
 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
@@ -1568,13 +2675,15 @@ modest_msg_edit_window_set_priority_flags (ModestMsgEditWindow *window,
                                           TnyHeaderFlags priority_flags)
 {
        ModestMsgEditWindowPrivate *priv;
+       ModestWindowPrivate *parent_priv;
 
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       priority_flags = priority_flags & (TNY_HEADER_FLAG_HIGH_PRIORITY);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
 
        if (priv->priority_flags != priority_flags) {
+               GtkAction *priority_action = NULL;
 
                priv->priority_flags = priority_flags;
 
@@ -1582,15 +2691,23 @@ modest_msg_edit_window_set_priority_flags (ModestMsgEditWindow *window,
                case TNY_HEADER_FLAG_HIGH_PRIORITY:
                        gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), "qgn_list_messaging_high", GTK_ICON_SIZE_MENU);
                        gtk_widget_show (priv->priority_icon);
+                       priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                                                                    "/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityHighMenu");
                        break;
                case TNY_HEADER_FLAG_LOW_PRIORITY:
                        gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), "qgn_list_messaging_low", GTK_ICON_SIZE_MENU);
                        gtk_widget_show (priv->priority_icon);
+                       priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                                                                    "/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityLowMenu");
                        break;
                default:
                        gtk_widget_hide (priv->priority_icon);
+                       priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                                                                    "/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityNormalMenu");
                        break;
                }
+               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priority_action), TRUE);
+               gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
        }
 }
 
@@ -1599,10 +2716,12 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
                                        gint file_format)
 {
        ModestMsgEditWindowPrivate *priv;
+       ModestWindowPrivate *parent_priv;
        gint current_format;
 
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
        current_format = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))
@@ -1612,6 +2731,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:
                {
@@ -1620,12 +2740,16 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
                        dialog = hildon_note_new_confirmation (NULL, _("emev_nc_formatting_lost"));
                        response = gtk_dialog_run (GTK_DIALOG (dialog));
                        gtk_widget_destroy (dialog);
-                       if (response == GTK_RESPONSE_OK)
+                       if (response == GTK_RESPONSE_OK) {
                                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_utils_toggle_action_set_active_block_notify (action, TRUE);
+                       }
                }
                        break;
                }
-               update_dimmed (window);
+               modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
        }
 }
 
@@ -1650,11 +2774,10 @@ modest_msg_edit_window_select_font (ModestMsgEditWindow *window)
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        
-       dialog = hildon_font_selection_dialog_new (NULL, NULL);
+       dialog = hildon_font_selection_dialog_new (GTK_WINDOW (window), NULL);
 
        /* First we get the currently selected font information */
        wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), &oldfmt, TRUE);
-       g_object_set (G_OBJECT (dialog), "font-scaling", priv->zoom_level, NULL);
 
        switch (oldfmt.text_position) {
        case TEXT_POSITION_NORMAL:
@@ -1712,8 +2835,6 @@ modest_msg_edit_window_select_font (ModestMsgEditWindow *window)
                
        }       
 
-       gtk_widget_destroy (dialog);
-       
        if (response == GTK_RESPONSE_OK) {
                memset(&fmt, 0, sizeof(fmt));
                if (bold_set) {
@@ -1740,12 +2861,12 @@ 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;
                        fmt.cs.color = TRUE;
                }
-               gdk_color_free(color);
                if (font_set) {
                        fmt.font = wp_get_font_index(font_name,
                                                     DEFAULT_FONT);
@@ -1753,14 +2874,15 @@ 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);
                }
-               gtk_widget_grab_focus(GTK_WIDGET(priv->msg_body));
                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);
+       
+       gtk_widget_grab_focus(GTK_WIDGET(priv->msg_body));
 }
 
 void
@@ -1773,53 +2895,715 @@ 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));
 
 }
 
+void
+modest_msg_edit_window_redo (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       
+       wp_text_buffer_redo (WP_TEXT_BUFFER (priv->text_buffer));
+
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
+
+}
+
+static void  
+text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       priv->can_undo = can_undo;
+}
+
+static void  
+text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       priv->can_redo = can_redo;
+}
+
+gboolean            
+modest_msg_edit_window_can_undo (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       return priv->can_undo;
+}
+
+gboolean            
+modest_msg_edit_window_can_redo (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       return priv->can_redo;
+}
+
+
 static void
-update_dimmed (ModestMsgEditWindow *window)
+text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id)
+{
+       GtkTextIter iter;
+       GtkTextIter match_start, match_end;
+
+       if (image_id == NULL)
+               return;
+
+       gtk_text_buffer_get_start_iter (buffer, &iter);
+
+       while (gtk_text_iter_forward_search (&iter, "\xef\xbf\xbc", 0, &match_start, &match_end, NULL)) {
+               GSList *tags = gtk_text_iter_get_tags (&match_start);
+               GSList *node;
+               for (node = tags; node != NULL; node = g_slist_next (node)) {
+                       GtkTextTag *tag = (GtkTextTag *) node->data;
+                       if (g_object_get_data (G_OBJECT (tag), "image-set") != NULL) {
+                               gchar *cur_image_id = g_object_get_data (G_OBJECT (tag), "image-index");
+                               if ((cur_image_id != NULL) && (strcmp (image_id, cur_image_id)==0)) {
+                                       gint offset;
+                                       offset = gtk_text_iter_get_offset (&match_start);
+                                       gtk_text_buffer_delete (buffer, &match_start, &match_end);
+                                       gtk_text_buffer_get_iter_at_offset (buffer, &iter, offset);
+                               }
+                       }
+               }
+               gtk_text_iter_forward_char (&iter);
+       }
+}
+
+gboolean
+message_is_empty (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       /** TODO: Add wpeditor API to tell us if there is any _visible_ text,
+        * so we can ignore markup.
+        */
+       GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
+       gint count = 0;
+       if (buf)
+               count = gtk_text_buffer_get_char_count (buf);
+
+       return count == 0;
+}
+
+static gboolean
+msg_body_focus (GtkWidget *focus,
+               GdkEventFocus *event,
+               gpointer 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;
+}
+
+static void
+recpt_field_changed (GtkTextBuffer *buffer,
+                 ModestMsgEditWindow *editor)
+{
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (editor));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (editor));
+}
+
+static void
+body_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor)
+{
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (editor));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (editor));
+}
+
+void
+modest_msg_edit_window_set_modified (ModestMsgEditWindow *editor,
+                                    gboolean modified)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
+       GtkTextBuffer *buffer;
+
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->to_field));
+       gtk_text_buffer_set_modified (buffer, modified);
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->cc_field));
+       gtk_text_buffer_set_modified (buffer, modified);
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->bcc_field));
+       gtk_text_buffer_set_modified (buffer, modified);
+       gtk_text_buffer_set_modified (priv->text_buffer, modified);
+}
+
+gboolean
+modest_msg_edit_window_is_modified (ModestMsgEditWindow *editor)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
+       const char *account_name;
+       GtkTextBuffer *buffer;
+
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->to_field));
+       if (gtk_text_buffer_get_modified (buffer))
+               return TRUE;
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->cc_field));
+       if (gtk_text_buffer_get_modified (buffer))
+               return TRUE;
+       buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->bcc_field));
+       if (gtk_text_buffer_get_modified (buffer))
+               return TRUE;
+       if (gtk_text_buffer_get_modified (priv->text_buffer))
+               return TRUE;
+       account_name = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
+       if (!priv->original_account_name || strcmp(account_name, priv->original_account_name)) {
+               return TRUE;
+       }
+
+       return FALSE;
+}
+
+
+
+
+gboolean
+modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+       
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       /* check if there's no recipient added */
+       if ((gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))) == 0) &&
+           (gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))) == 0) &&
+           (gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field))) == 0)) {
+               /* no recipient contents, then select contacts */
+               modest_msg_edit_window_open_addressbook (window, NULL);
+               return FALSE;
+       }
+
+       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),  add_to_addressbook)) {
+               modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
+               return FALSE;
+       }
+       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field),  add_to_addressbook)) {
+               modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field));
+               return FALSE;
+       }
+       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), add_to_addressbook)) {
+               modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field));
+               return FALSE;
+       }
+
+       if (!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->cc_field)) &&
+           !modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->bcc_field)))
+               modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
+
+       return TRUE;
+
+}
+
+static void
+modest_msg_edit_window_add_attachment_clicked (GtkButton *button,
+                                              ModestMsgEditWindow *window)
+{
+       modest_msg_edit_window_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)
 {
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-       GtkAction *action;
-       GtkWidget *widget;
-       gboolean rich_text;
+       GtkClipboard *selection_clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+       gchar *text = NULL;
+       if (!GTK_WIDGET_VISIBLE (window))
+               return;
 
-       rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+       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;
+
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
+}
+
+static void 
+update_window_title (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+       const gchar *subject;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       subject = gtk_entry_get_text (GTK_ENTRY (priv->subject_field));
+       if (subject == NULL || subject[0] == '\0')
+               subject = _("mail_va_new_email");
+
+       gtk_window_set_title (GTK_WINDOW (window), subject);
 
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/SelectFontMenu");
-       gtk_action_set_sensitive (action, rich_text);
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu");
-       gtk_action_set_sensitive (action, rich_text);
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu");
-       gtk_action_set_sensitive (action, rich_text);
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentLeftMenu");
-       gtk_action_set_sensitive (action, rich_text);
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentCenterMenu");
-       gtk_action_set_sensitive (action, rich_text);
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentRightMenu");
-       gtk_action_set_sensitive (action, rich_text);
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/InsertImageMenu");
-       gtk_action_set_sensitive (action, rich_text);
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsBold");
-       gtk_action_set_sensitive (action, rich_text);
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsItalics");
-       gtk_action_set_sensitive (action, rich_text);
-       widget = priv->font_color_button;
-       gtk_widget_set_sensitive (widget, rich_text);
-       widget = priv->font_size_toolitem;
-       gtk_widget_set_sensitive (widget, rich_text);
-       widget = priv->font_face_toolitem;
-       gtk_widget_set_sensitive (widget, rich_text);
 }
 
 static void  
-text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window)
+subject_field_changed (GtkEditable *editable, 
+                      ModestMsgEditWindow *window)
 {
-       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-       GtkAction *action;
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       update_window_title (window);
+       gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
+}
+
+static void  
+subject_field_insert_text (GtkEditable *editable, 
+                          gchar *new_text,
+                          gint new_text_length,
+                          gint *position,
+                          ModestMsgEditWindow *window)
+{
+       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);
+               /* Invalid unichar, stop */
+               if (c == -1)
+                       break;
+               /* a bullet */
+               if (c == 0x2022)
+                       continue;
+               result = g_string_append_unichar (result, c);
+               result_len++;
+       }
+
+       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) result->len,
+                                              (gpointer) position, (gpointer) window);
+                      g_signal_handlers_unblock_by_func(G_OBJECT(editable), G_CALLBACK(subject_field_insert_text), window);
+               }
+       }
 
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/UndoMenu");
-       gtk_action_set_sensitive (action, can_undo);
+       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)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       gtk_widget_set_no_show_all (priv->find_toolbar, FALSE);
+
+       if (show) {
+               gtk_widget_show_all (priv->find_toolbar);
+               hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
+       } else {
+               gtk_widget_hide_all (priv->find_toolbar);
+               gtk_widget_grab_focus (priv->msg_body);
+       }
+    
+}
+
+static gboolean 
+gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter,
+                                         const gchar *str,
+                                         GtkTextIter *match_start,
+                                         GtkTextIter *match_end)
+{
+       GtkTextIter end_iter;
+       gchar *str_casefold;
+       gint str_chars_n;
+       gchar *range_text;
+       gchar *range_casefold;
+       gint offset;
+       gint range_chars_n;
+       gboolean result = FALSE;
+
+       if (str == NULL)
+               return TRUE;
+       
+       /* get end iter */
+       end_iter = *iter;
+       gtk_text_iter_forward_to_end (&end_iter);
+
+       str_casefold = g_utf8_casefold (str, -1);
+       str_chars_n = strlen (str);
+
+       range_text = gtk_text_iter_get_visible_text (iter, &end_iter);
+       range_casefold = g_utf8_casefold (range_text, -1);
+       range_chars_n = strlen (range_casefold);
+
+       if (range_chars_n < str_chars_n) {
+               g_free (str_casefold);
+               g_free (range_text);
+               g_free (range_casefold);
+               return FALSE;
+       }
+
+       for (offset = 0; offset <= range_chars_n - str_chars_n; offset++) {
+               gchar *range_subtext = g_strndup (range_casefold + offset, str_chars_n);
+               if (!g_utf8_collate (range_subtext, str_casefold)) {
+                       gchar *found_text = g_strndup (range_text + offset, str_chars_n);
+                       result = TRUE;
+                       gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY,
+                                                     match_start, match_end, NULL);
+                       g_free (found_text);
+               }
+               g_free (range_subtext);
+               if (result)
+                       break;
+       }
+       g_free (str_casefold);
+       g_free (range_text);
+       g_free (range_casefold);
+
+       return result;
+}
+
+
+static void 
+modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
+                                           ModestMsgEditWindow *window)
+{
+       gchar *current_search = NULL;
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       gboolean result;
+       GtkTextIter selection_start, selection_end;
+       GtkTextIter match_start, match_end;
+       gboolean continue_search = FALSE;
+
+       if (message_is_empty (window)) {
+               g_free (priv->last_search);
+               priv->last_search = NULL;
+               hildon_banner_show_information (GTK_WIDGET (window), NULL, _("mail_ib_nothing_to_find"));
+               return;
+       }
+
+       g_object_get (G_OBJECT (widget), "prefix", &current_search, NULL);
+       if ((current_search == NULL) || (strcmp (current_search, "") == 0)) {
+               g_free (current_search);
+               g_free (priv->last_search);
+               priv->last_search = NULL;
+               /* Information banner about empty search */
+               hildon_banner_show_information (NULL, NULL, dgettext ("hildon-common-strings", "ecdg_ib_find_rep_enter_text"));
+               return;
+       }
+
+       if ((priv->last_search != NULL)&&(!strcmp (current_search, priv->last_search))) {
+               continue_search = TRUE;
+       } else {
+               g_free (priv->last_search);
+               priv->last_search = g_strdup (current_search);
+       }
+
+       if (continue_search) {
+               gtk_text_buffer_get_selection_bounds (priv->text_buffer, &selection_start, &selection_end);
+               result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, 
+                                                                  &match_start, &match_end);
+               if (!result)
+                       hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_search_complete"));
+       } else {
+               GtkTextIter buffer_start;
+               gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start);
+               result = gtk_text_iter_forward_search_insensitive (&buffer_start, current_search, 
+                                                                  &match_start, &match_end);
+               if (!result)
+                       hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_no_matches"));
+       }
+
+       /* Mark as selected the string found in search */
+       if (result) {
+               gtk_text_buffer_select_range (priv->text_buffer, &match_start, &match_end);
+               gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (priv->msg_body), &match_start, 0.0, TRUE, 0.0, 0.0);
+               correct_scroll_without_drag_check (MODEST_MSG_EDIT_WINDOW (window), FALSE);
+       } else {
+               g_free (priv->last_search);
+               priv->last_search = NULL;
+       }
+       g_free (current_search);
+}
+
+static void
+modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
+                                          ModestMsgEditWindow *window)
+{
+       GtkToggleAction *toggle;
+       ModestWindowPrivate *parent_priv;
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+       toggle = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/FindInMessageMenu"));
+       gtk_toggle_action_set_active (toggle, FALSE);
+}
+
+gboolean 
+modest_msg_edit_window_get_sent (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
+       return priv->sent;
+}
+
+void 
+modest_msg_edit_window_set_sent (ModestMsgEditWindow *window, 
+                                gboolean sent)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
+       priv->sent = sent;
+}
+
+
+void            
+modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
+                                 TnyMsg *draft)
+{
+       ModestMsgEditWindowPrivate *priv;
+       TnyHeader *header = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       g_return_if_fail ((draft == NULL)||(TNY_IS_MSG (draft)));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+
+       if (priv->draft_msg != NULL) {
+               g_object_unref (priv->draft_msg);
+       }
+
+       if (draft != NULL) {
+               g_object_ref (draft);
+               header = tny_msg_get_header (draft);
+               if (priv->msg_uid) {
+                       g_free (priv->msg_uid);
+                       priv->msg_uid = NULL;
+               }
+               priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
+               if (GTK_WIDGET_REALIZED (window))
+                       modest_window_mgr_register_window (mgr, MODEST_WINDOW (window));
+       }
+
+       priv->draft_msg = draft;
+}
+
+static void  
+text_buffer_apply_tag (GtkTextBuffer *buffer, GtkTextTag *tag, 
+                      GtkTextIter *start, GtkTextIter *end,
+                      gpointer userdata)
+{
+       ModestMsgEditWindow *window = MODEST_MSG_EDIT_WINDOW (userdata);
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (userdata);
+       gchar *tag_name;
+
+       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_images (window, priv->images);
+       }
+}
+
+void                    
+modest_msg_edit_window_add_part (ModestMsgEditWindow *window,
+                                TnyMimePart *part)
+{
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       g_return_if_fail (TNY_IS_MIME_PART (part));
+       tny_list_prepend (priv->attachments, (GObject *) part);
+       modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), part, TRUE, 0);
+       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);
+}
+
+const gchar*    
+modest_msg_edit_window_get_message_uid (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), NULL);        
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       return priv->msg_uid;
+}
+
+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;
+}
+