Work to improve drafts handling, mainly from the UI pov. This, with
[modest] / src / maemo / modest-msg-edit-window.c
index aa1bfa0..1a1c242 100644 (file)
@@ -55,6 +55,7 @@
 #include "modest-mail-operation.h"
 #include "modest-tny-platform-factory.h"
 #include "modest-tny-msg.h"
+#include "modest-tny-folder.h"
 #include "modest-address-book.h"
 #include "modest-text-utils.h"
 #include <tny-simple-list.h>
@@ -93,13 +94,15 @@ static void  send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *edi
 static void  style_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
 static void  remove_attachment_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
 static void  zoom_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
+static void  paste_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
+static void  copy_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
 static void  setup_insensitive_handlers (ModestMsgEditWindow *editor);
 static void  reset_modified (ModestMsgEditWindow *editor);
-static gboolean is_modified (ModestMsgEditWindow *editor);
 
 static void  text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *window);
 static void  text_buffer_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, gpointer userdata);
 static void  text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window);
+static void  text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, ModestMsgEditWindow *window);
 static void  text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id);
 static void  subject_field_changed (GtkEditable *editable, ModestMsgEditWindow *window);
 static void  modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window,
@@ -141,6 +144,18 @@ static void modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
                                                        ModestMsgEditWindow *window);
 static void modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
                                                       ModestMsgEditWindow *window);
+static gboolean gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter,
+                                                         const gchar *str,
+                                                         GtkTextIter *match_start,
+                                                         GtkTextIter *match_end);
+                                                         
+
+
+/* static gboolean */
+/* on_key_pressed (GtkWidget *self, */
+/*             GdkEventKey *event, */
+/*             gpointer user_data); */
+
 static void edit_menu_activated (GtkAction *action,
                                 gpointer userdata);
 static void view_menu_activated (GtkAction *action,
@@ -184,6 +199,7 @@ struct _ModestMsgEditWindowPrivate {
        GtkWidget   *size_tool_button_label;
        
        GtkWidget   *find_toolbar;
+       gchar       *last_search;
 
        GtkWidget   *scroll;
        GtkWidget   *scroll_area;
@@ -199,6 +215,7 @@ struct _ModestMsgEditWindowPrivate {
        gulong      system_clipboard_change_handler_id;
 
        TnyMsg      *draft_msg;
+       gboolean    sent;
 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -268,10 +285,11 @@ modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass)
        modest_window_class->zoom_plus_func = modest_msg_edit_window_zoom_plus;
        modest_window_class->zoom_minus_func = modest_msg_edit_window_zoom_minus;
        modest_window_class->show_toolbar_func = modest_msg_edit_window_show_toolbar;
+       modest_window_class->save_state_func = save_state;
 
        g_type_class_add_private (gobject_class, sizeof(ModestMsgEditWindowPrivate));
 
-       modest_window_class->save_state_func = save_state;
+
 }
 
 static void
@@ -296,10 +314,12 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        priv->priority_flags = 0;
 
        priv->find_toolbar = NULL;
+       priv->last_search = NULL;
 
        priv->draft_msg = NULL;
        priv->clipboard_change_handler_id = 0;
        priv->system_clipboard_change_handler_id = 0;
+       priv->sent = FALSE;
 }
 
 
@@ -417,18 +437,24 @@ init_window (ModestMsgEditWindow *obj)
        priv->text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
        g_object_set (priv->text_buffer, "font_scale", 1.0, NULL);
        wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
-/*     gtk_text_buffer_set_can_paste_rich_text (priv->text_buffer, TRUE); */
+       gtk_text_buffer_register_serialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), "wp-text-buffer");
+       gtk_text_buffer_register_deserialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), "wp-text-buffer");
+
        wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
 
        priv->find_toolbar = hildon_find_toolbar_new (NULL);
        gtk_widget_set_no_show_all (priv->find_toolbar, TRUE);
 
+/*     g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */
+
        g_signal_connect (G_OBJECT (priv->text_buffer), "refresh_attributes",
                          G_CALLBACK (text_buffer_refresh_attributes), obj);
        g_signal_connect (G_OBJECT (priv->text_buffer), "delete-range",
                          G_CALLBACK (text_buffer_delete_range), obj);
        g_signal_connect (G_OBJECT (priv->text_buffer), "can-undo",
                          G_CALLBACK (text_buffer_can_undo), obj);
