Add methods to get and retrieve list of custom header pairs in editor
[modest] / src / hildon2 / modest-msg-edit-window.c
index 496cef8..e384845 100644 (file)
 #include "modest-msg-edit-window-ui-dimming.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 <libgnomevfs/gnome-vfs-mime.h>
-#endif
 #include <modest-utils.h>
 #include "modest-maemo-utils.h"
 #include <modest-ui-constants.h>
+#include "modest-color-button.h"
 
+#ifdef MODEST_USE_CALENDAR_WIDGETS
+#include <calendar-ui-widgets.h>
+#endif
 
 #define DEFAULT_FONT_SIZE 3
 #define DEFAULT_FONT 2
 #define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans"
-#define DEFAULT_MAIN_VBOX_SPACING 6
+#define DEFAULT_MAIN_VBOX_SPACING 0
 #define SUBJECT_MAX_LENGTH 1000
 #define IMAGE_MAX_WIDTH 560
 #define DEFAULT_FONT_SCALE 1.5
 #define ATTACHMENT_BUTTON_WIDTH 118
 #define MAX_FROM_VALUE 36
-#define MAX_BODY_LENGTH 4096
+#define MAX_BODY_LENGTH 128*1024
+#define MAX_BODY_LINES 2048
 
 static gboolean is_wp_text_buffer_started = FALSE;
 
@@ -174,6 +172,8 @@ static void text_buffer_mark_set (GtkTextBuffer *buffer,
                                  GtkTextIter *iter,
                                  GtkTextMark *mark,
                                  ModestMsgEditWindow *userdata);
+static void on_show_toolbar_button_toggled (HildonCheckButton *button,
+                                           ModestMsgEditWindow *window);
 static void on_message_settings (GtkAction *action,
                                 ModestMsgEditWindow *window);
 static void setup_menu (ModestMsgEditWindow *self);
@@ -187,13 +187,16 @@ static void font_face_clicked (GtkToolButton *button,
 static void update_signature (ModestMsgEditWindow *self,
                              const gchar *old_account, 
                              const gchar *new_account);
+static void update_branding (ModestMsgEditWindow *self,
+                            const gchar *new_account);
 static GtkWidget *_create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_size_group,
                                           const gchar *label, GtkWidget *control);
+static void max_chars_banner_unref (ModestMsgEditWindow *self, GObject *old_ref);
 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)));
+       g_debug ("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)) {
@@ -220,11 +223,11 @@ static void DEBUG_BUFFER (WPTextBuffer *buffer)
                        g_string_append (output, " ");
                }
                output = g_string_append (output, "]\n");
-               g_message ("%s", output->str);
+               g_debug ("%s", output->str);
                g_string_free (output, TRUE);
                gtk_text_iter_forward_to_tag_toggle (&iter, NULL);
        }
-       g_message ("END BUFFER");
+       g_debug ("END BUFFER");
 #endif
 }
 
@@ -322,6 +325,15 @@ struct _ModestMsgEditWindowPrivate {
        GtkWidget   *app_menu;
        GtkWidget   *cc_button;
        GtkWidget   *bcc_button;
+       GtkWidget   *show_toolbar_button;
+
+       GtkWidget   *max_chars_banner;
+
+       GtkWidget   *brand_icon;
+       GtkWidget   *brand_label;
+       GtkWidget   *brand_container;
+
+       TnyList     *custom_header_pairs;
 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -445,6 +457,8 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
 
        priv->references = NULL;
        priv->in_reply_to = NULL;
+       priv->max_chars_banner = NULL;
+       priv->custom_header_pairs = TNY_LIST (tny_simple_list_new ());
 
        if (!is_wp_text_buffer_started) {
                is_wp_text_buffer_started = TRUE;
@@ -707,6 +721,16 @@ attachment_deleted (ModestAttachmentsView *attachments_view,
 }
 
 static void
+body_size_request (GtkWidget *body,
+                  GtkRequisition *req,
+                  gpointer user_data)
+{
+       /* Make sure the body always get at least 70 pixels */
+       if (req->height < 70)
+               req->height = 70;
+}
+
+static void
 connect_signals (ModestMsgEditWindow *obj)
 {
        ModestMsgEditWindowPrivate *priv;
@@ -748,6 +772,8 @@ connect_signals (ModestMsgEditWindow *obj)
                          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 (priv->msg_body), "size-request",
+                         G_CALLBACK (body_size_request), 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);
@@ -806,6 +832,7 @@ init_window (ModestMsgEditWindow *obj)
        GtkWidget *from_send_hbox;
        GtkWidget *send_icon;
        GtkWidget *attachments_label;
+       GtkWidget *branding_box;
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
        parent_priv = MODEST_WINDOW_GET_PRIVATE (obj);
@@ -890,6 +917,7 @@ init_window (ModestMsgEditWindow *obj)
        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_entry_set_placeholder ((HildonEntry *) priv->subject_field, _("mail_va_no_subject"));
        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 (priv->subject_box), priv->subject_field, TRUE, TRUE, 0);
@@ -928,16 +956,36 @@ init_window (ModestMsgEditWindow *obj)
        g_object_unref (title_size_group);
        g_object_unref (value_size_group);
 
+       priv->brand_icon = gtk_image_new ();
+       gtk_misc_set_alignment (GTK_MISC (priv->brand_icon), 0.5, 0.5);
+       priv->brand_label = gtk_label_new (NULL);
+       hildon_helper_set_logical_font (priv->brand_label, "SmallSystemFont");
+       gtk_misc_set_alignment (GTK_MISC (priv->brand_label), 0.0, 0.5);
+       gtk_widget_set_no_show_all (priv->brand_icon, TRUE);
+       gtk_widget_set_no_show_all (priv->brand_label, TRUE);
+
        from_send_hbox = gtk_hbox_new (FALSE, 0);
        gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->from_field, TRUE, TRUE, 0);
        gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->send_button, FALSE, FALSE, 0);
 
