Added dimming rules for edit window menu
[modest] / src / hildon2 / modest-msg-edit-window.c
index 8d48ce8..031db11 100644 (file)
@@ -63,7 +63,7 @@
 #include <tny-simple-list.h>
 #include <wptextview.h>
 #include <wptextbuffer.h>
-#include "modest-scroll-area.h"
+#include <hildon/hildon-pannable-area.h>
 #include "modest-msg-edit-window-ui-dimming.h"
 
 #include "modest-hildon-includes.h"
@@ -78,6 +78,7 @@
 #endif
 #include <modest-utils.h>
 #include "modest-maemo-utils.h"
+#include <modest-ui-constants.h>
 
 
 #define DEFAULT_FONT_SIZE 3
@@ -118,9 +119,7 @@ static void  modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item,
 static void  modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item,
                                                 gpointer userdata);
 static void  modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window);
-static gboolean modest_msg_edit_window_window_state_event (GtkWidget *widget, 
-                                                          GdkEventWindowState *event, 
-                                                          gpointer userdata);
+
 static void modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window,
                                                     ModestRecptEditor *editor);
 static void modest_msg_edit_window_add_attachment_clicked (GtkButton *button,
@@ -172,8 +171,19 @@ static void text_buffer_mark_set (GtkTextBuffer *buffer,
                                  GtkTextIter *iter,
                                  GtkTextMark *mark,
                                  ModestMsgEditWindow *userdata);
-static void vadj_changed (GtkAdjustment *adj, 
-                         ModestMsgEditWindow *window);
+static void on_message_settings (GtkAction *action,
+                                ModestMsgEditWindow *window);
+static void add_to_menu (ModestMsgEditWindow *self,
+                        HildonAppMenu *menu,
+                        gchar *label,
+                        GCallback callback,
+                        ModestDimmingRulesGroup *group,
+                        GCallback dimming_callback);
+static void setup_menu (ModestMsgEditWindow *self,
+                       ModestDimmingRulesGroup *group);
+static gboolean modest_msg_edit_window_toggle_menu (HildonWindow *window,
+                                                   guint button,
+                                                   guint32 time);
 
 static void DEBUG_BUFFER (WPTextBuffer *buffer)
 {
@@ -214,6 +224,10 @@ static void DEBUG_BUFFER (WPTextBuffer *buffer)
 #endif
 }
 
+static const GtkActionEntry hildon2_msg_edit_action_entries [] = {
+       { "MessageSettings", NULL, N_("TODO: settings..."), NULL, NULL, G_CALLBACK (on_message_settings)},
+};
+
 
 /* static gboolean */
 /* on_key_pressed (GtkWidget *self, */
@@ -255,6 +269,7 @@ struct _ModestMsgEditWindowPrivate {
        GtkWidget   *font_size_toolitem;
        GtkWidget   *font_face_toolitem;
        GtkWidget   *font_color_button;
+       GtkWidget   *font_color_toolitem;
        GSList      *font_items_group;
        GtkWidget   *font_tool_button_label;
        GSList      *size_items_group;
@@ -265,7 +280,7 @@ struct _ModestMsgEditWindowPrivate {
 
        GtkWidget   *font_dialog;
 
-       GtkWidget   *scroll;
+       GtkWidget   *pannable;
        guint        scroll_drag_timeout_id;
        gdouble      last_upper;
 
@@ -289,6 +304,11 @@ struct _ModestMsgEditWindowPrivate {
        gchar       *msg_uid;
 
        gboolean    sent;
+
+       GtkWidget   *app_menu;
+       GtkWidget   *cc_button;
+       GtkWidget   *bcc_button;
+       GtkWidget   *find_toolbar_button;
 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -341,22 +361,6 @@ restore_settings (ModestMsgEditWindow *self)
        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");
@@ -366,8 +370,7 @@ restore_settings (ModestMsgEditWindow *self)
        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);
+       modest_widget_memory_restore (conf, G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY);
 }
 
 
@@ -376,12 +379,15 @@ modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass)
 {
        GObjectClass *gobject_class;
        ModestWindowClass *modest_window_class;
+       HildonWindowClass *hildon_window_class = (HildonWindowClass *) klass;
        gobject_class = (GObjectClass*) klass;
        modest_window_class = (ModestWindowClass*) klass;
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_msg_edit_window_finalize;
 
+       hildon_window_class->toggle_menu = modest_msg_edit_window_toggle_menu;
+
        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;
@@ -438,9 +444,7 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        priv->last_upper = 0.0;
 
        priv->font_dialog = NULL;
-
-       modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
-                                           GTK_WINDOW(obj),"applications_email_editor");
+       priv->app_menu = NULL;
 
        if (!is_wp_text_buffer_started) {
                is_wp_text_buffer_started = TRUE;
@@ -454,8 +458,6 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
 }
 
 
-/* FIXME: this is a dup from the one in gtk/ */
-
 /** 
  * @result: A ModestPairList, which must be freed with modest_pair_list_free().
  */
@@ -520,10 +522,8 @@ correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focu
        GtkTextMark *insert;
        GtkTextIter iter;
        GdkRectangle rectangle;
-       GtkAdjustment *vadj;
        gdouble new_value;
        gint offset;
-       GdkWindow *window;
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w);
 