+       g_signal_connect (G_OBJECT (priv->text_buffer), "can-redo",
+                         G_CALLBACK (text_buffer_can_redo), obj);
        g_signal_connect (G_OBJECT (obj), "window-state-event",
                          G_CALLBACK (modest_msg_edit_window_window_state_event),
                          NULL);
@@ -519,50 +545,22 @@ modest_msg_edit_window_finalize (GObject *obj)
                priv->system_clipboard_change_handler_id = 0;
        }
        
+       if (priv->draft_msg != NULL) {
+               TnyHeader *header = tny_msg_get_header (priv->draft_msg);
+               if (TNY_IS_HEADER (header)) {
+                       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+                       modest_window_mgr_unregister_header (mgr, header);
+               }
+               g_object_unref (priv->draft_msg);
+               priv->draft_msg = NULL;
+       }
+
        /* This had to stay alive for as long as the combobox that used it: */
        modest_pair_list_free (priv->from_field_protos);
        
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
-static gboolean
-on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgEditWindow *self)
-{
-       GtkWidget *close_dialog;
-       ModestMsgEditWindowPrivate *priv;
-       gint response;
-
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
-       modest_window_save_state (MODEST_WINDOW (self));
-       if (is_modified (self)) {
-               close_dialog = hildon_note_new_confirmation (GTK_WINDOW (self), _("mcen_nc_no_email_message_modified_save_changes"));
-               response = gtk_dialog_run (GTK_DIALOG (close_dialog));
-               gtk_widget_destroy (close_dialog);
-
-               if (response != GTK_RESPONSE_CANCEL) {
-                       modest_ui_actions_on_save_to_drafts (NULL, self);
-               }
-       } 
-/*     /\* remove old message from drafts *\/ */
-/*     if (priv->draft_msg) { */
-/*             TnyHeader *header = tny_msg_get_header (priv->draft_msg); */
-/*             TnyAccount *account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(), */
-/*                                                                                        account_name, */
-/*                                                                                        TNY_ACCOUNT_TYPE_STORE); */
-/*             TnyFolder *folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS); */
-/*             g_return_val_if_fail (TNY_IS_HEADER (header), FALSE); */
-/*             g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); */
-/*             tny_folder_remove_msg (folder, header, NULL); */
-/*             g_object_unref (folder); */
-/*             g_object_unref (header); */
-/*             g_object_unref (priv->draft_msg); */
-/*             priv->draft_msg = NULL; */
-/*     } */
-       gtk_widget_destroy (GTK_WIDGET (self));
-       
-       return TRUE;
-}
-
 static GtkWidget *
 menubar_to_menu (GtkUIManager *ui_manager)
 {
@@ -598,6 +596,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
        ModestMsgEditWindowPrivate *priv;
        GtkTextIter iter;
        TnyHeaderFlags priority_flags;
+       TnyFolder *msg_folder;
        
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
        g_return_if_fail (TNY_IS_MSG (msg));
@@ -613,10 +612,22 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
 
        if (to)
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field),  to);
-       if (cc)
+       if (cc) {
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field),  cc);
-       if (bcc)
+               gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
+               gtk_widget_show (priv->cc_caption);
+       } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_CC, NULL)) {
+               gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
+               gtk_widget_hide (priv->cc_caption);
+       }
+       if (bcc) {
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
+               gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
+               gtk_widget_show (priv->bcc_caption);
+       } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_BCC, NULL)) {
+               gtk_widget_set_no_show_all (priv->bcc_caption, FALSE);
+               gtk_widget_hide (priv->bcc_caption);
+       } 
        if (subject)
                gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
        modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW(self),
@@ -624,7 +635,6 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
 
        update_window_title (self);
 
-/*     gtk_text_buffer_set_can_paste_rich_text (priv->text_buffer, TRUE); */
        wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
        body = modest_tny_msg_get_body (msg, TRUE);
 
@@ -672,8 +682,16 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
 
        update_dimmed (self);
        text_buffer_can_undo (priv->text_buffer, FALSE, self);
+       text_buffer_can_redo (priv->text_buffer, FALSE, self);
 