+       branding_box = gtk_hbox_new (FALSE, MODEST_MARGIN_DEFAULT);
+       gtk_widget_show (branding_box);
+       gtk_box_pack_start (GTK_BOX (branding_box), priv->brand_label, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (branding_box), priv->brand_icon, FALSE, FALSE, 0);
+
+       priv->brand_container = gtk_alignment_new (0.0, 0.5, 0.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (priv->brand_container), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+       gtk_container_add (GTK_CONTAINER (priv->brand_container), branding_box);
+       gtk_widget_set_no_show_all (priv->brand_container, TRUE);
+
+
        gtk_box_pack_start (GTK_BOX (priv->header_box), from_send_hbox, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), to_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->cc_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->bcc_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), subject_caption, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (priv->header_box), priv->attachments_caption, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (priv->header_box), priv->brand_container, FALSE, FALSE, 0);
        gtk_widget_set_no_show_all (priv->attachments_caption, TRUE);
 
        init_wp_text_view_style ();
@@ -1018,7 +1066,14 @@ static void
 modest_msg_edit_window_finalize (GObject *obj)
 {
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj);
-       
+
+       g_object_unref (priv->custom_header_pairs);
+
+       if (priv->max_chars_banner) {
+               g_object_weak_unref (G_OBJECT (priv->max_chars_banner), (GWeakNotify) max_chars_banner_unref, obj);
+               priv->max_chars_banner = FALSE;
+       }
+
        /* Sanity check: shouldn't be needed, the window mgr should
           call this function before */
        modest_msg_edit_window_disconnect_signals (MODEST_WINDOW (obj));
@@ -1070,8 +1125,6 @@ modest_msg_edit_window_finalize (GObject *obj)
        g_free (priv->last_search);
        g_free (priv->references);
        g_free (priv->in_reply_to);
-       g_object_unref (priv->faces_model);
-       g_object_unref (priv->sizes_model);
        g_object_unref (priv->attachments);
        g_object_unref (priv->images);
 
@@ -1214,9 +1267,9 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg)
 
        content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
 
-       if (content_type && !g_strcasecmp (content_type, "multipart/related")) {
+       if (content_type && !g_ascii_strcasecmp (content_type, "multipart/related")) {
                parent = g_object_ref (msg);
-       } else if (content_type && !g_strcasecmp (content_type, "multipart/mixed")) {
+       } else if (content_type && !g_ascii_strcasecmp (content_type, "multipart/mixed")) {
                TnyList *parts = TNY_LIST (tny_simple_list_new ());
                TnyIterator *iter;
 
@@ -1226,7 +1279,7 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg)
                        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")) {
+                       if (content_type && !g_ascii_strcasecmp (content_type, "multipart/related")) {
                                parent = part;
                                break;
                        } else {
@@ -1312,12 +1365,17 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        modest_tny_msg_get_references (TNY_MSG (msg), NULL, &(priv->references), &(priv->in_reply_to));
        priority_flags = tny_header_get_priority (header);
 
-       if (to)
-               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field),  to);
+       if (to) {
+               gchar *quoted_names = modest_text_utils_quote_names (to);
+               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), quoted_names);
+               g_free (quoted_names);
+       }
 
        field_view_set = TRUE;
        if (cc) {
-               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field),  cc);
+               gchar *quoted_names = modest_text_utils_quote_names (cc);
+               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field),  quoted_names);
+               g_free (quoted_names);
                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)) {
@@ -1329,7 +1387,9 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
 
        field_view_set = TRUE;
        if (bcc) {
-               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
+               gchar *quoted_names = modest_text_utils_quote_names (bcc);
+               modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), quoted_names);
+               g_free (quoted_names);
                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)) {
@@ -1430,7 +1490,6 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        g_free (bcc);
 }
 