@@ -534,37 +534,11 @@ correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focu
        gtk_text_buffer_get_iter_at_mark (priv->text_buffer, &iter, insert);
 
        gtk_text_view_get_iter_location (GTK_TEXT_VIEW (priv->msg_body), &iter, &rectangle);
-       vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll));
        offset = priv->msg_body->allocation.y;
 
-       new_value = vadj->value;
-       
-       if ((offset + rectangle.y + rectangle.height) > 
-           ((gint) (vadj->value +vadj->page_size))) {
-               new_value = (offset + rectangle.y) - vadj->page_size * 0.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);
-       }
+       new_value = (offset + rectangle.y);
 
+       hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (priv->pannable), -1, new_value);
 }
 
 static void
@@ -626,20 +600,6 @@ copy_clipboard_check (GtkTextView *text_view,
        }
 }
 
-static 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
 attachment_deleted (ModestAttachmentsView *attachments_view,
                    gpointer user_data)
@@ -665,9 +625,6 @@ connect_signals (ModestMsgEditWindow *obj)
                           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 (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",
@@ -702,11 +659,6 @@ connect_signals (ModestMsgEditWindow *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);
@@ -720,6 +672,17 @@ connect_signals (ModestMsgEditWindow *obj)
 }
 
 static void
+init_wp_text_view_style ()
+{
+       static gboolean initialized = FALSE;
+
+       if (!initialized) {
+               gtk_rc_parse_string ("class \"WPTextView\" style \"fremantle-textview\"");
+               initialized = TRUE;
+       }
+}      
+
+static void
 init_window (ModestMsgEditWindow *obj)
 {
        GtkWidget *to_caption, *subject_caption;
@@ -730,13 +693,15 @@ init_window (ModestMsgEditWindow *obj)
        GdkPixbuf *window_icon = NULL;
        GError *error = NULL;
 
-       GtkSizeGroup *size_group;
+       GtkSizeGroup *title_size_group;
+       GtkSizeGroup *value_size_group;
        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);
 
@@ -749,6 +714,10 @@ init_window (ModestMsgEditWindow *obj)
                                      modest_msg_edit_action_entries,
                                      G_N_ELEMENTS (modest_msg_edit_action_entries),
                                      obj);
+       gtk_action_group_add_actions (action_group,
+                                     hildon2_msg_edit_action_entries,
+                                     G_N_ELEMENTS (hildon2_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),
@@ -788,12 +757,17 @@ init_window (ModestMsgEditWindow *obj)
 
        parent_priv->menubar = NULL;
 
-       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+       title_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+       value_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
        /* Note: This ModestPairList* must exist for as long as the picker
         * that uses it, because the ModestSelectorPicker uses the ID opaquely, 
         * so it can't know how to manage its memory. */ 
-       priv->from_field    = modest_selector_picker_new (NULL, g_str_equal);
+       priv->from_field    = modest_selector_picker_new (MODEST_EDITABLE_SIZE,
+                                                         HILDON_BUTTON_ARRANGEMENT_HORIZONTAL,
+                                                         NULL, g_str_equal);
+       modest_maemo_utils_set_hbutton_layout (title_size_group, value_size_group, 
+                                              _("mail_va_from"), priv->from_field);
 
        priv->to_field      = modest_recpt_editor_new ();
        priv->cc_field      = modest_recpt_editor_new ();
@@ -801,7 +775,8 @@ init_window (ModestMsgEditWindow *obj)
        subject_box = gtk_hbox_new (FALSE, 0);
        priv->priority_icon = gtk_image_new ();
        gtk_box_pack_start (GTK_BOX (subject_box), priv->priority_icon, FALSE, FALSE, 0);
-       priv->subject_field = gtk_entry_new_with_max_length (SUBJECT_MAX_LENGTH);
+       priv->subject_field = hildon_entry_new (MODEST_EDITABLE_SIZE);
+       gtk_entry_set_max_length (GTK_ENTRY (priv->subject_field) ,SUBJECT_MAX_LENGTH);
        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);
@@ -810,28 +785,38 @@ init_window (ModestMsgEditWindow *obj)
        GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (priv->add_attachment_button), GTK_CAN_FOCUS);
        gtk_button_set_relief (GTK_BUTTON (priv->add_attachment_button), GTK_RELIEF_NONE);
        gtk_button_set_focus_on_click (GTK_BUTTON (priv->add_attachment_button), FALSE);
