2013-02-26 [wwp] 3.9.0cvs103

[claws.git] / src / messageview.c

diff --git a/src/messageview.c b/src/messageview.c
index 088a129dbf8913d652cd046b316a9aeb5d5ce26b..80028431d23826d0ac25ffbc96cab48b390484fe 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -758,7 +758,6 @@ static MessageView *messageview_create_with_new_window_visible(MainWindow *mainw
        messageview_add_toolbar(msgview, window);
 
        if (show) {
-               gtk_widget_grab_focus(msgview->mimeview->textview->text);
                gtk_widget_show(window);
        } else {
                gtk_widget_realize(window);
@@ -772,6 +771,11 @@ static MessageView *messageview_create_with_new_window_visible(MainWindow *mainw
                          prefs_common.toolbar_style);
        messageview_init(msgview);
 
+       if (show) {
+               GTK_EVENTS_FLUSH();
+               gtk_widget_grab_focus(msgview->mimeview->textview->text);
+       }
+
        return msgview;
 }
 
@@ -1052,6 +1056,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                        "\n"
                        "--%s\n"
                        "Content-Type: application/octet-stream\n"
+                       "\n"
                        "Reporting-UA: %s\n"
                        "Original-Recipient: rfc822;%s\n"
                        "Final-Recipient: rfc822;%s\n"
@@ -2958,7 +2963,7 @@ static gboolean messageview_update_msg(gpointer source, gpointer data)
                                textview_show_info(messageview->mimeview->textview,
                                        MSG_IS_DELETED(old_msginfo->flags) ?
                                        _("\n  Message has been deleted") :
-                                       _("\n  Message has been moved to trash"));
+                                       _("\n  Message has been deleted or moved to another folder"));
                        } else
                                messageview->update_needed = TRUE;