-
 static void
 modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
 {
@@ -1460,7 +1519,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
 
        /* font color */
        priv->font_color_toolitem = GTK_WIDGET (gtk_tool_item_new ());
-       priv->font_color_button = hildon_color_button_new ();
+       priv->font_color_button = modest_color_button_new ();
        gtk_widget_set_size_request (priv->font_color_button, -1, 48);
        GTK_WIDGET_UNSET_FLAGS (priv->font_color_toolitem, GTK_CAN_FOCUS);
        GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS);
@@ -1558,6 +1617,9 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsItalics");
        gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
        gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
+       tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsInsertImage");
+       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) */
@@ -1565,7 +1627,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
 
        /* 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
+          could go against the gconf setting regarding showing or not
           the toolbar of the editor window */
        gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE);
 }
@@ -1614,6 +1676,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, const gchar
                modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) account_name);
        }
        priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
+       update_branding (MODEST_MSG_EDIT_WINDOW (obj), priv->last_from_account);
        hildon_button_set_title (HILDON_BUTTON (priv->from_field),
                                 _("mail_va_from"));
        hildon_button_set_value (HILDON_BUTTON (priv->from_field), 
@@ -1815,6 +1878,7 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        g_object_unref (att_iter);
        
        data->priority_flags = priv->priority_flags;
+       data->custom_header_pairs = tny_list_copy (priv->custom_header_pairs);
 
        return data;
 }
@@ -1847,6 +1911,8 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
        g_free (data->account_name);
        g_free (data->references);
        g_free (data->in_reply_to);
+
+       g_object_unref (data->custom_header_pairs);
        
        if (data->draft_msg != NULL) {
                g_object_unref (data->draft_msg);
@@ -1908,11 +1974,16 @@ modest_msg_edit_window_set_format (ModestMsgEditWindow *self,
        switch (format) {
        case MODEST_MSG_EDIT_FORMAT_HTML:
                wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
-               if (parent_priv->toolbar) gtk_widget_show (parent_priv->toolbar);
+               update_signature (self, priv->last_from_account, priv->last_from_account);
+               if (parent_priv->toolbar) 
+                       on_show_toolbar_button_toggled (HILDON_CHECK_BUTTON (priv->show_toolbar_button),
+                                                       MODEST_MSG_EDIT_WINDOW (self));
                break;
        case MODEST_MSG_EDIT_FORMAT_TEXT:
                wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
-               if (parent_priv->toolbar) gtk_widget_hide (parent_priv->toolbar);
+               if (parent_priv->toolbar) 
+                       on_show_toolbar_button_toggled (HILDON_CHECK_BUTTON (priv->show_toolbar_button),
+                                                       MODEST_MSG_EDIT_WINDOW (self));
                break;
        default:
                g_return_if_reached ();
@@ -2142,72 +2213,17 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
 
 }
 
-#ifdef MODEST_HILDON_VERSION_0
-void
-modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
-{
-       
-       WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
-       ModestMsgEditWindowPrivate *priv;
-       GtkWidget *dialog = NULL;
-       gint response;
-       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));
-       g_free (buffer_format);
-
-       if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) {
-               new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
-               if (new_color != NULL) {
-                       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR,
-                                                     (gpointer) new_color);
-               }
-       }
-       gtk_widget_destroy (dialog);
-}
-
-
-void
-modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
-{
-       
-       ModestMsgEditWindowPrivate *priv;
-       GtkWidget *dialog = NULL;
-       gint response;
-       GdkColor *old_color = NULL;
-       const GdkColor *new_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_selector_new (GTK_WINDOW (window));
-       hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog),(GdkColor*)old_color);
-
-       if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) {
-               new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
-               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);
@@ -2225,7 +2241,6 @@ modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
 void
 modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
 {
-       
        ModestMsgEditWindowPrivate *priv;
        GtkWidget *dialog = NULL;
        GdkColor *old_color = NULL;
@@ -2244,9 +2259,6 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
        gtk_widget_destroy (dialog);
 }
 
-#endif /*!MODEST_HILDON_VERSION_0*/
-
-
 
 static TnyStream*
 create_stream_for_uri (const gchar* uri)