-       gtk_button_set_alignment (GTK_BUTTON (priv->add_attachment_button), 1.0, 1.0);
-       attachment_icon = gtk_image_new_from_icon_name (MODEST_HEADER_ICON_ATTACH, GTK_ICON_SIZE_BUTTON);
+       gtk_button_set_alignment (GTK_BUTTON (priv->add_attachment_button), 1.0, 0.5);
+       attachment_icon = gtk_image_new_from_icon_name (MODEST_HEADER_ICON_ATTACH, HILDON_ICON_SIZE_FINGER);
        gtk_container_add (GTK_CONTAINER (priv->add_attachment_button), attachment_icon);
        gtk_box_pack_start (GTK_BOX (subject_box), priv->add_attachment_button, FALSE, FALSE, 0);
        priv->attachments_view = modest_attachments_view_new (NULL);
        
        priv->header_box = gtk_vbox_new (FALSE, 0);
        
-       to_caption = hildon_caption_new (size_group, _("mail_va_to"), priv->to_field, NULL, 0);
-       priv->cc_caption = hildon_caption_new (size_group, _("mail_va_cc"), priv->cc_field, NULL, 0);
-       priv->bcc_caption = hildon_caption_new (size_group, _("mail_va_hotfix1"), priv->bcc_field, NULL, 0);
-       subject_caption = hildon_caption_new (size_group, _("mail_va_subject"), subject_box, NULL, 0);
-       priv->attachments_caption = hildon_caption_new (size_group, _("mail_va_attachment"), priv->attachments_view, NULL, 0);
-       g_object_unref (size_group);
-
-       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-       modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->to_field), size_group);
-       modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->cc_field), size_group);
-       modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->bcc_field), size_group);
-       gtk_size_group_add_widget (size_group, priv->subject_field);
-       gtk_size_group_add_widget (size_group, priv->attachments_view);
-       g_object_unref (size_group);
+       to_caption = modest_maemo_utils_create_captioned_with_size_type 
+               (title_size_group, value_size_group,
+                _("mail_va_to"), priv->to_field,
+                HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+       priv->cc_caption = modest_maemo_utils_create_captioned_with_size_type 
+               (title_size_group, value_size_group,
+                _("mail_va_cc"), priv->cc_field,
+                HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+       priv->bcc_caption = modest_maemo_utils_create_captioned_with_size_type
+               (title_size_group, value_size_group,
+                _("mail_va_hotfix1"), priv->bcc_field,
+                HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+       subject_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
+                                                              _("mail_va_subject"), subject_box);
+       priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group,
+                                                                                       _("mail_va_attachment"), 
+                                                                                       priv->attachments_view,
+                                                                                       HILDON_SIZE_AUTO_WIDTH |
+                                                                                       HILDON_SIZE_AUTO_HEIGHT);
+       /* modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->to_field), value_size_group); */
+       /* modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->cc_field), value_size_group); */
+       /* modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->bcc_field), value_size_group); */
+       g_object_unref (title_size_group);
+       g_object_unref (value_size_group);
 
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->from_field, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), to_caption, FALSE, FALSE, 0);
@@ -841,8 +826,11 @@ init_window (ModestMsgEditWindow *obj)
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->attachments_caption, FALSE, FALSE, 0);
        gtk_widget_set_no_show_all (priv->attachments_caption, TRUE);
 
+       init_wp_text_view_style ();
 
        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", DEFAULT_FONT_SCALE, NULL);
@@ -861,25 +849,21 @@ init_window (ModestMsgEditWindow *obj)
 
 /*     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);
-
+       priv->pannable = hildon_pannable_area_new ();
+       
        main_vbox = gtk_vbox_new  (FALSE, DEFAULT_MAIN_VBOX_SPACING);
 
        gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 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));
+       hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), main_vbox);
+       gtk_widget_show_all (GTK_WIDGET(priv->pannable));
        
        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_box_pack_start (GTK_BOX (window_box), priv->pannable, TRUE, TRUE, 0);
 
        gtk_container_add (GTK_CONTAINER (priv->frame), priv->msg_body);
 
@@ -998,6 +982,8 @@ pixbuf_from_stream (TnyStream *stream, const gchar *mime_type, guint64 *stream_s
                readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128);
                size += readed;
                if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, &error)) {
+                       if (error)
+                               g_error_free (error);
                        break;
                }
        }
@@ -1146,15 +1132,18 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        gchar *to, *cc, *bcc, *subject;
        gchar *body;
        ModestMsgEditWindowPrivate *priv;
+       ModestWindowPrivate *parent_priv;
        GtkTextIter iter;
        TnyHeaderFlags priority_flags;
        TnyFolder *msg_folder;
        gboolean is_html = FALSE;
+       gboolean field_view_set;
        
        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);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
 
        header = tny_msg_get_header (msg);
        to      = tny_header_dup_to (header);
@@ -1165,6 +1154,8 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
 
        if (to)
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field),  to);
+
+       field_view_set = TRUE;
        if (cc) {
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field),  cc);
                gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
@@ -1172,7 +1163,11 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        } 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);
+               field_view_set = FALSE;
        }
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button), field_view_set);
+
+       field_view_set = TRUE;
        if (bcc) {
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
                gtk_widget_set_no_show_all (priv->bcc_caption, FALSE);
@@ -1180,7 +1175,11 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        } 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);
-       } 
+               field_view_set = FALSE;
+       }
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button), field_view_set);
+
+
        if (subject)
                gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
        modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW(self),
@@ -1337,14 +1336,14 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
 
        /* font color */
