2007-04-18 [paul] 2.9.0cvs7
[claws.git] / src / messageview.c
index 16aac78f07124cf242cca1e700748d3968398d0b..dbfcc8df4a9e0ba2080989ce4bfa63845306a0ff 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkcontainer.h>
-#include <gtk/gtkeditable.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtktext.h>
 #include <gtk/gtkmenu.h>
@@ -32,7 +32,6 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "intl.h"
 #include "main.h"
 #include "messageview.h"
 #include "message_search.h"
@@ -47,6 +46,7 @@
 #include "addressbook.h"
 #include "alertpanel.h"
 #include "inputdialog.h"
+#include "mainwindow.h"
 #include "manage_window.h"
 #include "procmsg.h"
 #include "procheader.h"
 #include "hooks.h"
 #include "filtering.h"
 #include "partial_download.h"
+#include "gedit-print.h"
+#include "uri_opener.h"
+#include "inc.h"
+#include "log.h"
 
 static GList *messageview_list = NULL;
 
-static void messageview_destroy_cb     (GtkWidget      *widget,
-                                        MessageView    *messageview);
+static gint messageview_delete_cb      (GtkWidget              *widget,
+                                        GdkEventAny            *event,
+                                        MessageView            *messageview);
 static void messageview_size_allocate_cb(GtkWidget     *widget,
                                         GtkAllocation  *allocation);
 static gboolean key_pressed            (GtkWidget      *widget,
@@ -116,6 +121,9 @@ static void view_source_cb          (gpointer        data,
 static void show_all_header_cb         (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
+static void msg_hide_quotes_cb         (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
 
 static void compose_cb                 (gpointer        data,
                                         guint           action,
@@ -123,9 +131,6 @@ static void compose_cb                      (gpointer        data,
 static void reply_cb                   (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
-static void reedit_cb                  (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
 
 static PrefsAccount *select_account_from_list
                                        (GList          *ac_list);
@@ -141,6 +146,9 @@ static void create_filter_cb                (gpointer        data,
 static void create_processing_cb       (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
+static void open_urls_cb               (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
 
 static void about_cb                   (gpointer        data,
                                         guint           action,
@@ -152,143 +160,151 @@ static GList *msgview_list = NULL;
 static GtkItemFactoryEntry msgview_entries[] =
 {
        {N_("/_File"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_File/_Save as..."),      NULL, save_as_cb, 0, NULL},
-       {N_("/_File/_Print..."),        NULL, print_cb, 0, NULL},
+       {N_("/_File/_Save as..."),      "<control>S", save_as_cb, 0, NULL},
+       {N_("/_File/_Print..."),        "<control>P", print_cb, 0, NULL},
        {N_("/_File/---"),              NULL, NULL, 0, "<Separator>"},
-       {N_("/_File/_Close"),           NULL, close_cb, 0, NULL},
+       {N_("/_File/_Close"),           "<control>W", close_cb, 0, NULL},
 
        {N_("/_Edit"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_Edit/_Copy"),            NULL, copy_cb, 0, NULL},
-       {N_("/_Edit/Select _all"),      NULL, allsel_cb, 0, NULL},
+       {N_("/_Edit/_Copy"),            "<control>C", copy_cb, 0, NULL},
+       {N_("/_Edit/Select _all"),      "<control>A", allsel_cb, 0, NULL},
        {N_("/_Edit/---"),              NULL, NULL, 0, "<Separator>"},
        {N_("/_Edit/_Find in current message..."),
-                                       NULL, search_cb, 0, NULL},
+                                       "<control>F", search_cb, 0, NULL},
 
        {N_("/_View"),                  NULL, NULL, 0, "<Branch>"},
 
-#define CODESET_SEPARATOR \
-       {N_("/_View/_Code set/---"),    NULL, NULL, 0, "<Separator>"}
-#define CODESET_ACTION(action) \
-       NULL, set_charset_cb, action, "/View/Code set/Auto detect"
+#define ENC_SEPARATOR \
+       {N_("/_View/Character _encoding/---"),  NULL, NULL, 0, "<Separator>"}
+#define ENC_ACTION(action) \
+       NULL, set_charset_cb, action, "/View/Character encoding/Auto detect"
 
-       {N_("/_View/_Code set"),        NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/_Code set/_Auto detect"),
+       {N_("/_View/Character _encoding"),      NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/_Auto detect"),
                                        NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/7bit ascii (US-ASC_II)"),
-        CODESET_ACTION(C_US_ASCII)},
-
-#if HAVE_ICONV
-       {N_("/_View/_Code set/Unicode (_UTF-8)"),
-        CODESET_ACTION(C_UTF_8)},
-       CODESET_SEPARATOR,
-#endif
-       {N_("/_View/_Code set/Western European (ISO-8859-_1)"),
-        CODESET_ACTION(C_ISO_8859_1)},
-       {N_("/_View/_Code set/Western European (ISO-8859-15)"),
-        CODESET_ACTION(C_ISO_8859_15)},
-       CODESET_SEPARATOR,
-#if HAVE_ICONV
-       {N_("/_View/_Code set/Central European (ISO-8859-_2)"),
-        CODESET_ACTION(C_ISO_8859_2)},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/_Baltic (ISO-8859-13)"),
-        CODESET_ACTION(C_ISO_8859_13)},
-       {N_("/_View/_Code set/Baltic (ISO-8859-_4)"),
-        CODESET_ACTION(C_ISO_8859_4)},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/Greek (ISO-8859-_7)"),
-        CODESET_ACTION(C_ISO_8859_7)},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/Turkish (ISO-8859-_9)"),
-        CODESET_ACTION(C_ISO_8859_9)},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/Cyrillic (ISO-8859-_5)"),
-        CODESET_ACTION(C_ISO_8859_5)},
-       {N_("/_View/_Code set/Cyrillic (KOI8-_R)"),
-        CODESET_ACTION(C_KOI8_R)},
-       {N_("/_View/_Code set/Cyrillic (KOI8-U)"),
-        CODESET_ACTION(C_KOI8_U)},
-       {N_("/_View/_Code set/Cyrillic (Windows-1251)"),
-        CODESET_ACTION(C_CP1251)},
-       CODESET_SEPARATOR,
-#endif
-       {N_("/_View/_Code set/Japanese (ISO-2022-_JP)"),
-        CODESET_ACTION(C_ISO_2022_JP)},
-#if HAVE_ICONV
-       {N_("/_View/_Code set/Japanese (ISO-2022-JP-2)"),
-        CODESET_ACTION(C_ISO_2022_JP_2)},
-#endif
-       {N_("/_View/_Code set/Japanese (_EUC-JP)"),
-        CODESET_ACTION(C_EUC_JP)},
-       {N_("/_View/_Code set/Japanese (_Shift__JIS)"),
-        CODESET_ACTION(C_SHIFT_JIS)},
-#if HAVE_ICONV
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/Simplified Chinese (_GB2312)"),
-        CODESET_ACTION(C_GB2312)},
-       {N_("/_View/_Code set/Traditional Chinese (_Big5)"),
-        CODESET_ACTION(C_BIG5)},
-       {N_("/_View/_Code set/Traditional Chinese (EUC-_TW)"),
-        CODESET_ACTION(C_EUC_TW)},
-       {N_("/_View/_Code set/Chinese (ISO-2022-_CN)"),
-        CODESET_ACTION(C_ISO_2022_CN)},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/Korean (EUC-_KR)"),
-        CODESET_ACTION(C_EUC_KR)},
-       {N_("/_View/_Code set/Korean (ISO-2022-KR)"),
-        CODESET_ACTION(C_ISO_2022_KR)},
-       CODESET_SEPARATOR,
-       {N_("/_View/_Code set/Thai (TIS-620)"),
-        CODESET_ACTION(C_TIS_620)},
-       {N_("/_View/_Code set/Thai (Windows-874)"),
-        CODESET_ACTION(C_WINDOWS_874)},
-#endif
-
-#undef CODESET_SEPARATOR
-#undef CODESET_ACTION
-
-#define DECODE_SEPARATOR \
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/7bit ascii (US-ASC_II)"),
+        ENC_ACTION(C_US_ASCII)},
+
+       {N_("/_View/Character _encoding/Unicode (_UTF-8)"),
+        ENC_ACTION(C_UTF_8)},
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/Western European (ISO-8859-_1)"),
+        ENC_ACTION(C_ISO_8859_1)},
+       {N_("/_View/Character _encoding/Western European (ISO-8859-15)"),
+        ENC_ACTION(C_ISO_8859_15)},
+       {N_("/_View/Character _encoding/Western European (Windows-1252)"),
+        ENC_ACTION(C_WINDOWS_1252)},
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/Central European (ISO-8859-_2)"),
+        ENC_ACTION(C_ISO_8859_2)},
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/_Baltic (ISO-8859-13)"),
+        ENC_ACTION(C_ISO_8859_13)},
+       {N_("/_View/Character _encoding/Baltic (ISO-8859-_4)"),
+        ENC_ACTION(C_ISO_8859_4)},
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/Greek (ISO-8859-_7)"),
+        ENC_ACTION(C_ISO_8859_7)},
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/Hebrew (ISO-8859-_8)"),
+        ENC_ACTION(C_ISO_8859_8)},
+       {N_("/_View/Character _encoding/Hebrew (Windows-1255)"),
+        ENC_ACTION(C_CP1255)},
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/Arabic (ISO-8859-_6)"),
+        ENC_ACTION(C_ISO_8859_6)},
+       {N_("/_View/Character _encoding/Arabic (Windows-1256)"),
+        ENC_ACTION(C_CP1256)},
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/Turkish (ISO-8859-_9)"),
+        ENC_ACTION(C_ISO_8859_9)},
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/Cyrillic (ISO-8859-_5)"),
+        ENC_ACTION(C_ISO_8859_5)},
+       {N_("/_View/Character _encoding/Cyrillic (KOI8-_R)"),
+        ENC_ACTION(C_KOI8_R)},
+       {N_("/_View/Character _encoding/Cyrillic (KOI8-U)"),
+        ENC_ACTION(C_KOI8_U)},
+       {N_("/_View/Character _encoding/Cyrillic (Windows-1251)"),
+        ENC_ACTION(C_CP1251)},
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/Japanese (ISO-2022-_JP)"),
+        ENC_ACTION(C_ISO_2022_JP)},
+       {N_("/_View/Character _encoding/Japanese (ISO-2022-JP-2)"),
+        ENC_ACTION(C_ISO_2022_JP_2)},
+       {N_("/_View/Character _encoding/Japanese (_EUC-JP)"),
+        ENC_ACTION(C_EUC_JP)},
+       {N_("/_View/Character _encoding/Japanese (_Shift__JIS)"),
+        ENC_ACTION(C_SHIFT_JIS)},
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/Simplified Chinese (_GB2312)"),
+        ENC_ACTION(C_GB2312)},
+       {N_("/_View/Character _encoding/Simplified Chinese (GBK)"),
+        ENC_ACTION(C_GBK)},
+       {N_("/_View/Character _encoding/Traditional Chinese (_Big5)"),
+        ENC_ACTION(C_BIG5)},
+       {N_("/_View/Character _encoding/Traditional Chinese (EUC-_TW)"),
+        ENC_ACTION(C_EUC_TW)},
+       {N_("/_View/Character _encoding/Chinese (ISO-2022-_CN)"),
+        ENC_ACTION(C_ISO_2022_CN)},
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/Korean (EUC-_KR)"),
+        ENC_ACTION(C_EUC_KR)},
+       {N_("/_View/Character _encoding/Korean (ISO-2022-KR)"),
+        ENC_ACTION(C_ISO_2022_KR)},
+       ENC_SEPARATOR,
+       {N_("/_View/Character _encoding/Thai (TIS-620)"),
+        ENC_ACTION(C_TIS_620)},
+       {N_("/_View/Character _encoding/Thai (Windows-874)"),
+        ENC_ACTION(C_WINDOWS_874)},
+
+#undef ENC_SEPARATOR
+#undef ENC_ACTION
+
+#define DEC_SEPARATOR \
        {N_("/_View/Decode/---"),               NULL, NULL, 0, "<Separator>"}