@@ -2469,7 +2481,7 @@ on_attach_file_response (GtkDialog *dialog,
                        modest_msg_edit_window_attach_file_one (window, uri, allowed_size);
 
                if (total_size > allowed_size) {
-                       g_warning ("%s: total size: %u", 
+                       g_debug ("%s: total size: %u", 
                                   __FUNCTION__, (unsigned int)total_size);
                        break;
                }
@@ -2498,14 +2510,19 @@ 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"));
-       conf_folder = modest_conf_get_string (modest_runtime_get_conf (), MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL);
+       conf_folder = modest_conf_get_string (modest_runtime_get_conf (),
+                                             MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL);
        if (conf_folder && conf_folder[0] != '\0') {
                gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), conf_folder);
        } else {
                gchar *docs_folder;
-               /* Set the default folder to images folder */
-               docs_folder = g_build_filename (g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV),
-                                               ".documents", NULL);
+               /* Set the default folder to documents folder */
+               docs_folder = (gchar *) g_strdup(g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
+               if (!docs_folder) {
+                       /* fallback */
+                       docs_folder = g_build_filename (g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV),
+                                                       ".documents", NULL);
+               }
                gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), docs_folder);
                g_free (docs_folder);
        }
@@ -2573,13 +2590,13 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
                    info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
                        size = info->size;
                        if (size > allowed_size) {
-                               modest_platform_information_banner (NULL, NULL, 
-                                                                   _FM("sfil_ib_opening_not_allowed"));
+                               modest_platform_information_banner (NULL, NULL,
+                                                                   _("mail_ib_error_attachment_size"));
                                g_free (filename);
                                return 0;
                        }
                } else
-                       g_warning ("%s: could not get attachment size", __FUNCTION__);
+                       g_debug ("%s: could not get attachment size", __FUNCTION__);
                
                stream = create_stream_for_uri (uri);
                
@@ -2636,7 +2653,6 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
                        g_object_unref (att_list);
                        return;
                }
-               
        } else {
                g_object_ref (att_list);
        }
@@ -2707,7 +2723,7 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
        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))) 
+       if (!modest_attachments_view_has_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view)))
                gtk_widget_grab_focus (priv->subject_field);
 }
 
@@ -2716,21 +2732,15 @@ modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window,
                                            gpointer userdata)
 {
        ModestMsgEditWindowPrivate *priv;
-       GdkColor *new_color;
+       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);
 
+       hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), &new_color);
+
+       wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) &new_color);
+
+       gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body);
 }
 
 static void
@@ -2898,7 +2908,7 @@ modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window,
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
        if (editor == NULL) {
-               GtkWidget *view_focus;
+               GtkWidget *view_focus, *parent;
                view_focus = gtk_window_get_focus (GTK_WINDOW (window));
 
                /* This code should be kept in sync with ModestRecptEditor. The
@@ -2907,24 +2917,15 @@ modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window,
                   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));
-                       }
-               }
+               parent = gtk_widget_get_parent (view_focus);
+               if (parent && MODEST_IS_RECPT_EDITOR (parent))
+                       editor = MODEST_RECPT_EDITOR (parent);
 
                if (editor == NULL)
                        editor = MODEST_RECPT_EDITOR (priv->to_field);
-
        }
 
-       modest_address_book_select_addresses (editor);
-
+       modest_address_book_select_addresses (editor, GTK_WINDOW (window));
 }
 
 void
@@ -2961,6 +2962,10 @@ modest_msg_edit_window_show_toolbar (ModestWindow *self,
        } else {
                gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
        }
+       modest_conf_set_bool(modest_runtime_get_conf(), MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, show_toolbar, NULL);
+       if (hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->show_toolbar_button)) != show_toolbar) {
+               hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->show_toolbar_button), show_toolbar);
+       }
 }
 
 void
@@ -3027,19 +3032,15 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
 
        gtk_widget_set_no_show_all (GTK_WIDGET (parent_priv->toolbar), TRUE);
 
-       if (parent_priv->toolbar) {
-               if (file_format == MODEST_FILE_FORMAT_PLAIN_TEXT) {
-                       gtk_widget_hide (parent_priv->toolbar);
-               } else {
-                       gtk_widget_show (parent_priv->toolbar);
-               }
-       }
-
        if (current_format != file_format) {
                switch (file_format) {
                case MODEST_FILE_FORMAT_FORMATTED_TEXT:
                        wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
                        remove_tags (WP_TEXT_BUFFER (priv->text_buffer));
+                       update_signature (window, priv->last_from_account, priv->last_from_account);
+                       if (parent_priv->toolbar)
+                               on_show_toolbar_button_toggled (HILDON_CHECK_BUTTON (priv->show_toolbar_button),
+                                                               MODEST_MSG_EDIT_WINDOW (window));
                        break;
                case MODEST_FILE_FORMAT_PLAIN_TEXT:
                {
@@ -3050,7 +3051,9 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
                        gtk_widget_destroy (dialog);
                        if (response == GTK_RESPONSE_OK) {
                                wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
-                               if (parent_priv->toolbar) gtk_widget_hide (parent_priv->toolbar);
+                               if (parent_priv->toolbar)
+                                       on_show_toolbar_button_toggled (HILDON_CHECK_BUTTON (priv->show_toolbar_button),
+                                                                       MODEST_MSG_EDIT_WINDOW (window));
                        } else {
                                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);
@@ -3206,12 +3209,24 @@ void
 modest_msg_edit_window_undo (ModestMsgEditWindow *window)
 {
        ModestMsgEditWindowPrivate *priv;
+       ModestWindowPrivate *parent_priv;
+       gboolean was_rich_text, is_rich_text;
 
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+       was_rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+
        wp_text_buffer_undo (WP_TEXT_BUFFER (priv->text_buffer));
 
+       is_rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+
+       if (parent_priv->toolbar && was_rich_text != is_rich_text) {
+               on_show_toolbar_button_toggled (HILDON_CHECK_BUTTON (priv->show_toolbar_button),
+                                               MODEST_MSG_EDIT_WINDOW (window));
+       }
+
        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
        modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
 }
@@ -3397,36 +3412,49 @@ gboolean
 modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook)
 {
        ModestMsgEditWindowPrivate *priv = NULL;
-       
+       GSList *address_list = NULL;
+       gboolean no_to, no_cc, no_bcc;
+
        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_to = modest_text_utils_no_recipient (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field)));
+       no_cc = modest_text_utils_no_recipient (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field)));
+       no_bcc = modest_text_utils_no_recipient (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field)));
+
+
+       if (no_to && no_cc && no_bcc) {
                /* no recipient contents, then select contacts */
                modest_msg_edit_window_open_addressbook (window, NULL);
                return FALSE;
        }
 