-       tool_item = GTK_WIDGET (gtk_tool_item_new ());
+       priv->font_color_toolitem = 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);
+       gtk_container_add (GTK_CONTAINER (priv->font_color_toolitem), priv->font_color_button);
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->font_color_toolitem), TRUE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->font_color_toolitem), TRUE);
+       gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (priv->font_color_toolitem), insert_index);
        g_signal_connect_swapped (G_OBJECT (priv->font_color_button), 
                                  "notify::color", 
                                  G_CALLBACK (modest_msg_edit_window_color_button_change), 
@@ -1483,8 +1482,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre
        parent_priv = MODEST_WINDOW_GET_PRIVATE (obj);
 
        /* 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_selector_picker_set_pair_list (MODEST_SELECTOR_PICKER (priv->from_field), priv->from_field_protos);
        modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) account_name);
@@ -1518,7 +1515,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre
                                              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,
+       modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_color_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_size_toolitem,
@@ -1527,14 +1524,14 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre
        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);
+
+       /* Setup app menu */
+       setup_menu (MODEST_MSG_EDIT_WINDOW (obj), menu_rules_group);
+
         /* Checks the dimming rules */
        g_object_unref (menu_rules_group);
        g_object_unref (toolbar_rules_group);
@@ -1892,6 +1889,7 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self,
        
        text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), self);
        
+       g_free (buffer_format);
        g_free (current_format);
 
        /* Check dimming rules */
@@ -1913,11 +1911,11 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
        if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))) {
-               action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatFormattedTextMenu");
+               action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatFormattedTextMenu");
                if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
                        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");
+               action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatPlainTextMenu");
                if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
                        modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE);
        }
@@ -2159,7 +2157,7 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
        modest_maemo_utils_setup_images_filechooser (GTK_FILE_CHOOSER (dialog));
 
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
-                                    GTK_WINDOW (dialog));
+                                    GTK_WINDOW (dialog), GTK_WINDOW (window));
 
        response = gtk_dialog_run (GTK_DIALOG (dialog));
        switch (response) {
@@ -2237,6 +2235,7 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *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), &position, insert_mark);
                                wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (mime_part)), pixbuf);
+                               g_object_unref (pixbuf);
                        } 
 
                        tny_list_prepend (priv->images, (GObject *) mime_part);
@@ -2273,7 +2272,7 @@ modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window)
        dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN);
        gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title"));
        gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
-       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog));
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), GTK_WINDOW (window));
 
        response = gtk_dialog_run (GTK_DIALOG (dialog));
        switch (response) {
@@ -2466,7 +2465,7 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
                        g_object_unref (att_list);
                        return;
                }
-               hildon_banner_show_information (NULL, NULL, _("mcen_ib_removing_attachment"));
+               hildon_banner_show_information (NULL, NULL, _("mcen_me_inbox_remove_attachments"));
                
                for (iter = tny_list_create_iterator (att_list);
                     !tny_iterator_is_done (iter);
@@ -2589,31 +2588,6 @@ modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item,
        }
 }
 
-static gboolean
-modest_msg_edit_window_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer userdata)
-{
-       if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
-               ModestWindowPrivate *parent_priv;
-               ModestWindowMgr *mgr;
-               gboolean is_fullscreen;
-               GtkAction *fs_toggle_action;
-               gboolean active;
-
-               mgr = modest_runtime_get_window_mgr ();
-               is_fullscreen = (modest_window_mgr_get_fullscreen_mode (mgr))?1:0;
-
-               parent_priv = MODEST_WINDOW_GET_PRIVATE (widget);
-               
-               fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewToggleFullscreenMenu");
-               active = (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action)))?1:0;
-               if (is_fullscreen != active)
-                       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), is_fullscreen);
-       }
-
-       return FALSE;
-
-}
-
 void
 modest_msg_edit_window_show_cc (ModestMsgEditWindow *window, 
                                gboolean show)