-       priv->draft_msg = msg;
+       /* we should set a reference to the incoming message if it is a draft */
+       msg_folder = tny_msg_get_folder (msg);
+       if (msg_folder) {
+               if (modest_tny_folder_is_local_folder (msg_folder) &&
+                   modest_tny_folder_get_local_folder_type (msg_folder) == TNY_FOLDER_TYPE_DRAFTS)
+                       priv->draft_msg = g_object_ref(msg);
+               g_object_unref (msg_folder);
+       }
 }
 
 static void
@@ -943,11 +961,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
 
        restore_settings (MODEST_MSG_EDIT_WINDOW(obj));
                
-       gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
-
-       g_signal_connect (G_OBJECT(obj), "delete-event",
-                         G_CALLBACK(on_delete_event), obj);
-
        modest_window_set_active_account (MODEST_WINDOW(obj), account_name);
 
        modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj));
@@ -1073,13 +1086,33 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        else
                data->html_body = NULL;
 
-       data->attachments = priv->attachments; /* TODO: copy and free ? */
+       /* deep-copy the data */
+       GList *cursor = priv->attachments;
+       data->attachments = NULL;
+       while (cursor) {
+               if (!(TNY_IS_MIME_PART(cursor->data))) {
+                       g_warning ("strange data in attachment list");
+                       continue;
+               }
+               data->attachments = g_list_append (data->attachments,
+                                                  g_object_ref (cursor->data));
+               cursor = g_list_next (cursor);
+       }
+       
        data->priority_flags = priv->priority_flags;
 
        return data;
 }
 
-/* TODO: We must duplicate this implementation for GNOME and Maemo, but that is unwise. */
+
+static void
+unref_gobject (GObject *obj, gpointer data)
+{
+       if (!G_IS_OBJECT(obj))
+               return;
+       g_object_unref (obj);
+}
+
 void 
 modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
                                                      MsgData *data)
@@ -1095,14 +1128,16 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
        g_free (data->subject);
        g_free (data->plain_body);
        g_free (data->html_body);
+       g_free (data->account_name);
+       
        if (data->draft_msg != NULL) {
                g_object_unref (data->draft_msg);
                data->draft_msg = NULL;
        }
-       g_free (data->account_name);
-
-       /* TODO: Free data->attachments? */
-
+       
+       g_list_foreach (data->attachments, (GFunc)unref_gobject,  NULL);
+       g_list_free (data->attachments);
+       
        g_slice_free (MsgData, data);
 }
 
@@ -1210,7 +1245,7 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self,
                wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) (&(buffer_format->color)));
        }
        if (buffer_format->cs.font_size) {
-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BOLD, (gpointer) (buffer_format->font_size));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE, (gpointer) (buffer_format->font_size));
        }
        if (buffer_format->cs.justification) {
                switch (buffer_format->justification) {
@@ -1229,7 +1264,7 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self,
                        
        }
        if (buffer_format->cs.font) {
-               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BOLD, (gpointer) (buffer_format->font));
+               wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, (gpointer) (buffer_format->font));
        }
        if (buffer_format->cs.bullet) {
                wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BULLET, (gpointer) ((int)buffer_format->bullet));
@@ -1513,9 +1548,9 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
 
                        loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
                        while (!tny_stream_is_eos (TNY_STREAM (stream))) {
-                               char read_buffer[128];
+                               unsigned char read_buffer[128];
                                gint readed;
-                               readed = tny_stream_read (TNY_STREAM (stream), read_buffer, 128);
+                               readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128);
                                if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, NULL))
                                        break;
                        }
@@ -1629,7 +1664,7 @@ modest_msg_edit_window_attach_file_noninteractive (
        
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
-       if (file_uri) {
+       if (file_uri && strlen(file_uri)) {
                gint file_id = 0;
                
                /* TODO: We should probably try to use only the URI,
@@ -1637,7 +1672,7 @@ modest_msg_edit_window_attach_file_noninteractive (
                 */
                gchar* filename = g_filename_from_uri (file_uri, NULL, NULL);
                if (!filename) {
-                       g_warning("%s: g_filename_from_uri(%s) failed.\n", __FUNCTION__, file_uri);
+                       g_warning("%s: g_filename_from_uri('%s') failed.\n", __FUNCTION__, file_uri);
                }
 
                file_id = g_open (filename, O_RDONLY, 0);
@@ -1785,7 +1820,7 @@ modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item,
                WPTextBufferFormat format;
 
                memset (&format, 0, sizeof (format));
-               wp_text_buffer_get_current_state (WP_TEXT_BUFFER (priv->text_buffer), &format);
+               wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), &format, FALSE);
 
                label = gtk_bin_get_child (GTK_BIN (menu_item));
                
@@ -1794,14 +1829,14 @@ modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item,
                format.cs.text_position = TRUE;
                format.cs.font = TRUE;
                format.font_size = wp_get_font_size_index (new_size_index, DEFAULT_FONT_SIZE);
-               wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &format);
+/*             wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &format); */
 