+       /* Check names */
        g_object_ref (window);
-       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),  add_to_addressbook)) {
+       if (!no_to && !modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),
+                                             (add_to_addressbook) ? &address_list : NULL)) {
                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
                g_object_unref (window);
                return FALSE;
        }
-       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field),  add_to_addressbook)) {
+       if (!no_cc && !modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field),
+                                             (add_to_addressbook) ? &address_list : NULL)) {
                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field));
                g_object_unref (window);
                return FALSE;
        }
-       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), add_to_addressbook)) {
+       if (!no_bcc && !modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field),
+                                             (add_to_addressbook) ? &address_list : NULL)) {
                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field));
                g_object_unref (window);
                return FALSE;
        }
 
+       /* Add contacts to address book */
+       if (add_to_addressbook && address_list)
+               modest_address_book_add_address_list (address_list);
+
        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));
@@ -3436,6 +3464,45 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to
 
 }
 
+void
+modest_msg_edit_window_add_to_contacts (ModestMsgEditWindow *self)
+{
+       GSList *recipients = NULL;
+       ModestMsgEditWindowPrivate *priv;
+       gchar *joined, *after_remove, *to, *cc, *bcc;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+       /* First of all check names */
+       if (!modest_msg_edit_window_check_names (self, FALSE))
+               return;
+
+       if (!modest_msg_edit_window_has_pending_addresses (self))
+               return;
+
+       /* Don't add the from obviously */
+       to  =  g_strdup (modest_recpt_editor_get_recipients ((ModestRecptEditor *) priv->to_field));
+       cc  =  g_strdup (modest_recpt_editor_get_recipients ((ModestRecptEditor *) priv->cc_field));
+       bcc =  g_strdup (modest_recpt_editor_get_recipients ((ModestRecptEditor *) priv->bcc_field));
+
+       joined = modest_text_utils_join_addresses (NULL, to, cc, bcc);
+       g_free (to);
+       g_free (cc);
+       g_free (bcc);
+
+       after_remove = modest_text_utils_remove_duplicate_addresses (joined);
+       g_free (joined);
+
+       recipients = modest_text_utils_split_addresses_list (after_remove);
+       g_free (after_remove);
+
+       if (recipients) {
+               /* Offer the user to add recipients to the address book */
+               modest_address_book_add_address_list_with_selector (recipients, (GtkWindow *) self);
+               g_slist_foreach (recipients, (GFunc) g_free, NULL); g_slist_free (recipients);
+       }
+}
+
 static void
 modest_msg_edit_window_add_attachment_clicked (GtkButton *button,
                                               ModestMsgEditWindow *window)