@@ -2714,9 +2688,7 @@ 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);
 
@@ -2727,21 +2699,6 @@ modest_msg_edit_window_show_toolbar (ModestWindow *self,
                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
@@ -2763,20 +2720,24 @@ modest_msg_edit_window_set_priority_flags (ModestMsgEditWindow *window,
 
                switch (priority_flags) {
                case TNY_HEADER_FLAG_HIGH_PRIORITY:
-                       gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), "qgn_list_messaging_high", GTK_ICON_SIZE_MENU);
+                       gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon),
+                                                     MODEST_HEADER_ICON_HIGH, 
+                                                     HILDON_ICON_SIZE_XSMALL);
                        gtk_widget_show (priv->priority_icon);
-                       priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                       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_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon),
+                                                     MODEST_HEADER_ICON_LOW,
+                                                     HILDON_ICON_SIZE_XSMALL);
                        gtk_widget_show (priv->priority_icon);
-                       priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                       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, 
+                       priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager,
                                                                     "/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityNormalMenu");
                        break;
                }
@@ -2817,7 +2778,7 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
                        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"));
+                               GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatFormattedTextMenu"));
                                modest_utils_toggle_action_set_active_block_notify (action, TRUE);
                        }
                }
@@ -2852,7 +2813,7 @@ modest_msg_edit_window_select_font (ModestMsgEditWindow *window)
        
        dialog = hildon_font_selection_dialog_new (GTK_WINDOW (window), NULL);
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr(),
-                                    GTK_WINDOW(dialog));
+                                    GTK_WINDOW(dialog), GTK_WINDOW (window));
 
        /* First we get the currently selected font information */
        wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), &oldfmt, TRUE);
@@ -2889,7 +2850,7 @@ modest_msg_edit_window_select_font (ModestMsgEditWindow *window)
                      NULL);
 
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
-                                    GTK_WINDOW (dialog));
+                                    GTK_WINDOW (dialog), GTK_WINDOW (window));
        gtk_widget_show_all (dialog);
        priv->font_dialog = dialog;
        response = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -3490,12 +3451,11 @@ 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);
+       ModestMsgEditWindowPrivate *priv;
 
-       toggle = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/FindInMessageMenu"));
-       gtk_toggle_action_set_active (toggle, FALSE);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
+
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->find_toolbar_button), FALSE);
 }
 
 gboolean 
@@ -3543,8 +3503,12 @@ modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
                        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));
+               if (GTK_WIDGET_REALIZED (window)) {
+                       if (!modest_window_mgr_register_window (mgr, MODEST_WINDOW (window), NULL)) {
+                               gtk_widget_destroy (GTK_WIDGET (window));
+                               return;
+                       }
+               }
        }
 
        priv->draft_msg = draft;
@@ -3559,7 +3523,7 @@ text_buffer_apply_tag (GtkTextBuffer *buffer, GtkTextTag *tag,
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (userdata);
        gchar *tag_name;
 
-       if (tag == NULL+13) return;
+       if (tag == NULL) 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);
@@ -3676,3 +3640,391 @@ get_zoom_do_nothing (ModestWindow *window)
        return 1.0;
 }
 