-/*             if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE, */
-/*                                                (gpointer) wp_get_font_size_index (new_size_index, 12))) */
-/*                     wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body)); */
+               if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE,
+                                                  (gpointer) wp_get_font_size_index (new_size_index, 12)))
+                       wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
                
                text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
-               markup = g_strconcat ("<span font_family='Serif'>", gtk_label_get_text (GTK_LABEL (label)), "</span>", NULL);
+               markup = g_strconcat ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>", gtk_label_get_text (GTK_LABEL (label)), "</span>", NULL);
                gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
                g_free (markup);
        }
@@ -1993,11 +2028,13 @@ modest_msg_edit_window_show_cc (ModestMsgEditWindow *window,
                                gboolean show)
 {
        ModestMsgEditWindowPrivate *priv = NULL;
+       const gchar *recipients;
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        gtk_widget_set_no_show_all (priv->cc_caption, TRUE);
-       if (show)
+       recipients = modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field));
+       if ((show) || ((recipients != NULL) && (recipients[0] != '\0')))
                gtk_widget_show (priv->cc_caption);
        else
                gtk_widget_hide (priv->cc_caption);
@@ -2009,11 +2046,13 @@ modest_msg_edit_window_show_bcc (ModestMsgEditWindow *window,
                                 gboolean show)
 {
        ModestMsgEditWindowPrivate *priv = NULL;
+       const gchar *recipients;
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        gtk_widget_set_no_show_all (priv->bcc_caption, TRUE);
-       if (show)
+       recipients = modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->bcc_field));
+       if ((show) || ((recipients != NULL) && (recipients[0] != '\0')))
                gtk_widget_show (priv->bcc_caption);
        else
                gtk_widget_hide (priv->bcc_caption);
@@ -2134,10 +2173,12 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
                                        gint file_format)
 {
        ModestMsgEditWindowPrivate *priv;
+       ModestWindowPrivate *parent_priv;
        gint current_format;
 
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
        current_format = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))
@@ -2155,8 +2196,12 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
                        dialog = hildon_note_new_confirmation (NULL, _("emev_nc_formatting_lost"));
                        response = gtk_dialog_run (GTK_DIALOG (dialog));
                        gtk_widget_destroy (dialog);
-                       if (response == GTK_RESPONSE_OK)
+                       if (response == GTK_RESPONSE_OK) {
                                wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
+                       } else {
+                               GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatFormattedTextMenu"));
+                               toggle_action_set_active_block_notify (action, TRUE);
+                       }
                }
                        break;
                }
@@ -2310,6 +2355,20 @@ modest_msg_edit_window_undo (ModestMsgEditWindow *window)
 
 }
 
+void
+modest_msg_edit_window_redo (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       
+       wp_text_buffer_redo (WP_TEXT_BUFFER (priv->text_buffer));
+
+       update_dimmed (window);
+
+}
+
 static void
 update_dimmed (ModestMsgEditWindow *window)
 {
@@ -2390,6 +2449,11 @@ setup_insensitive_handlers (ModestMsgEditWindow *window)
        g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (remove_attachment_insensitive_press), window);
        widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/ViewMenu/ZoomMenu");
        g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (zoom_insensitive_press), window);
+
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/EditMenu/PasteMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (paste_insensitive_press), window);
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (copy_insensitive_press), window);
 }
 
 static void  
@@ -2402,6 +2466,16 @@ text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWin
        gtk_action_set_sensitive (action, can_undo);
 }
 
+static void  
+text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, ModestMsgEditWindow *window)
+{
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       GtkAction *action;
+
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/RedoMenu");
+       gtk_action_set_sensitive (action, can_redo);
+}
+
 static void
 text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id)
 {
@@ -2528,7 +2602,8 @@ remove_attachment_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *edi
                hildon_banner_show_information (NULL, NULL, _("mcen_ib_unable_to_display_more"));
        else if (n_att_selected == 0)
                hildon_banner_show_information (NULL, NULL, _("TODO: select one attachment"));
-               
+       else
+               hildon_banner_show_information (NULL, NULL, _("mail_ib_unable_to_purge_attachments"));
 }
 
 static void