@@ -3544,30 +3611,57 @@ body_insert_text (GtkTextBuffer *buffer,
 {
        GtkTextIter end_iter;
        gint offset;
+       glong utf8_len;
+       gint line;
+       gchar *text_offset;
+       gint text_lines;
+
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
        gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (buffer), &end_iter);
 
        offset = gtk_text_iter_get_offset (&end_iter);
+       line = gtk_text_iter_get_line (&end_iter);
+
+       text_offset = text;
+       text_lines = 0;
+       while (text_offset < text + len) {
+               if (*text_offset == '\n')
+                       text_lines++;
+               if (text_lines + line >= MAX_BODY_LINES) {
+                       len = text_offset - text;
+                       break;
+               }
+               text_offset++;
+       }
 
-       if (offset + len > MAX_BODY_LENGTH) {
+       utf8_len = g_utf8_strlen (text, len);
+
+       if (line > MAX_BODY_LINES || offset + utf8_len > MAX_BODY_LENGTH) {
                g_signal_stop_emission_by_name (G_OBJECT (buffer), "insert-text");
-               if (offset < MAX_BODY_LENGTH)
+               if (line <= MAX_BODY_LINES && offset < MAX_BODY_LENGTH)
                {
                        gchar *result;
+                       gchar *utf8_end;
+
+                       utf8_end = g_utf8_offset_to_pointer (text, MAX_BODY_LENGTH - offset);
 
                        /* Prevent endless recursion */
-                       result = g_strndup (text, MAX_BODY_LENGTH - offset);
+                       result = g_strndup (text, utf8_end - text);
                        g_signal_handlers_block_by_func (G_OBJECT (buffer), G_CALLBACK (body_insert_text), window);
                        g_signal_emit_by_name (G_OBJECT (buffer), "insert-text", location,
-                                              (gpointer) result, (gpointer) MAX_BODY_LENGTH - offset,
+                                              (gpointer) result, (gpointer) (utf8_end - text),
                                               (gpointer) window);
                        g_signal_handlers_unblock_by_func (G_OBJECT (buffer), G_CALLBACK (body_insert_text), window);
                }
 
        }
-       if (offset + len > MAX_BODY_LENGTH) {
-               hildon_banner_show_information (GTK_WIDGET (window), NULL, 
-                                               _CS("ckdg_ib_maximum_characters_reached"));
+       if (line > MAX_BODY_LINES || offset + utf8_len > MAX_BODY_LENGTH) {
+               if (priv->max_chars_banner == NULL) {
+                       priv->max_chars_banner = hildon_banner_show_information (GTK_WIDGET (window), NULL, 
+                                                                                _CS("ckdg_ib_maximum_characters_reached"));
+                       g_object_weak_ref (G_OBJECT (priv->max_chars_banner), (GWeakNotify) max_chars_banner_unref, window);
+               }
        }
 }
 
@@ -3692,7 +3786,7 @@ gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter,
                        result = TRUE;
                        if (!gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY,
                                                           match_start, match_end, NULL)) {
-                               g_warning ("Matched string with collate, but not matched in model");
+                               g_debug ("Matched string with collate, but not matched in model");
                        }
                        g_free (found_text);
                }
@@ -3929,17 +4023,16 @@ on_account_removed (TnyAccountStore *account_store,
        }
 }
 
-static void update_signature (ModestMsgEditWindow *self,
-                             const gchar *old_account, 
-                             const gchar *new_account)
+static void
+update_signature (ModestMsgEditWindow *self,
+                 const gchar *old_account,
+                 const gchar *new_account)
 {
        ModestMsgEditWindowPrivate *priv;
        gboolean has_old_signature, has_new_signature;
        GtkTextIter iter;
-       GtkTextIter match_start, match_end;
        ModestAccountMgr *mgr;
        gchar *signature;
-       gchar *full_signature;
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 
@@ -3952,15 +4045,23 @@ static void update_signature (ModestMsgEditWindow *self,
        if (old_account) {
                signature = modest_account_mgr_get_signature_from_recipient (mgr, old_account, &has_old_signature);
                if (has_old_signature) {
-                       full_signature = g_strconcat ("\n--\n", signature, NULL);
-                       if (gtk_text_iter_forward_search (&iter, full_signature, 0, &match_start, &match_end, NULL)) {
+                       GtkTextIter match_start, match_end;
+                       /* We cannot use
+                          MODEST_TEXT_UTILS_SIGNATURE_MARKER as it
+                          seems that the search has some problems
+                          with the blank space at the end */
+                       if (gtk_text_iter_forward_search (&iter, "--",
+                                                         GTK_TEXT_SEARCH_TEXT_ONLY,
+                                                         &match_start, NULL, NULL)) {
+                               gtk_text_buffer_get_end_iter (priv->text_buffer ,&match_end);
                                gtk_text_buffer_delete (priv->text_buffer, &match_start, &match_end);
                                iter = match_start;
                        } else if (gtk_text_iter_forward_search (&iter, _("mcen_ia_editor_original_message"), 0,
                                                                 &match_start, &match_end, NULL)) {
                                iter = match_start;
                        }
-                       g_free (full_signature);
+               } else {
+                       gtk_text_buffer_get_end_iter (priv->text_buffer, &iter);
                }
                g_free (signature);
        }
@@ -3968,14 +4069,70 @@ static void update_signature (ModestMsgEditWindow *self,
        priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
        signature = modest_account_mgr_get_signature_from_recipient (mgr, new_account, &has_new_signature);
        if (has_new_signature) {
-               full_signature = g_strconcat ("\n--\n", signature, NULL);
-               gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1);
-               g_free (full_signature);
+               gboolean is_rich;
+
+               gchar *full_signature = g_strconcat ((gtk_text_iter_starts_line (&iter)) ? "" : "\n",
+                                                    MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n",
+                                                    signature, NULL);
+               is_rich = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+               if (is_rich) {
+                       WPTextBufferFormat *fmt;
+                       GdkColor style_color;
+                       if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
+                               gdk_color_parse ("grey", &style_color);
+                       }
+                       fmt = g_new0 (WPTextBufferFormat, 1);
+                       fmt->color = style_color;
+                       fmt->cs.color = 0x1;
+                       wp_text_buffer_insert_with_attribute (WP_TEXT_BUFFER (priv->text_buffer), &iter, 
+                                                             full_signature, -1,
+                                                             fmt, TRUE);
+                       g_free (fmt);
+                       g_free (full_signature);
+               } else {
+                       gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1);
+               }
        }
        g_free (signature);
        gtk_text_buffer_end_user_action (priv->text_buffer);
 }
 