+typedef struct _MessageSettingsHelper {
+       ModestMsgEditWindow *window;
+       GSList *priority_group;
+       GtkWidget *align_picker;
+} MessageSettingsHelper;
+
+static void
+on_priority_toggle (HildonCheckButton *button, 
+                   MessageSettingsHelper *helper)
+{
+       GSList *node;
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (helper->window);
+       if (hildon_check_button_get_active (button)) {
+
+               for (node = helper->priority_group; node != NULL; node = g_slist_next (node)) {
+                       HildonCheckButton *node_button = (HildonCheckButton *) node->data;
+                       if ((node_button != button) &&
+                           hildon_check_button_get_active (node_button)) {
+                               hildon_check_button_set_active (node_button, FALSE);
+                       }
+                       if (priv->priority_flags != (TnyHeaderFlags) g_object_get_data (G_OBJECT (button), "priority"))
+                               modest_msg_edit_window_set_priority_flags (helper->window,
+                                                                          (TnyHeaderFlags) 
+                                                                          g_object_get_data (G_OBJECT (button), 
+                                                                                             "priority"));
+               }
+
+               
+       } else {
+               gboolean found = FALSE;
+               /* If no one is active, activate it again */
+               for (node = helper->priority_group; node != NULL; node = g_slist_next (node)) {
+                       HildonCheckButton *node_button = (HildonCheckButton *) node->data;
+                       if (hildon_check_button_get_active (node_button)) {
+                               found = TRUE;
+                               break;
+                       }
+               }
+               if (!found) {
+                       hildon_check_button_set_active (button, TRUE);
+               }
+       }
+}
+
+static void
+on_format_picker_value_changed (HildonPickerButton *button,
+                               MessageSettingsHelper *helper)
+{
+       ModestMsgEditFormat new_format, old_format;
+       gint file_format;
+
+       switch (hildon_picker_button_get_active (button)) {
+       case 1:
+               new_format = MODEST_MSG_EDIT_FORMAT_HTML;
+               file_format = MODEST_FILE_FORMAT_FORMATTED_TEXT;
+               break;
+       case 0:
+       default:
+               new_format = MODEST_MSG_EDIT_FORMAT_TEXT;
+               file_format = MODEST_FILE_FORMAT_PLAIN_TEXT;
+               break;
+       }
+
+       old_format = modest_msg_edit_window_get_format (helper->window);
+       if (new_format != old_format) {
+               modest_msg_edit_window_set_file_format (MODEST_MSG_EDIT_WINDOW (helper->window), file_format);
+
+               switch (modest_msg_edit_window_get_format (helper->window)) {
+               case MODEST_MSG_EDIT_FORMAT_TEXT:
+                       hildon_picker_button_set_active (button, 0);
+                       gtk_widget_set_sensitive (helper->align_picker, FALSE);
+                       break;
+               case MODEST_MSG_EDIT_FORMAT_HTML:
+               default:
+                       hildon_picker_button_set_active (button, 1);
+                       gtk_widget_set_sensitive (helper->align_picker, TRUE);
+                       break;
+               }
+       }
+}
+
+static void
+on_align_picker_value_changed (HildonPickerButton *button,
+                               MessageSettingsHelper *helper)
+{
+       GtkJustification new_justify;
+       ModestMsgEditFormatState *format_state = NULL;
+
+       switch (hildon_picker_button_get_active (button)) {
+       case 1:
+               new_justify = GTK_JUSTIFY_CENTER;
+               break;
+       case 2:
+               new_justify = GTK_JUSTIFY_RIGHT;
+               break;
+       case 0:
+       default:
+               new_justify = GTK_JUSTIFY_LEFT;
+               break;
+       }
+
+       format_state = modest_msg_edit_window_get_format_state (helper->window);
+       if (format_state->justification != new_justify)
+               format_state->justification = new_justify;
+       modest_msg_edit_window_set_format_state (helper->window, format_state);
+       g_free (format_state);
+}
+
+static void
+modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
+{
+       GtkWidget *dialog;
+       GtkWidget *vbox;
+       GtkWidget *priority_hbox;
+       GtkWidget *high_toggle, *medium_toggle, *low_toggle;
+       GtkWidget *captioned;
+       GtkSizeGroup *title_sizegroup, *value_sizegroup;
+       GtkWidget *format_picker;
+       GtkWidget *format_selector;
+       GtkWidget *align_selector;
+       ModestMsgEditWindowPrivate *priv;
+       MessageSettingsHelper helper = {0,};
+       ModestMsgEditFormatState *format_state = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       helper.window = window;
+       helper.priority_group = NULL;
+
+       title_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+       value_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+       dialog = gtk_dialog_new ();
+       vbox = gtk_vbox_new (FALSE, 0);
+       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
+       gtk_widget_show (vbox);
+
+       /* Priority toggles */
+       priority_hbox = gtk_hbox_new (TRUE, 0);
+       high_toggle = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
+       gtk_button_set_label (GTK_BUTTON (high_toggle), _("mcen_me_editor_priority_high"));
+       helper.priority_group = g_slist_prepend (helper.priority_group, high_toggle);
+       g_object_set_data (G_OBJECT (high_toggle), "priority", GINT_TO_POINTER (TNY_HEADER_FLAG_HIGH_PRIORITY));
+       medium_toggle = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
+       gtk_button_set_label (GTK_BUTTON (medium_toggle), _("mcen_me_editor_priority_normal"));
+       helper.priority_group = g_slist_prepend (helper.priority_group, medium_toggle);
+       g_object_set_data (G_OBJECT (medium_toggle), "priority", GINT_TO_POINTER (TNY_HEADER_FLAG_NORMAL_PRIORITY));
+       low_toggle = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
+       gtk_button_set_label (GTK_BUTTON (low_toggle), _("mcen_me_editor_priority_low"));
+       helper.priority_group = g_slist_prepend (helper.priority_group, low_toggle);
+       g_object_set_data (G_OBJECT (low_toggle), "priority", GINT_TO_POINTER (TNY_HEADER_FLAG_LOW_PRIORITY));
+       gtk_box_pack_start (GTK_BOX (priority_hbox), low_toggle, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (priority_hbox), medium_toggle, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (priority_hbox), high_toggle, FALSE, FALSE, 0);
+       gtk_widget_show_all (priority_hbox);
+       captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
+                                                        _("mcen_me_editor_message_priority"), priority_hbox);
+       gtk_widget_show (captioned);
+       gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0);
+
+       /* format selector */
+       format_selector = hildon_touch_selector_new_text ();
+       hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (format_selector), _("mcen_me_editor_plain_text"));
+       hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (format_selector), _("mcen_me_editor_formatted_text"));
+       format_picker = hildon_picker_button_new (MODEST_EDITABLE_SIZE,
+                                                 HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+       hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (format_picker), HILDON_TOUCH_SELECTOR (format_selector));
+       modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup, 
+                                              _("mcen_me_editor_format"), format_picker);
+       gtk_widget_show_all (format_picker);
+       gtk_box_pack_start (GTK_BOX (vbox), format_picker, FALSE, FALSE, 0);
+       
+       /* alignment selector */
+       align_selector = hildon_touch_selector_new_text ();
+       hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (align_selector), _("mcen_me_editor_align_left"));
+       hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (align_selector), _("mcen_me_editor_align_centred"));
+       hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (align_selector), _("mcen_me_editor_align_right"));
+       helper.align_picker = hildon_picker_button_new (MODEST_EDITABLE_SIZE,
+                                                HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+       hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (helper.align_picker), HILDON_TOUCH_SELECTOR (align_selector));
+       modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup, 
+                                              _("mcen_me_editor_align"), helper.align_picker);
+       gtk_widget_show_all (helper.align_picker);
+       gtk_box_pack_start (GTK_BOX (vbox), helper.align_picker, FALSE, FALSE, 0);
+       
+       g_object_unref (title_sizegroup);
+       g_object_unref (value_sizegroup);
+       gtk_window_set_title (GTK_WINDOW (dialog), _("TODO: Message settings"));
+       
+       /* Set current values */
+       switch (priv->priority_flags) {
+       case TNY_HEADER_FLAG_HIGH_PRIORITY:
+               hildon_check_button_set_active (HILDON_CHECK_BUTTON (high_toggle), TRUE);
+               break;
+       case TNY_HEADER_FLAG_LOW_PRIORITY:
+               hildon_check_button_set_active (HILDON_CHECK_BUTTON (low_toggle), TRUE);
+               break;
+       default:
+               hildon_check_button_set_active (HILDON_CHECK_BUTTON (medium_toggle), TRUE);
+               break;
+       }
+
+       switch (modest_msg_edit_window_get_format (window)) {
+       case MODEST_MSG_EDIT_FORMAT_TEXT:
+               hildon_picker_button_set_active (HILDON_PICKER_BUTTON (format_picker), 0);
+               gtk_widget_set_sensitive (helper.align_picker, FALSE);
+               break;
+       case MODEST_MSG_EDIT_FORMAT_HTML:
+       default:
+               hildon_picker_button_set_active (HILDON_PICKER_BUTTON (format_picker), 1);
+               gtk_widget_set_sensitive (helper.align_picker, TRUE);
+               break;
+       }
+
+       format_state = modest_msg_edit_window_get_format_state (window);
+       switch (format_state->justification) {
+       case GTK_JUSTIFY_RIGHT:
+               hildon_picker_button_set_active (HILDON_PICKER_BUTTON (helper.align_picker), 2);
+               break;
+       case GTK_JUSTIFY_CENTER:
+               hildon_picker_button_set_active (HILDON_PICKER_BUTTON (helper.align_picker), 1);
+               break;
+       default:
+               hildon_picker_button_set_active (HILDON_PICKER_BUTTON (helper.align_picker), 0);
+               break;
+       
+       }
+       g_free (format_state);
+
+       /* Signal connects */
+       g_signal_connect (G_OBJECT (high_toggle), "toggled", G_CALLBACK (on_priority_toggle), &helper);
+       g_signal_connect (G_OBJECT (medium_toggle), "toggled", G_CALLBACK (on_priority_toggle), &helper);
+       g_signal_connect (G_OBJECT (low_toggle), "toggled", G_CALLBACK (on_priority_toggle), &helper);
+       g_signal_connect (G_OBJECT (format_picker), "value-changed", G_CALLBACK (on_format_picker_value_changed), &helper);
+       g_signal_connect (G_OBJECT (helper.align_picker), "value-changed", 
+                         G_CALLBACK (on_align_picker_value_changed), &helper);
+       
+       gtk_dialog_run (GTK_DIALOG (dialog));
+       
+       /* Read new values */
+       
+       gtk_widget_destroy (dialog);
+       g_slist_free (helper.priority_group);
+       
+}
+
+static void on_message_settings (GtkAction *action,
+                                ModestMsgEditWindow *window)
+{
+       modest_msg_edit_window_show_msg_settings_dialog (window);
+}
+
+
+static void add_button_to_menu (ModestMsgEditWindow *self,
+                               HildonAppMenu *menu,
+                               GtkButton *button,
+                               ModestDimmingRulesGroup *group,
+                               GCallback dimming_callback)
+{
+       if (dimming_callback)
+               modest_dimming_rules_group_add_widget_rule (group,
+                                                           GTK_WIDGET (button),
+                                                           dimming_callback,
+                                                           MODEST_WINDOW (self));
+       hildon_app_menu_append (menu, GTK_BUTTON (button));
+}
+
+static void add_to_menu (ModestMsgEditWindow *self,
+                        HildonAppMenu *menu,
+                        gchar *label,
+                        GCallback callback,
+                        ModestDimmingRulesGroup *group,
+                        GCallback dimming_callback)
+{
+       GtkWidget *button;
+
+       button = gtk_button_new_with_label (label);
+       g_signal_connect_after (G_OBJECT (button), "clicked",
+                               callback, (gpointer) self);
+       add_button_to_menu (self, menu, GTK_BUTTON (button), group, dimming_callback);
+}
+
+static void
+on_cc_button_toggled (HildonCheckButton *button,
+                     ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+
+       modest_msg_edit_window_show_cc (MODEST_MSG_EDIT_WINDOW (window),
+                                       hildon_check_button_get_active (button));
+}
+
+static void
+on_bcc_button_toggled (HildonCheckButton *button,
+                     ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+
+       modest_msg_edit_window_show_bcc (MODEST_MSG_EDIT_WINDOW (window),
+                                       hildon_check_button_get_active (button));
+}
+
+static void
+on_find_toolbar_button_toggled (HildonCheckButton *button,
+                               ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+       modest_msg_edit_window_toggle_find_toolbar (MODEST_MSG_EDIT_WINDOW (window),
+                                                   hildon_check_button_get_active (button));
+
+}
+
+static void 
+setup_menu (ModestMsgEditWindow *self, ModestDimmingRulesGroup *group)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(self));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+       priv->app_menu = hildon_app_menu_new ();
+
+       /* Settings menu buttons */
+       add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_editor_checknames"),
+                    G_CALLBACK (modest_ui_actions_on_check_names),
+                    group, NULL);
+       add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_undo"),
+                    G_CALLBACK (modest_ui_actions_on_undo),
+                    group, G_CALLBACK (modest_ui_dimming_rules_on_undo));
+
+       priv->cc_button = hildon_check_button_new (0);
+       gtk_button_set_label (GTK_BUTTON (priv->cc_button), _("mcen_me_editor_showcc"));
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button),
+                                       FALSE);
+       add_button_to_menu (self, HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (priv->cc_button),
+                           group, NULL);
+       g_signal_connect (G_OBJECT (priv->cc_button), "toggled",
+                         G_CALLBACK (on_cc_button_toggled), (gpointer) self);
+       priv->bcc_button = hildon_check_button_new (0);
+       gtk_button_set_label (GTK_BUTTON (priv->bcc_button), _("mcen_me_editor_showbcc"));
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button),
+                                       FALSE);
+       add_button_to_menu (self, HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (priv->bcc_button),
+                           group, NULL);
+       g_signal_connect (G_OBJECT (priv->bcc_button), "toggled",
+                         G_CALLBACK (on_bcc_button_toggled), (gpointer) self);
+
+       add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_editor_attach_inlineimage"),
+                    G_CALLBACK (modest_ui_actions_on_insert_image),
+                    group, G_CALLBACK (modest_ui_dimming_rules_on_set_style));
+       add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_remove_attachments"),
+                    G_CALLBACK (modest_ui_actions_on_remove_attachments),
+                    group, G_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment));
+       add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("TODO: Message settings..."),
+                    G_CALLBACK (on_message_settings),
+                    group, NULL);
+       priv->find_toolbar_button = hildon_check_button_new (0);
+       gtk_button_set_label (GTK_BUTTON (priv->find_toolbar_button), _("mcen_me_viewer_find"));
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->find_toolbar_button),
+                                       FALSE);
+       add_button_to_menu (self, HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (priv->find_toolbar_button),
+                           group, NULL);
+       g_signal_connect (G_OBJECT (priv->find_toolbar_button), "toggled",
+                         G_CALLBACK (on_find_toolbar_button_toggled), (gpointer) self);
+
+       hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self), 
+                                              HILDON_APP_MENU (priv->app_menu));
+}
+
+static gboolean 
+modest_msg_edit_window_toggle_menu (HildonWindow *window,
+                                   guint button,
+                                   guint32 time)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
+
+       gtk_widget_queue_resize (priv->app_menu);
+
+       return HILDON_WINDOW_CLASS (parent_class)->toggle_menu (window, button, time);
+}
+