@@ -2561,8 +2636,8 @@ reset_modified (ModestMsgEditWindow *editor)
        gtk_text_buffer_set_modified (priv->text_buffer, FALSE);
 }
 
-static gboolean
-is_modified (ModestMsgEditWindow *editor)
+gboolean
+modest_msg_edit_window_is_modified (ModestMsgEditWindow *editor)
 {
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
        GtkTextBuffer *buffer;
@@ -2627,20 +2702,20 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard,
        ModestWindowPrivate *parent_priv;
        ModestMsgEditWindowPrivate *priv;
        GtkAction *action;
-       gchar *selection;
+       gboolean has_selection;
        GtkWidget *focused;
        GList *selected_attachments = NULL;
        gint n_att_selected = 0;
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-       selection = gtk_clipboard_wait_for_text (clipboard);
+       has_selection = gtk_clipboard_wait_for_targets (clipboard, NULL, NULL);
        focused = gtk_window_get_focus (GTK_WINDOW (window));
 
        action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu");
-       gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
+       gtk_action_set_sensitive (action, (has_selection) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
        action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
-       gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
+       gtk_action_set_sensitive (action, (has_selection) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
 
        selected_attachments = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
        n_att_selected = g_list_length (selected_attachments);
@@ -2649,7 +2724,6 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard,
        action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu");
        gtk_action_set_sensitive (action, n_att_selected == 1);
        
-
        update_paste_dimming (window);
 }
 
@@ -2697,6 +2771,63 @@ modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window,
     
 }
 
+static gboolean 
+gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter,
+                                         const gchar *str,
+                                         GtkTextIter *match_start,
+                                         GtkTextIter *match_end)
+{
+       GtkTextIter end_iter;
+       gchar *str_casefold;
+       gint str_chars_n;
+       gchar *range_text;
+       gchar *range_casefold;
+       gint offset;
+       gint range_chars_n;
+       gboolean result = FALSE;
+
+       if (str == NULL)
+               return TRUE;
+       
+       /* get end iter */
+       end_iter = *iter;
+       gtk_text_iter_forward_to_end (&end_iter);
+
+       str_casefold = g_utf8_casefold (str, -1);
+       str_chars_n = strlen (str);
+
+       range_text = gtk_text_iter_get_visible_text (iter, &end_iter);
+       range_casefold = g_utf8_casefold (range_text, -1);
+       range_chars_n = strlen (range_casefold);
+
+       if (range_chars_n < str_chars_n) {
+               g_free (str_casefold);
+               g_free (range_text);
+               g_free (range_casefold);
+               return FALSE;
+       }
+
+       for (offset = 0; offset <= range_chars_n - str_chars_n; offset++) {
+               gchar *range_subtext = g_strndup (range_casefold + offset, str_chars_n);
+               if (!g_utf8_collate (range_subtext, str_casefold)) {
+                       gchar *found_text = g_strndup (range_text + offset, str_chars_n);
+                       result = TRUE;
+                       gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY,
+                                                     match_start, match_end, NULL);
+                       g_free (found_text);
+               }
+               g_free (range_subtext);
+               if (result)
+                       break;
+       }
+       g_free (str_casefold);
+       g_free (range_text);
+       g_free (range_casefold);
+
+       return result;
+}
+
+
 static void 
 modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
                                            ModestMsgEditWindow *window)
@@ -2706,25 +2837,47 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
        gboolean result;
        GtkTextIter selection_start, selection_end;
        GtkTextIter match_start, match_end;
+       gboolean continue_search = FALSE;
 
        g_object_get (G_OBJECT (widget), "prefix", &current_search, NULL);