+static void update_branding (ModestMsgEditWindow *self,
+                            const gchar *new_account)
+{
+       ModestMsgEditWindowPrivate *priv;
+       ModestAccountMgr *mgr;
+       const GdkPixbuf *new_icon = NULL;
+       gchar *new_label = NULL;
+       gboolean show = FALSE;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+       mgr = modest_runtime_get_account_mgr ();
+
+       modest_account_mgr_get_branding_from_recipient (mgr, new_account, &new_label, &new_icon, MODEST_ICON_SIZE_SMALL);
+       if (new_icon) {
+               gtk_image_set_from_pixbuf (GTK_IMAGE (priv->brand_icon), (GdkPixbuf *) new_icon);
+               gtk_widget_show (priv->brand_icon);
+               show = TRUE;
+       } else {
+               gtk_widget_hide (priv->brand_icon);
+       }
+       if (new_label) {
+               gtk_label_set_text (GTK_LABEL (priv->brand_label), new_label);
+               gtk_widget_show (priv->brand_label);
+               g_free (new_label);
+               show = TRUE;
+       } else {
+               gtk_widget_hide (priv->brand_label);
+       }
+
+       if (show)
+               gtk_widget_show (priv->brand_container);
+       else
+               gtk_widget_hide (priv->brand_container);
+}
+
 static void
 from_field_changed (HildonPickerButton *button,
                    ModestMsgEditWindow *self)
@@ -3986,10 +4143,21 @@ from_field_changed (HildonPickerButton *button,
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 
        old_account = priv->last_from_account;
-       priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
-       new_account = priv->last_from_account;
+       new_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
+
+       if (!new_account) {
+               g_warning ("%s, could not get the new account", __FUNCTION__);
+               return;
+       }
+
+       /* If the From is the same do nothing */
+       if (old_account && new_account && !strcmp (old_account, new_account))
+               return;
+
+       priv->last_from_account = new_account;
 
        update_signature (self, old_account, new_account);
+       update_branding (self, new_account);
 
 }
 
@@ -4185,6 +4353,9 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
        g_signal_connect (G_OBJECT (html_toggle), "toggled", G_CALLBACK (on_format_toggle), &helper);
        g_signal_connect (G_OBJECT (text_toggle), "toggled", G_CALLBACK (on_format_toggle), &helper);
 
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+                                    GTK_WINDOW (dialog), GTK_WINDOW (window));
+
        /* Save settings if the user clicked on done */
        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
                TnyHeaderFlags flags;
@@ -4216,6 +4387,16 @@ on_message_settings (GtkAction *action,
 }
 
 static void
+on_show_toolbar_button_toggled (HildonCheckButton *button,
+                               ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+
+       modest_msg_edit_window_show_toolbar (MODEST_WINDOW (window),
+                                            hildon_check_button_get_active (button));
+}
+
+static void
 on_cc_button_toggled (HildonCheckButton *button,
                      ModestMsgEditWindow *window)
 {
@@ -4248,6 +4429,9 @@ setup_menu (ModestMsgEditWindow *self)
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_checknames"), NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_on_check_names),
                                           NULL);
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
+                                          APP_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_undo"), "<Ctrl>z",
                                           APP_MENU_CALLBACK (modest_ui_actions_on_undo),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo));