-#define DECODE_ACTION(action) \
+#define DEC_ACTION(action) \
         NULL, set_decode_cb, action, "/View/Decode/Auto detect"
        {N_("/_View/Decode"),           NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Decode/_Auto detect"),
         NULL, set_decode_cb, 0, "<RadioItem>"},
        {N_("/_View/Decode/---"),               NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/Decode/_8bit"),             DECODE_ACTION(ENC_8BIT)},
-       {N_("/_View/Decode/_Quoted printable"), DECODE_ACTION(ENC_QUOTED_PRINTABLE)},
-       {N_("/_View/Decode/_Base64"),           DECODE_ACTION(ENC_BASE64)},
-       {N_("/_View/Decode/_Uuencode"),         DECODE_ACTION(ENC_X_UUENCODE)},
+       {N_("/_View/Decode/_8bit"),             DEC_ACTION(ENC_8BIT)},
+       {N_("/_View/Decode/_Quoted printable"), DEC_ACTION(ENC_QUOTED_PRINTABLE)},
+       {N_("/_View/Decode/_Base64"),           DEC_ACTION(ENC_BASE64)},
+       {N_("/_View/Decode/_Uuencode"),         DEC_ACTION(ENC_X_UUENCODE)},
 
-#undef DECODE_SEPARATOR
-#undef DECODE_ACTION
+#undef DEC_SEPARATOR
+#undef DEC_ACTION
 
        {N_("/_View/---"),              NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/Mess_age source"),  NULL, view_source_cb, 0, NULL},
-       {N_("/_View/Show all _headers"),NULL, show_all_header_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Mess_age source"),  "<control>U", view_source_cb, 0, NULL},
+       {N_("/_View/Show all _headers"),"<control>H", show_all_header_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Quotes"),                   NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Quotes/_Fold all"),         "<control><shift>Q", msg_hide_quotes_cb, 1, "<ToggleItem>"},
+       {N_("/_View/Quotes/Fold from level _2"),NULL, msg_hide_quotes_cb, 2, "<ToggleItem>"},
+       {N_("/_View/Quotes/Fold from level _3"),NULL, msg_hide_quotes_cb, 3, "<ToggleItem>"},
 
        {N_("/_Message"),               NULL, NULL, 0, "<Branch>"},
        {N_("/_Message/Compose _new message"),
-                                       NULL, compose_cb, 0, NULL},
+                                       "<control>M", compose_cb, 0, NULL},
        {N_("/_Message/---"),           NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/_Reply"),        NULL, reply_cb, COMPOSE_REPLY, NULL},
+       {N_("/_Message/_Reply"),        "<control>R", reply_cb, COMPOSE_REPLY, NULL},
        {N_("/_Message/Repl_y to/_all"),
-                                       NULL, reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+                                       "<control><shift>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
        {N_("/_Message/Repl_y to/_sender"),
                                        NULL, reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
        {N_("/_Message/Repl_y to/mailing _list"),
-                                       NULL, reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
+                                       "<control>L", reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
        {N_("/_Message/---"),           NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/_Forward"),      NULL, reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Message/_Forward"),      "<control><alt>F", reply_cb, COMPOSE_FORWARD_INLINE, NULL},
        {N_("/_Message/For_ward as attachment"),
                                        NULL, reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
        {N_("/_Message/Redirec_t"),     NULL, reply_cb, COMPOSE_REDIRECT, NULL},
-       {N_("/_Message/---"),           NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/Re-_edit"),      NULL, reedit_cb, 0, NULL},
 
        {N_("/_Tools"),                 NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tools/_Address book"),   NULL, addressbook_open_cb, 0, NULL},
+       {N_("/_Tools/_Address book"),   "<control><shift>A", addressbook_open_cb, 0, NULL},
        {N_("/_Tools/Add sender to address boo_k"),
                                        NULL, add_address_cb, 0, NULL},
        {N_("/_Tools/---"),             NULL, NULL, 0, "<Separator>"},
@@ -302,7 +318,7 @@ static GtkItemFactoryEntry msgview_entries[] =
                                        NULL, create_filter_cb, FILTER_BY_TO, NULL},
        {N_("/_Tools/_Create filter rule/by _Subject"),
                                        NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
-       {N_("/_Tools/Create processing rule/"),
+       {N_("/_Tools/Create processing rule"),
                                        NULL, NULL, 0, "<Branch>"},
        {N_("/_Tools/Create processing rule/_Automatically"),
                                        NULL, create_processing_cb, FILTER_BY_AUTO, NULL},
@@ -313,6 +329,8 @@ static GtkItemFactoryEntry msgview_entries[] =
        {N_("/_Tools/Create processing rule/by _Subject"),
                                        NULL, create_processing_cb, FILTER_BY_SUBJECT, NULL},
        {N_("/_Tools/---"),             NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/List _URLs..."),   "<shift><control>U", open_urls_cb, 0, NULL},
+       {N_("/_Tools/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/Actio_ns"),        NULL, NULL, 0, "<Branch>"},
 
        {N_("/_Help"),                  NULL, NULL, 0, "<Branch>"},
@@ -399,8 +417,13 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        gtk_widget_show(menubar);
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
 
-       handlebox = gtk_handle_box_new();
+       if (prefs_common.toolbar_detachable) {
+               handlebox = gtk_handle_box_new();
+       } else {
+               handlebox = gtk_hbox_new(FALSE, 0);
+       }
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+       gtk_widget_realize(handlebox);
        msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox,
                                          (gpointer)msgview);
 
@@ -422,14 +445,23 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        msgview_list = g_list_append(msgview_list, msgview);
 }
 
-MessageView *messageview_create_with_new_window(MainWindow *mainwin)
+static MessageView *messageview_create_with_new_window_visible(MainWindow *mainwin, gboolean show)
 {
        MessageView *msgview;
        GtkWidget *window;
+       static GdkGeometry geometry;
 
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_title(GTK_WINDOW(window), _("Sylpheed - Message View"));
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "messageview");
+       gtk_window_set_title(GTK_WINDOW(window), _("Claws Mail - Message View"));
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+
+       if (!geometry.min_height) {
+               geometry.min_width = 320;
+               geometry.min_height = 200;
+       }
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+
        gtk_widget_set_size_request(window, prefs_common.msgwin_width,
                                    prefs_common.msgwin_height);
 
@@ -438,15 +470,22 @@ MessageView *messageview_create_with_new_window(MainWindow *mainwin)
        g_signal_connect(G_OBJECT(window), "size_allocate",
                         G_CALLBACK(messageview_size_allocate_cb),
                         msgview);
-       g_signal_connect(G_OBJECT(window), "destroy",
-                        G_CALLBACK(messageview_destroy_cb), msgview);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(messageview_delete_cb), msgview);
+#ifdef MAEMO
+       maemo_connect_key_press_to_mainwindow(GTK_WINDOW(window));
+#else
        g_signal_connect(G_OBJECT(window), "key_press_event",
                         G_CALLBACK(key_pressed), msgview);
-
+#endif
        messageview_add_toolbar(msgview, window);
 
-       gtk_widget_grab_focus(msgview->mimeview->textview->text);
-       gtk_widget_show(window);
+       if (show) {
+               gtk_widget_grab_focus(msgview->mimeview->textview->text);
+               gtk_widget_show(window);
+       } else {
+               gtk_widget_realize(window);
+       }
 
        msgview->new_window = TRUE;
        msgview->window = window;
@@ -459,6 +498,10 @@ MessageView *messageview_create_with_new_window(MainWindow *mainwin)
        return msgview;
 }
 
+MessageView *messageview_create_with_new_window(MainWindow *mainwin)
+{
+       return messageview_create_with_new_window_visible(mainwin, TRUE);
+}
 void messageview_init(MessageView *messageview)
 {
        headerview_init(messageview->headerview);
@@ -497,7 +540,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        gchar tmp[MAXPATHLEN + 1];
        FILE *fp;
        GList *ac_list;
-       PrefsAccount *account;
+       PrefsAccount *account = NULL;
        gint ok;
        gchar *to;
        FolderItem *queue, *outbox;
@@ -505,16 +548,20 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        gchar *path;
         gchar *addr;
         gchar *addrp;
-
-       if ((!msginfo->returnreceiptto) && 
-           (!msginfo->dispositionnotificationto)) 
+       gchar *foo = NULL;
+       gboolean queued_removed = FALSE;
+       
+       if (!msginfo->extradata)
+               return -1;
+       if (!msginfo->extradata->returnreceiptto && 
+           !msginfo->extradata->dispositionnotificationto) 
                return -1;
 
        /* RFC2298: Test for Return-Path */
-       if (msginfo->dispositionnotificationto)
-               to = msginfo->dispositionnotificationto;
+       if (msginfo->extradata->dispositionnotificationto)
+               to = msginfo->extradata->dispositionnotificationto;
        else
-               to = msginfo->returnreceiptto;
+               to = msginfo->extradata->returnreceiptto;
 
        ok = procheader_get_header_from_msginfo(msginfo, buf, sizeof(buf),
                                "Return-Path:");
@@ -522,7 +569,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                gchar *to_addr = g_strdup(to);
                extract_address(to_addr);
                extract_address(buf);
-               ok = strcmp(to_addr, buf);
+               ok = strcasecmp(to_addr, buf);
                g_free(to_addr);
        } else {
                strncpy(buf, _("<No Return-Path found>"), 
@@ -533,17 +580,17 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                AlertValue val;
                gchar *message;
                message = g_strdup_printf(
-                                _("The notification address to which the "
-                                  "return receipt is to be sent\n"
-                                  "does not correspond to the return path:\n"
-                                  "Notification address: %s\n"
-                                  "Return path: %s\n"
-                                  "It is advised to not to send the return "
-                                  "receipt."), to, buf);
-               val = alertpanel_with_type(_("Warning"), message, _("Send"),
-                               _("+Don't Send"), NULL, NULL, ALERT_WARNING);
+                 _("The notification address to which the return receipt is\n"
+                   "to be sent does not correspond to the return path:\n"
+                   "Notification address: %s\n"
+                   "Return path: %s\n"
+                   "It is advised to not to send the return receipt."),
+                 to, buf);
+               val = alertpanel_full(_("Warning"), message,
+                               _("_Don't Send"), _("_Send"), NULL, FALSE,
+                               NULL, ALERT_WARNING, G_ALERTDEFAULT);
                g_free(message);                                
-               if (val != G_ALERTDEFAULT)
+               if (val != G_ALERTALTERNATE)
                        return -1;
        }
 
@@ -551,29 +598,39 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        ac_list = account_find_all_from_address(ac_list, msginfo->cc);
 
        if (ac_list == NULL) {
-               alertpanel_error(_("This message is asking for a return "
-                                  "receipt notification\n"
-                                  "but according to its 'To:' and 'CC:' "
-                                  "headers it was not\nofficially addressed "
-                                  "to you.\n"
-                                  "Receipt notification cancelled."));
-               return -1;
+               AlertValue val = 
+               alertpanel_full(_("Warning"),
+                 _("This message is asking for a return receipt notification\n"
+                   "but according to its 'To:' and 'CC:' headers it was not\n"
+                   "officially addressed to you.\n"
+                   "It is advised to not to send the return receipt."),
+                 _("_Don't Send"), _("_Send"), NULL, FALSE,
+                 NULL, ALERT_WARNING, G_ALERTDEFAULT);
+               if (val != G_ALERTALTERNATE)
+                       return -1;
        }
 
-       if (g_list_length(ac_list) > 1)
-               account = select_account_from_list(ac_list);
-       else
+       if (g_list_length(ac_list) > 1) {
+               if ((account = select_account_from_list(ac_list)) == NULL)
+                       return -1;
+       }
+       else if (ac_list != NULL)
                account = (PrefsAccount *) ac_list->data;
        g_list_free(ac_list);
 
        if (account == NULL)
+               account = account_get_default();
+       if (!account || account->protocol == A_NNTP) {
+               alertpanel_error(_("Account for sending mail is not specified.\n"
+                                  "Please select a mail account before sending."));
                return -1;
+       }
 
        /* write to temporary file */
-       g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg%d",
-                  get_rc_dir(), G_DIR_SEPARATOR, (gint)msginfo);
+       g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg%p",
+                  get_rc_dir(), G_DIR_SEPARATOR, msginfo);
 
-       if ((fp = fopen(tmp, "wb")) == NULL) {
+       if ((fp = g_fopen(tmp, "wb")) == NULL) {
                FILE_OP_ERROR(tmp, "fopen");
                return -1;
        }
@@ -620,7 +677,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                g_free(path);
        }               
 
-       fprintf(fp, "\n");
+       fprintf(fp, "X-Claws-End-Special-Headers: 1\n");
        
        /* Date */
        get_rfc822_date(buf, sizeof(buf));
@@ -648,7 +705,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 
        if (fclose(fp) == EOF) {
                FILE_OP_ERROR(tmp, "fclose");
-               unlink(tmp);
+               g_unlink(tmp);
                return -1;
        }
 
@@ -657,30 +714,33 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        if (!queue) queue = folder_get_default_queue();
        if (!queue) {
                g_warning("can't find queue folder\n");
-               unlink(tmp);
+               g_unlink(tmp);
                return -1;
        }
        folder_item_scan(queue);
        if ((num = folder_item_add_msg(queue, tmp, NULL, TRUE)) < 0) {
                g_warning("can't queue the message\n");
-               unlink(tmp);
+               g_unlink(tmp);
                return -1;
        }
-       
+               
+       if (prefs_common.work_offline && 
+           !inc_offline_should_override(TRUE,
+               _("Claws Mail needs network access in order "
+                 "to send this email.")))
+               return 0;
+
        /* send it */
        path = folder_item_fetch_msg(queue, num);
-       ok = procmsg_send_message_queue(path);
+       ok = procmsg_send_message_queue(path, &foo, queue, num, &queued_removed);
        g_free(path);
-       folder_item_remove_msg(queue, num);
+       g_free(foo);
+       if (ok == 0 && !queued_removed)
+               folder_item_remove_msg(queue, num);
 
        return ok;
 }
 
-GList *messageview_get_window_list(void)
-{
-       return messageview_list;
-}
-
 static gboolean find_encrypted_func(GNode *node, gpointer data)
 {
        MimeInfo *mimeinfo = (MimeInfo *) node->data;
@@ -709,10 +769,43 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 {
        gchar *file;
        MimeInfo *mimeinfo, *encinfo;
-
+       gchar *subject = NULL;
        g_return_val_if_fail(msginfo != NULL, -1);
 
+       if (messageview->mimeview->textview &&
+           messageview->mimeview->textview->loading) {
+               messageview->mimeview->textview->stop_loading = TRUE;
+               return 0;
+       }
+
+       if (messageview->toolbar)
+               toolbar_set_learn_button
+                       (messageview->toolbar,
+                        MSG_IS_SPAM(msginfo->flags)?LEARN_HAM:LEARN_SPAM);
+       else
+               toolbar_set_learn_button
+                       (messageview->mainwin->toolbar,
+                        MSG_IS_SPAM(msginfo->flags)?LEARN_HAM:LEARN_SPAM);
+
+       if (messageview->toolbar) {
+               if (messageview->toolbar->learn_ham_btn)
+                       gtk_widget_set_sensitive(
+                               messageview->toolbar->learn_ham_btn, 
+                               procmsg_spam_can_learn());
+               if (messageview->toolbar->learn_spam_btn)
+                       gtk_widget_set_sensitive(
+                               messageview->toolbar->learn_spam_btn, 
+                               procmsg_spam_can_learn());
+       }
+       messageview->updating = TRUE;
        mimeinfo = procmime_scan_message(msginfo);
+       messageview->updating = FALSE;
+       
+       if (messageview->deferred_destroy) {
+               messageview_destroy(messageview);
+               return 0;
+       }
+
        if (!mimeinfo) {
                textview_show_error(messageview->mimeview->textview);
                return -1;
@@ -720,43 +813,100 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 
        while ((encinfo = find_encrypted_part(mimeinfo)) != NULL) {
                debug_print("decrypting message part\n");
-               if (privacy_mimeinfo_decrypt(encinfo) < 0)
+               if (privacy_mimeinfo_decrypt(encinfo) < 0) {
+                       alertpanel_error(_("Couldn't decrypt: %s"),
+                               privacy_get_error());
                        break;
+               }
        }
        
+       messageview->updating = TRUE;
        file = procmsg_get_message_file_path(msginfo);
+       messageview->updating = FALSE;
+       
+       if (messageview->deferred_destroy) {
+               g_free(file);
+               messageview_destroy(messageview);
+               return 0;
+       }
+
        if (!file) {
                g_warning("can't get message file path.\n");
                procmime_mimeinfo_free_all(mimeinfo);
                textview_show_error(messageview->mimeview->textview);
                return -1;
        }
-
+       
        if (messageview->msginfo != msginfo) {
                procmsg_msginfo_free(messageview->msginfo);
+               messageview->msginfo = NULL;
+               messageview_set_menu_sensitive(messageview);
                messageview->msginfo = procmsg_msginfo_get_full_info(msginfo);
                if (!messageview->msginfo)
                        messageview->msginfo = procmsg_msginfo_copy(msginfo);
+       } else {
+               messageview->msginfo = NULL;
+               messageview_set_menu_sensitive(messageview);
+               messageview->msginfo = msginfo;
        }
        headerview_show(messageview->headerview, messageview->msginfo);
 
-       messageview->all_headers = all_headers;
-       textview_set_all_headers(messageview->mimeview->textview, all_headers);
+       messageview_set_position(messageview, 0);
+
+       textview_set_all_headers(messageview->mimeview->textview, 
+                       messageview->all_headers);
 
+#ifdef MAEMO
+       maemo_window_full_screen_if_needed(GTK_WINDOW(messageview->window));
+#endif
+       if (messageview->window) {
+               gtk_window_set_title(GTK_WINDOW(messageview->window), 
+                               _("Claws Mail - Message View"));
+               GTK_EVENTS_FLUSH();
+       }
        mimeview_show_message(messageview->mimeview, mimeinfo, file);
+       
        messageview_set_position(messageview, 0);
 
-       if (messageview->msginfo->partial_recv)
+       if (messageview->window && msginfo->subject) {
+               subject = g_strdup(msginfo->subject);
+               if (!g_utf8_validate(subject, -1, NULL)) {
+                       g_free(subject);
+                       subject = g_malloc(strlen(msginfo->subject)*2 +1);
+                       conv_localetodisp(subject, strlen(msginfo->subject)*2 +1, 
+                               msginfo->subject);
+               }
+               if (g_utf8_validate(subject, -1, NULL))
+                       gtk_window_set_title(GTK_WINDOW(messageview->window), 
+                               subject);
+               g_free(subject);
+       }
+
+       main_create_mailing_list_menu(messageview->mainwin, messageview->msginfo);
+
+       if (messageview->msginfo->extradata
+           && messageview->msginfo->extradata->partial_recv)
                partial_recv_show(messageview->noticeview, 
                                  messageview->msginfo);
-       else if ((messageview->msginfo->dispositionnotificationto || 
-            messageview->msginfo->returnreceiptto) &&
-           !MSG_IS_RETRCPT_SENT(messageview->msginfo->flags))
+       else if (messageview->msginfo->extradata &&
+           (messageview->msginfo->extradata->dispositionnotificationto || 
+            messageview->msginfo->extradata->returnreceiptto) &&
+           !MSG_IS_RETRCPT_SENT(messageview->msginfo->flags) &&
+           !prefs_common.never_send_retrcpt)
                return_receipt_show(messageview->noticeview, 
                                    messageview->msginfo);
        else 
                noticeview_hide(messageview->noticeview);
 
+       mimeinfo = procmime_mimeinfo_next(mimeinfo);
+       if (!all_headers && mimeinfo && (mimeinfo->type != MIMETYPE_TEXT || 
+           strcasecmp(mimeinfo->subtype, "plain"))) {
+               if (strcasecmp(mimeinfo->subtype, "html"))
+                       mimeview_show_part(messageview->mimeview,mimeinfo);
+               else if (prefs_common.invoke_plugin_on_html)
+                       mimeview_select_mimepart_icon(messageview->mimeview,mimeinfo);
+       }
+
        g_free(file);
 
        return 0;
@@ -776,6 +926,8 @@ void messageview_reflect_prefs_pixmap_theme(void)
 
 void messageview_clear(MessageView *messageview)
 {
+       if (!messageview)
+               return;
        procmsg_msginfo_free(messageview->msginfo);
        messageview->msginfo = NULL;
        messageview->filtered = FALSE;
@@ -789,8 +941,32 @@ void messageview_destroy(MessageView *messageview)
        debug_print("destroy messageview\n");
        messageview_list = g_list_remove(messageview_list, messageview);
 
-       hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
+       if (messageview->mainwin->summaryview->messageview == messageview)
+               messageview->mainwin->summaryview->messageview = NULL;
+
+       if (messageview->mainwin->summaryview->ext_messageview == messageview)
+               messageview->mainwin->summaryview->ext_messageview = NULL;
+
+       if (!messageview->deferred_destroy) {
+               hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
                              messageview->msginfo_update_callback_id);
+       }
+
+       if (messageview->updating) {
+               debug_print("uh oh, better not touch that now (fetching)\n");
+               messageview->deferred_destroy = TRUE;
+               gtk_widget_hide(messageview->window);
+               return;
+       }
+       
+       if (messageview->mimeview->textview
+       &&  messageview->mimeview->textview->loading) {
+               debug_print("uh oh, better not touch that now (loading text)\n");
+               messageview->deferred_destroy = TRUE;
+               messageview->mimeview->textview->stop_loading = TRUE;
+               gtk_widget_hide(messageview->window);
+               return;
+       }
 
        headerview_destroy(messageview->headerview);
        mimeview_destroy(messageview->mimeview);
@@ -805,6 +981,8 @@ void messageview_destroy(MessageView *messageview)
        
        msgview_list = g_list_remove(msgview_list, messageview); 
 
+       if (messageview->window)
+               gtk_widget_destroy(messageview->window);
        g_free(messageview);
 }
 
@@ -821,7 +999,7 @@ void messageview_delete(MessageView *msgview)
        if (msginfo && msgview->msginfo && 
            msginfo->msgnum == msgview->msginfo->msgnum && 
            msginfo->folder == msgview->msginfo->folder) {
-               summary_delete(msgview->mainwin->summaryview);
+               summary_delete_trash(msgview->mainwin->summaryview);
        } else {                
                msginfo = msgview->msginfo;
 
@@ -865,10 +1043,9 @@ static void messageview_update(MessageView *msgview)
        g_return_if_fail(summaryview != NULL);
        
        if (summaryview->selected) {
-               GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-               MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, 
-                                                     summaryview->selected);
-               g_return_if_fail(msginfo != NULL);
+               MsgInfo *msginfo = summary_get_selected_msg(summaryview);
+               if (msginfo == NULL)
+                       return;
 
                messageview_show(msgview, msginfo, 
                                 msgview->all_headers);
@@ -917,8 +1094,15 @@ void messageview_select_all(MessageView *messageview)
        TextView *text;
 
        text = messageview_get_current_textview(messageview);
-       if (text)
-               gtk_editable_select_region(GTK_EDITABLE(text->text), 0, -1);
+       if (text) {
+               GtkTextView *textview = GTK_TEXT_VIEW(text->text);
+               GtkTextBuffer *buffer;
+               GtkTextIter start, end;
+
+               buffer = gtk_text_view_get_buffer(textview);
+               gtk_text_buffer_get_bounds(buffer, &start, &end);
+               gtk_text_buffer_select_range(buffer, &start, &end);
+       }
 }
 
 void messageview_set_position(MessageView *messageview, gint pos)
@@ -935,6 +1119,13 @@ gboolean messageview_search_string(MessageView *messageview, const gchar *str,
 {
        TextView *text;
 
+       if (messageview->mimeview->type == MIMEVIEW_VIEWER) {
+               MimeViewer *viewer = messageview->mimeview->mimeviewer;
+               if (viewer && viewer->text_search) {
+                       return viewer->text_search(viewer, FALSE, str, case_sens);
+               }
+       }
+
        text = messageview_get_current_textview(messageview);
        if (text)
                return textview_search_string(text, str, case_sens);
@@ -947,6 +1138,13 @@ gboolean messageview_search_string_backward(MessageView *messageview,
 {
        TextView *text;
 
+       if (messageview->mimeview->type == MIMEVIEW_VIEWER) {
+               MimeViewer *viewer = messageview->mimeview->mimeviewer;
+               if (viewer && viewer->text_search) {
+                       return viewer->text_search(viewer, TRUE, str, case_sens);
+               }
+       }
+
        text = messageview_get_current_textview(messageview);
        if (text)       
                return textview_search_string_backward(text,
@@ -956,10 +1154,12 @@ gboolean messageview_search_string_backward(MessageView *messageview,
 
 gboolean messageview_is_visible(MessageView *messageview)
 {
+       if (messageview == NULL)
+               return FALSE;
        return messageview->visible;
 }
 
-void messageview_save_as(MessageView *messageview)
+static void messageview_save_as(MessageView *messageview)
 {
        gchar *filename = NULL;
        MsgInfo *msginfo;
@@ -972,30 +1172,44 @@ void messageview_save_as(MessageView *messageview)
                Xstrdup_a(filename, msginfo->subject, return);
                subst_for_filename(filename);
        }
-       dest = filesel_select_file_save(_("Save as"), filename);
+       if (filename && !g_utf8_validate(filename, -1, NULL)) {
+               gchar *oldstr = filename;
+               filename = conv_codeset_strdup(filename,
+                                              conv_get_locale_charset_str(),
+                                              CS_UTF_8);
+               if (!filename) {
+                       g_warning("messageview_save_as(): faild to convert character set.");
+                       filename = g_strdup(oldstr);
+               }
+               dest = filesel_select_file_save(_("Save as"), filename);
+               g_free(filename);
+       } else
+               dest = filesel_select_file_save(_("Save as"), filename);
        if (!dest) return;
        if (is_file_exist(dest)) {
                AlertValue aval;
 
                aval = alertpanel(_("Overwrite"),
                                  _("Overwrite existing file?"),
-                                 GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
-               if (G_ALERTDEFAULT != aval) return;
+                                 GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL);
+               if (G_ALERTALTERNATE != aval) return;
        }
 
        src = procmsg_get_message_file(msginfo);
        if (copy_file(src, dest, TRUE) < 0) {
                tmp =  g_path_get_basename(dest);
-               alertpanel_error(_("Can't save the file `%s'."), tmp);
+               alertpanel_error(_("Couldn't save the file '%s'."), tmp);
                g_free(tmp);
        }
        g_free(dest);
        g_free(src);
 }
 
-static void messageview_destroy_cb(GtkWidget *widget, MessageView *messageview)
+static gint messageview_delete_cb(GtkWidget *widget, GdkEventAny *event,
+                                 MessageView *messageview)
 {
        messageview_destroy(messageview);
+       return TRUE;
 }
 
 static void messageview_size_allocate_cb(GtkWidget *widget,
@@ -1010,54 +1224,51 @@ static void messageview_size_allocate_cb(GtkWidget *widget,
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                        MessageView *messageview)
 {
-       if (event && event->keyval == GDK_Escape && messageview->window)
-               gtk_widget_destroy(messageview->window);
+       if (event && event->keyval == GDK_Escape && messageview->window) {
+               messageview_destroy(messageview);
+               return TRUE;
+       }
+
+       if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0)
+               return FALSE;
+
+       g_signal_stop_emission_by_name(G_OBJECT(widget),
+                                       "key_press_event");
+       mimeview_pass_key_press_event(messageview->mimeview, event);
        return FALSE;
 }
 
-void messageview_toggle_view_real(MessageView *messageview)
+static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
 {
-       MainWindow *mainwin = messageview->mainwin;
-       union CompositeWin *cwin = &mainwin->win;
-       GtkWidget *vpaned = NULL;
-       GtkWidget *container = NULL;
-       GtkItemFactory *ifactory = gtk_item_factory_from_widget(mainwin->menubar);
-       
-       switch (mainwin->type) {
-       case SEPARATE_NONE:
-               vpaned = cwin->sep_none.vpaned;
-               container = cwin->sep_none.hpaned;
-               break;
-       case SEPARATE_FOLDER:
-               vpaned = cwin->sep_folder.vpaned;
-               container = mainwin->vbox_body;
-               break;
-       case SEPARATE_MESSAGE:
-       case SEPARATE_BOTH:
+       gchar *addr = NULL;
+       gboolean from_me = FALSE;
+       if (msginfo->folder 
+               && (folder_has_parent_of_type(msginfo->folder, F_QUEUE)
+                || folder_has_parent_of_type(msginfo->folder, F_DRAFT)))
                return;
+
+       addr = g_strdup(msginfo->from);
+       if (addr) {
+               extract_address(addr);
+               if (account_find_from_address(addr)) {
+                       from_me = TRUE;
+               }
+               g_free(addr);
        }
 
-       if (vpaned->parent != NULL) {
-               gtk_widget_ref(vpaned);
-               gtkut_container_remove(GTK_CONTAINER(container), vpaned);
-               gtk_widget_reparent(GTK_WIDGET_PTR(messageview), container);
-               menu_set_sensitive(ifactory, "/View/Expand Summary View", FALSE);
+       if (from_me) {
+               noticeview_set_icon(noticeview, STOCK_PIXMAP_NOTICE_WARN);
+               noticeview_set_text(noticeview, _("You asked for a return receipt in this message."));
+               noticeview_set_button_text(noticeview, NULL);
+               noticeview_set_button_press_callback(noticeview, NULL, NULL);
        } else {
-               gtk_widget_reparent(GTK_WIDGET_PTR(messageview), vpaned);
-               gtk_container_add(GTK_CONTAINER(container), vpaned);
-               gtk_widget_unref(vpaned);
-               menu_set_sensitive(ifactory, "/View/Expand Summary View", TRUE);
-               gtk_widget_grab_focus(GTK_WIDGET(mainwin->summaryview->ctree));
+               noticeview_set_icon(noticeview, STOCK_PIXMAP_NOTICE_WARN);
+               noticeview_set_text(noticeview, _("This message asks for a return receipt."));
+               noticeview_set_button_text(noticeview, _("Send receipt"));
+               noticeview_set_button_press_callback(noticeview,
+                                                    G_CALLBACK(return_receipt_send_clicked),
+                                                    (gpointer) msginfo);
        }
-}
-
-static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
-{
-       noticeview_set_text(noticeview, _("This message asks for a return receipt."));
-       noticeview_set_button_text(noticeview, _("Send receipt"));
-       noticeview_set_button_press_callback(noticeview,
-                                            G_CALLBACK(return_receipt_send_clicked),
-                                            (gpointer) msginfo);
        noticeview_show(noticeview);
 }
 
@@ -1093,6 +1304,8 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
        void  *button1_cb = NULL;
        void  *button2_cb = NULL;
 
+       if (!msginfo->extradata)
+               return;
        if (!partial_msg_in_uidl_list(msginfo)) {
                text = g_strdup_printf(_("This message has been partially "
                                "retrieved,\nand has been deleted from the "
@@ -1136,6 +1349,7 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
                }
        }
        
+       noticeview_set_icon(noticeview, STOCK_PIXMAP_NOTICE_WARN);
        noticeview_set_text(noticeview, text);
        g_free(text);
        noticeview_set_button_text(noticeview, button1);
@@ -1202,8 +1416,8 @@ static PrefsAccount *select_account_from_list(GList *ac_list)
                                  "accounts.\n"
                                  "Please choose which account do you want to "
                                  "use for sending the receipt notification:"),
-                               _("Send Notification"), _("+Cancel"), NULL,
-                               optmenu) != G_ALERTDEFAULT)
+                               _("_Cancel"), _("_Send Notification"), NULL,
+                               FALSE, G_ALERTDEFAULT, optmenu) != G_ALERTALTERNATE)
                return NULL;
        return account_find_from_id(account_id);
 }
@@ -1226,6 +1440,15 @@ gchar *messageview_get_selection(MessageView *msgview)
        
        g_return_val_if_fail(msgview != NULL, NULL);
 
+       if (msgview->mimeview->type == MIMEVIEW_VIEWER) {
+               MimeViewer *viewer = msgview->mimeview->mimeviewer;
+               if (viewer && viewer->get_selection) {
+                       text = viewer->get_selection(viewer);
+                       if (text)
+                               return text;
+               }
+       }
+
        textview = messageview_get_current_textview(msgview);
        g_return_val_if_fail(textview != NULL, NULL);
 
@@ -1254,35 +1477,109 @@ static void save_as_cb(gpointer data, guint action, GtkWidget *widget)
        messageview_save_as(messageview);
 }
 
+#ifdef USE_GNOMEPRINT
+static void print_mimeview(MimeView *mimeview, gint sel_start, gint sel_end, gint partnum) 
+{
+       if (!mimeview 
+       ||  !mimeview->textview
+       ||  !mimeview->textview->text)
+               alertpanel_warning(_("Cannot print: the message doesn't "
+                                    "contain text."));
+       else {
+               gtk_widget_realize(mimeview->textview->text);
+               if (partnum > 0) {
+                       mimeview_select_part_num(mimeview, partnum);
+               }
+               if (mimeview->type == MIMEVIEW_VIEWER) {
+                       MimeViewer *viewer = mimeview->mimeviewer;
+                       if (viewer && viewer->print) {
+                               viewer->print(viewer);
+                               return;
+                       }
+               }
+               if (sel_start != -1 && sel_end != -1) {
+                       GtkTextIter start, end;
+                       GtkTextView *text = GTK_TEXT_VIEW(mimeview->textview->text);
+                       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+
+                       gtk_text_buffer_get_iter_at_offset(buffer, &start, sel_start);
+                       gtk_text_buffer_get_iter_at_offset(buffer, &end, sel_end);
+                       gtk_text_buffer_select_range(buffer, &start, &end);
+               }
+
+               gedit_print(GTK_TEXT_VIEW(mimeview->textview->text));
+       }
+}
+
+void messageview_print(MsgInfo *msginfo, gboolean all_headers, 
+                       gint sel_start, gint sel_end, gint partnum) 
+{
+       PangoFontDescription *font_desc = NULL;
+       MessageView *tmpview = messageview_create_with_new_window_visible(
+                               mainwindow_get_mainwindow(), FALSE);
+
+       if (prefs_common.use_different_print_font) {
+               font_desc = pango_font_description_from_string
+                                               (prefs_common.printfont);
+       } else {
+               font_desc = pango_font_description_from_string
+                                               (prefs_common.textfont);
+       }
+       if (font_desc) {
+               gtk_widget_modify_font(tmpview->mimeview->textview->text, 
+                       font_desc);
+               pango_font_description_free(font_desc);
+       }
+
+       tmpview->all_headers = all_headers;
+       if (msginfo && messageview_show(tmpview, msginfo, 
+               tmpview->all_headers) >= 0) {
+                       print_mimeview(tmpview->mimeview, 
+                               sel_start, sel_end, partnum);
+       }
+       messageview_destroy(tmpview);
+}
+#endif
+
 static void print_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MessageView *messageview = (MessageView *)data;
-       gchar *cmdline;
+#ifndef USE_GNOMEPRINT
+       gchar *cmdline = NULL;
        gchar *p;
+#else
+       gint sel_start = -1, sel_end = -1, partnum = 0;
+#endif
 
        if (!messageview->msginfo) return;
-
+#ifndef USE_GNOMEPRINT
        cmdline = input_dialog(_("Print"),
                               _("Enter the print command line:\n"
-                                "(`%s' will be replaced with file name)"),
+                                "('%s' will be replaced with file name)"),
                               prefs_common.print_cmd);
        if (!cmdline) return;
        if (!(p = strchr(cmdline, '%')) || *(p + 1) != 's' ||
            strchr(p + 2, '%')) {
-               alertpanel_error(_("Print command line is invalid:\n`%s'"),
+               alertpanel_error(_("Print command line is invalid:\n'%s'"),
                                 cmdline);
                g_free(cmdline);
                return;
        }
-
        procmsg_print_message(messageview->msginfo, cmdline);
        g_free(cmdline);
+#else
+       partnum = mimeview_get_selected_part_num(messageview->mimeview);
+       textview_get_selection_offsets(messageview->mimeview->textview,
+               &sel_start, &sel_end);
+       messageview_print(messageview->msginfo, messageview->all_headers, 
+               sel_start, sel_end, partnum);
+#endif
 }
 
 static void close_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MessageView *messageview = (MessageView *)data;
-       gtk_widget_destroy(messageview->window);
+       messageview_destroy(messageview);
 }
 
 static void copy_cb(gpointer data, guint action, GtkWidget *widget)
@@ -1348,6 +1645,15 @@ static void show_all_header_cb(gpointer data, guint action, GtkWidget *widget)
        MessageView *messageview = (MessageView *)data;
        MsgInfo *msginfo = messageview->msginfo;
 
+       if (messageview->mimeview->textview &&
+           messageview->mimeview->textview->loading) {
+               return;
+       }
+       if (messageview->updating)
+               return;
+
+       messageview->all_headers = 
+                       GTK_CHECK_MENU_ITEM(widget)->active;
        if (!msginfo) return;
        messageview->msginfo = NULL;
        messageview_show(messageview, msginfo,
@@ -1356,6 +1662,43 @@ static void show_all_header_cb(gpointer data, guint action, GtkWidget *widget)
        main_window_set_menu_sensitive(messageview->mainwin);
 }
 
+#define SET_CHECK_MENU_ACTIVE(path, active) \
+{ \
+       menuitem = gtk_item_factory_get_widget(ifactory, path); \
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
+}
+
+static void msg_hide_quotes_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       MsgInfo *msginfo = messageview->msginfo;
+       static gboolean updating_menu = FALSE;
+       GtkItemFactory *ifactory = gtk_item_factory_from_widget(messageview->menubar);
+       GtkWidget *menuitem;
+       if (updating_menu)
+               return;
+
+       prefs_common.hide_quotes = 
+                       GTK_CHECK_MENU_ITEM(widget)->active ? action : 0;
+       
+       updating_menu=TRUE;
+       SET_CHECK_MENU_ACTIVE("/View/Quotes/Fold all", FALSE);
+       SET_CHECK_MENU_ACTIVE("/View/Quotes/Fold from level 2", FALSE);
+       SET_CHECK_MENU_ACTIVE("/View/Quotes/Fold from level 3", FALSE);
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), prefs_common.hide_quotes > 0);      
+       updating_menu=FALSE;
+       if (!msginfo) return;
+       messageview->msginfo = NULL;
+       messageview_show(messageview, msginfo,
+                        messageview->all_headers);
+       procmsg_msginfo_free(msginfo);
+       
+       /* update main window */
+       main_window_set_menu_sensitive(messageview->mainwin);
+       summary_redisplay_msg(messageview->mainwin->summaryview);
+}
+#undef SET_CHECK_MENU_ACTIVE
+
 static void compose_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MessageView *messageview = (MessageView *)data;