-       if ((current_search == NULL) && (strcmp (current_search, "") == 0)) {
+       if ((current_search == NULL) || (strcmp (current_search, "") == 0)) {
                g_free (current_search);
+               g_free (priv->last_search);
+               priv->last_search = NULL;
+               /* Information banner about empty search */
+               hildon_banner_show_information (NULL, NULL, dgettext ("hildon-common-strings", "ecdg_ib_find_rep_enter_text"));
                return;
        }
 
-       gtk_text_buffer_get_selection_bounds (priv->text_buffer, &selection_start, &selection_end);
-       result = gtk_text_iter_forward_search (&selection_end, current_search, GTK_TEXT_SEARCH_VISIBLE_ONLY, &match_start, &match_end, NULL);
-       if (!result) {
+       if ((priv->last_search != NULL)&&(!strcmp (current_search, priv->last_search))) {
+               continue_search = TRUE;
+       } else {
+               g_free (priv->last_search);
+               priv->last_search = g_strdup (current_search);
+       }
+
+       if (continue_search) {
+               gtk_text_buffer_get_selection_bounds (priv->text_buffer, &selection_start, &selection_end);
+               result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, 
+                                                                  &match_start, &match_end);
+               if (!result)
+                       hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_search_complete"));
+       } else {
                GtkTextIter buffer_start;
                gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start);
-               result = gtk_text_iter_forward_search (&buffer_start, current_search, GTK_TEXT_SEARCH_VISIBLE_ONLY, &match_start, &match_end, &selection_start);
+               result = gtk_text_iter_forward_search_insensitive (&buffer_start, current_search, 
+                                                                  &match_start, &match_end);
+               if (!result)
+                       hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_no_matches"));
        }
+
+       /* Mark as selected the string found in search */
        if (result) {
                gtk_text_buffer_select_range (priv->text_buffer, &match_start, &match_end);
                gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (priv->msg_body), &match_start, 0.0, TRUE, 0.0, 0.0);
        } else {
-               /* TODO: warning about non succesful search */
+               g_free (priv->last_search);
+               priv->last_search = NULL;
        }
        g_free (current_search);
 }
@@ -2748,14 +2901,44 @@ update_paste_dimming (ModestMsgEditWindow *window)
        ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        GtkAction *action = NULL;
        GtkClipboard *clipboard = NULL;
+       GtkWidget *focused;
+       gboolean active;
+
+       focused = gtk_window_get_focus (GTK_WINDOW (window));
 
        clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+       active = gtk_clipboard_wait_is_text_available (clipboard);
+
+       if (active) {
+               if (MODEST_IS_ATTACHMENTS_VIEW (focused))
+                       active = FALSE;
+       }
 
        action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/PasteMenu");
-       gtk_action_set_sensitive (action, gtk_clipboard_wait_is_text_available (clipboard));
+       gtk_action_set_sensitive (action, active);
 
 }
 
+static void  
+paste_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
+{
+       GtkWidget *focused = gtk_window_get_focus (GTK_WINDOW (editor));
+
+       if (MODEST_IS_ATTACHMENTS_VIEW (focused))
+               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_unable_to_paste_here"));
+       else
+               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ecoc_ib_edwin_nothing_to_paste"));
+               
+}
+
+static void  
+copy_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
+{
+       hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_unable_to_copy"));
+               
+}
+
+
 static void
 modest_msg_edit_window_system_clipboard_owner_change (GtkClipboard *clipboard,
                                                      GdkEvent *event,
@@ -2817,3 +3000,54 @@ view_menu_activated (GtkAction *action,
 
        update_zoom_dimming (window);
 }
+
+gboolean 
+modest_msg_edit_window_get_sent (ModestMsgEditWindow *window)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
+       return priv->sent;
+}
+
+void 
+modest_msg_edit_window_set_sent (ModestMsgEditWindow *window, 
+                                gboolean sent)
+{
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
+       priv->sent = sent;
+}
+
+
+void            
+modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
+                                 TnyMsg *draft)
+{
+       ModestMsgEditWindowPrivate *priv;
+       TnyHeader *header = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       g_return_if_fail ((draft == NULL)||(TNY_IS_MSG (draft)));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+
+       if (priv->draft_msg != NULL) {
+               header = tny_msg_get_header (priv->draft_msg);
+               if (TNY_IS_HEADER (header)) {
+                       modest_window_mgr_unregister_header (mgr, header);
+               }
+               g_object_unref (priv->draft_msg);
+       }
+
+       if (draft != NULL) {
+               g_object_ref (draft);
+               header = tny_msg_get_header (draft);
+               if (TNY_IS_HEADER (header))
+                       modest_window_mgr_register_header (mgr, header);
+       }
+
+       priv->draft_msg = draft;
+}