@@ -4274,10 +4458,7 @@ setup_menu (ModestMsgEditWindow *self)
        gtk_button_set_alignment (GTK_BUTTON (priv->bcc_button), 0.5, 0.5);
        gtk_button_set_alignment (GTK_BUTTON (priv->bcc_button), 0.5, 0.5);
 
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_attach_inlineimage"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_insert_image),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_set_style));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: add attachment"), NULL,
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_add_attachment"), NULL,
                                           APP_MENU_CALLBACK (modest_msg_edit_window_add_attachment_clicked),
                                           NULL);
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL,
@@ -4289,6 +4470,17 @@ setup_menu (ModestMsgEditWindow *self)
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_find"), "<Ctrl>f",
                                           APP_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page),
                                           NULL);
+       priv->show_toolbar_button = hildon_check_button_new (0);
+       gtk_button_set_label (GTK_BUTTON (priv->show_toolbar_button), _("mcen_bd_show_toolbar"));
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->show_toolbar_button),
+                                       FALSE);
+       modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->show_toolbar_button),
+                                                 MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_show_toolbar));
+       g_signal_connect (G_OBJECT (priv->show_toolbar_button), "toggled",
+                         G_CALLBACK (on_show_toolbar_button_toggled), (gpointer) self);
+       gtk_button_set_alignment (GTK_BUTTON (priv->show_toolbar_button), 0.5, 0.5);
+       gtk_button_set_alignment (GTK_BUTTON (priv->show_toolbar_button), 0.5, 0.5);
+
 }
 
 static void
@@ -4309,7 +4501,7 @@ _create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_siz
 
        box = gtk_hbox_new (FALSE, 0);
 
-       align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       align = gtk_alignment_new (0.0, 0.0, 1.0, 0.0);
        gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 0, MODEST_MARGIN_DEFAULT);
 
        abook_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT);
@@ -4331,3 +4523,91 @@ _create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_siz
   
        return box;  
 }
+
+static void 
+max_chars_banner_unref (ModestMsgEditWindow *self, GObject *old_ref)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(self));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+       priv->max_chars_banner = NULL;
+}
+
+static gboolean
+has_pending_addresses (ModestRecptEditor *recpt_editor)
+{
+       const gchar *recipients = NULL;
+       GSList *start_indexes = NULL, *end_indexes = NULL;
+       GSList *current_start, *current_end;
+       GtkTextBuffer *buffer;
+       gint offset_delta = 0;
+       gint last_length;
+       gboolean has_recipients_to_add = FALSE;
+
+       recipients = modest_recpt_editor_get_recipients (recpt_editor);
+       last_length = g_utf8_strlen (recipients, -1);
+       modest_text_utils_get_addresses_indexes (recipients, &start_indexes, &end_indexes);
+
+       if (!start_indexes)
+               return FALSE;
+
+       current_start = start_indexes;
+       current_end = end_indexes;
+       buffer = modest_recpt_editor_get_buffer (recpt_editor);
+
+       while (current_start && !has_recipients_to_add) {
+               gchar *address;
+               gchar *start_ptr, *end_ptr;
+               gint start_pos, end_pos;
+
+               start_pos = (*((gint*) current_start->data)) + offset_delta;
+               end_pos = (*((gint*) current_end->data)) + offset_delta;
+
+               start_ptr = g_utf8_offset_to_pointer (recipients, start_pos);
+               end_ptr = g_utf8_offset_to_pointer (recipients, end_pos);
+
+               address = g_strstrip (g_strndup (start_ptr, end_ptr - start_ptr));
+
+               if (modest_text_utils_validate_recipient (address, NULL)) {
+                       if (!modest_address_book_has_address (address)) {
+                               has_recipients_to_add = TRUE;
+                       }
+               }
+               current_start = g_slist_next (current_start);
+               current_end = g_slist_next (current_end);
+       }
+       return has_recipients_to_add;
+}
+
+gboolean
+modest_msg_edit_window_has_pending_addresses (ModestMsgEditWindow *self)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(self), FALSE);
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+       if (!has_pending_addresses ((ModestRecptEditor *) priv->to_field) &&
+           !has_pending_addresses ((ModestRecptEditor *) priv->cc_field) &&
+           !has_pending_addresses ((ModestRecptEditor *) priv->bcc_field))
+               return FALSE;
+       else
+               return TRUE;
+}
+
+void
+modest_msg_edit_window_set_custom_header_pairs (ModestMsgEditWindow *self,
+                                               TnyList *header_pairs)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
+       g_return_if_fail (TNY_IS_LIST (header_pairs));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+       g_object_unref (priv->custom_header_pairs);
+       priv->custom_header_pairs = tny_list_copy (header_pairs);
+}