@@ -1381,28 +1724,12 @@ static void reply_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MessageView *messageview = (MessageView *)data;
        GSList *msginfo_list = NULL;
-       MsgInfo *msginfo;
 
        g_return_if_fail(messageview->msginfo);
 
        msginfo_list = g_slist_append(msginfo_list, messageview->msginfo);
        compose_reply_from_messageview(messageview, msginfo_list, action);
-       g_list_free(msginfo_list);
-}
-
-static void reedit_cb(gpointer data, guint action, GtkWidget *widget)
-{
-       MessageView *messageview = (MessageView *)data;
-       MsgInfo *msginfo;
-
-       if (!messageview->msginfo) return;
-       msginfo = messageview->msginfo;
-       if (!msginfo->folder) return;
-       if (msginfo->folder->stype != F_OUTBOX &&
-           msginfo->folder->stype != F_DRAFT &&
-           msginfo->folder->stype != F_QUEUE) return;
-
-       compose_reedit(msginfo);
+       g_slist_free(msginfo_list);
 }
 
 static void addressbook_open_cb(gpointer data, guint action, GtkWidget *widget)
@@ -1449,6 +1776,12 @@ static void create_processing_cb(gpointer data, guint action,
                                    (PrefsFilterType)action, 1);
 }
 
+static void open_urls_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview_list_urls(messageview);
+}
+
 static void about_cb(gpointer data, guint action, GtkWidget *widget)
 {
        about_show();
@@ -1473,7 +1806,7 @@ static gboolean messageview_update_msg(gpointer source, gpointer data)
 void messageview_set_menu_sensitive(MessageView *messageview)
 {
        GtkItemFactory *ifactory;
-       GtkWidget *menuitem;
+       GtkWidget *menuitem = NULL;
 
        if (!messageview || !messageview->new_window) 
                return;
@@ -1481,10 +1814,60 @@ void messageview_set_menu_sensitive(MessageView *messageview)
        if (!messageview->menubar) return;
        ifactory = gtk_item_factory_from_widget(messageview->menubar);
        if (!ifactory) return;
-       if (messageview->mainwin->type == SEPARATE_MESSAGE) {
-               menuitem = gtk_item_factory_get_widget(ifactory, "/View/Show all headers");
+
+       if (prefs_common.hide_quotes) {
+               menuitem = NULL;
+               if (prefs_common.hide_quotes == 1)
+                       menuitem = gtk_item_factory_get_widget(ifactory, 
+                                       "/View/Quotes/Fold all");
+               if (prefs_common.hide_quotes == 2)
+                       menuitem = gtk_item_factory_get_widget(ifactory, 
+                                       "/View/Quotes/Fold from level 2");
+               if (prefs_common.hide_quotes == 3)
+                       menuitem = gtk_item_factory_get_widget(ifactory, 
+                                       "/View/Quotes/Fold from level 3");
                gtk_check_menu_item_set_active
                        (GTK_CHECK_MENU_ITEM(menuitem),
-                        messageview->mimeview->textview->show_all_headers);
+                        TRUE);
+       }
+}
+
+void messageview_learn (MessageView *msgview, gboolean is_spam)
+{
+       if (is_spam) {
+               if (procmsg_spam_learner_learn(msgview->msginfo, NULL, TRUE) == 0)
+                       procmsg_msginfo_set_flags(msgview->msginfo, MSG_SPAM, 0);
+               else
+                       log_error(LOG_PROTOCOL, _("An error happened while learning.\n"));
+               
+       } else {
+               if (procmsg_spam_learner_learn(msgview->msginfo, NULL, FALSE) == 0)
+                       procmsg_msginfo_unset_flags(msgview->msginfo, MSG_SPAM, 0);
+               else
+                       log_error(LOG_PROTOCOL, _("An error happened while learning.\n"));
+       }
+       if (msgview->toolbar)
+               toolbar_set_learn_button
+                       (msgview->toolbar,
+                        MSG_IS_SPAM(msgview->msginfo->flags)?LEARN_HAM:LEARN_SPAM);
+       else
+               toolbar_set_learn_button
+                       (msgview->mainwin->toolbar,
+                        MSG_IS_SPAM(msgview->msginfo->flags)?LEARN_HAM:LEARN_SPAM);
+}
+
+void messageview_list_urls (MessageView        *msgview)
+{
+       GSList *cur = msgview->mimeview->textview->uri_list;
+       GSList *newlist = NULL;
+       for (; cur; cur = cur->next) {
+               ClickableText *uri = (ClickableText *)cur->data;
+               if (!uri->uri || !g_ascii_strncasecmp(uri->uri, "mailto:", 7) 
+               ||  uri->is_quote)
+                       continue;
+               newlist = g_slist_prepend(newlist, uri);
        }
+       newlist = g_slist_reverse(newlist);
+       uri_opener_open(msgview, newlist);
+       g_slist_free(newlist);
 }