2005-10-29 [paul] 1.9.15cvs126
[claws.git] / src / messageview.c
index b10c53858645aedc89211c1373f48683fd43b6d8..5774e2f4e8fb95792947b66d377882e41fb8b071 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-2005 Hiroyuki Yamamoto
  *
  * 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"
 #include "hooks.h"
 #include "filtering.h"
 #include "partial_download.h"
+#include "gedit-print.h"
+#include "inc.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,
@@ -152,135 +154,134 @@ 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)},
+       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/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_("/_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},
@@ -288,7 +289,7 @@ static GtkItemFactoryEntry msgview_entries[] =
        {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 +303,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},
@@ -399,8 +400,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);
 
@@ -426,10 +432,19 @@ MessageView *messageview_create_with_new_window(MainWindow *mainwin)
 {
        MessageView *msgview;
        GtkWidget *window;
+       static GdkGeometry geometry;
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), _("Sylpheed - 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,8 +453,8 @@ 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);
        g_signal_connect(G_OBJECT(window), "key_press_event",
                         G_CALLBACK(key_pressed), msgview);
 
@@ -497,7 +512,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;
@@ -533,15 +548,15 @@ 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, _("_Send"),
+                                       _("+_Don't Send"), NULL, FALSE,
+                                       NULL, ALERT_WARNING, G_ALERTALTERNATE);
                g_free(message);                                
                if (val != G_ALERTDEFAULT)
                        return -1;
@@ -551,29 +566,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."),
+                 _("_Send"), _("+_Don't Send"),NULL, FALSE,
+                 NULL, ALERT_WARNING, G_ALERTALTERNATE);
+               if (val != G_ALERTDEFAULT)
+                       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);
 
-       if ((fp = fopen(tmp, "wb")) == NULL) {
+       if ((fp = g_fopen(tmp, "wb")) == NULL) {
                FILE_OP_ERROR(tmp, "fopen");
                return -1;
        }
@@ -648,7 +673,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,16 +682,19 @@ 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())
+               return 0;
+
        /* send it */
        path = folder_item_fetch_msg(queue, num);
        ok = procmsg_send_message_queue(path);
@@ -709,7 +737,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 {
        gchar *file;
        MimeInfo *mimeinfo, *encinfo;
-
+       gchar *subject = NULL;
        g_return_val_if_fail(msginfo != NULL, -1);
 
        mimeinfo = procmime_scan_message(msginfo);
@@ -740,10 +768,28 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        }
        headerview_show(messageview->headerview, messageview->msginfo);
 
-       messageview->all_headers = all_headers;
-       textview_set_all_headers(messageview->mimeview->textview, all_headers);
+       textview_set_all_headers(messageview->mimeview->textview, 
+                       messageview->all_headers);
 
        mimeview_show_message(messageview->mimeview, mimeinfo, file);
+       
+       if (messageview->window)
+               gtk_window_set_title(GTK_WINDOW(messageview->window), 
+                               _("Sylpheed-Claws - Message View"));
+       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);
+       }
+
        messageview_set_position(messageview, 0);
 
        if (messageview->msginfo->partial_recv)
@@ -757,6 +803,13 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        else 
                noticeview_hide(messageview->noticeview);
 
+       mimeinfo = procmime_mimeinfo_next(mimeinfo);
+       if (mimeinfo && (mimeinfo->type != MIMETYPE_TEXT || 
+           (strcmp(mimeinfo->subtype, "plain") &&
+            strcmp(mimeinfo->subtype, "html")))) {
+               mimeview_show_part(messageview->mimeview,mimeinfo);
+       }
+
        g_free(file);
 
        return 0;
@@ -805,6 +858,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 +876,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;
 
@@ -868,7 +923,8 @@ static void messageview_update(MessageView *msgview)
                GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
                MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, 
                                                      summaryview->selected);
-               g_return_if_fail(msginfo != NULL);
+               if (msginfo == NULL)
+                       return;
 
                messageview_show(msgview, msginfo, 
                                 msgview->all_headers);
@@ -917,8 +973,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)
@@ -979,23 +1042,25 @@ void messageview_save_as(MessageView *messageview)
 
                aval = alertpanel(_("Overwrite"),
                                  _("Overwrite existing file?"),
-                                 _("OK"), _("Cancel"), NULL);
+                                 GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
                if (G_ALERTDEFAULT != 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(_("Can'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,8 +1075,11 @@ 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;
+       }
+       mimeview_pass_key_press_event(messageview->mimeview, event);
        return FALSE;
 }
 
@@ -1202,7 +1270,7 @@ 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,
+                               _("_Send Notification"), _("+_Cancel"), NULL,
                                optmenu) != G_ALERTDEFAULT)
                return NULL;
        return account_find_from_id(account_id);
@@ -1257,32 +1325,44 @@ static void save_as_cb(gpointer data, guint action, GtkWidget *widget)
 static void print_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MessageView *messageview = (MessageView *)data;
-       gchar *cmdline;
+#ifndef USE_GNOMEPRINT
+       gchar *cmdline = NULL;
        gchar *p;
+#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
+       if (!messageview->mimeview 
+       ||  !messageview->mimeview->textview
+       ||  !messageview->mimeview->textview->text)
+               alertpanel_warning(_("Cannot print: the message doesn't "
+                                    "contain text."));
+
+       gedit_print(
+               GTK_TEXT_VIEW(messageview->mimeview
+                               ->textview->text));
+#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 +1428,8 @@ static void show_all_header_cb(gpointer data, guint action, GtkWidget *widget)
        MessageView *messageview = (MessageView *)data;
        MsgInfo *msginfo = messageview->msginfo;
 
+       messageview->all_headers = 
+                       GTK_CHECK_MENU_ITEM(widget)->active;
        if (!msginfo) return;
        messageview->msginfo = NULL;
        messageview_show(messageview, msginfo,
@@ -1380,94 +1462,13 @@ static void compose_cb(gpointer data, guint action, GtkWidget *widget)
 static void reply_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MessageView *messageview = (MessageView *)data;
-       GSList *mlist = NULL;
-       MsgInfo *msginfo;
-       gchar *text = NULL;
-       ComposeMode mode = (ComposeMode)action;
-       TextView *textview;
+       GSList *msginfo_list = NULL;
 
-       msginfo = messageview->msginfo;
-       mlist = g_slist_append(NULL, msginfo);
-
-       textview = messageview_get_current_textview(messageview);
-       text = gtkut_editable_get_selection
-               (GTK_EDITABLE(textview->text));
-       if (text && *text == '\0') {
-               g_free(text);
-               text = NULL;
-       }
-
-       switch (mode) {
-       case COMPOSE_REPLY:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, prefs_common.default_reply_list, FALSE, text);
-               break;
-       case COMPOSE_REPLY_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, prefs_common.default_reply_list, FALSE, text);
-               break;
-       case COMPOSE_REPLY_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, prefs_common.default_reply_list, FALSE, NULL);
-               break;
-       case COMPOSE_REPLY_TO_SENDER:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, FALSE, TRUE, text);
-               break;
-       case COMPOSE_FOLLOWUP_AND_REPLY_TO:
-               compose_followup_and_reply_to(msginfo,
-                                             prefs_common.reply_with_quote,
-                                             FALSE, FALSE, text);
-               break;
-       case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, FALSE, TRUE, text);
-               break;
-       case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, FALSE, TRUE, NULL);
-               break;
-       case COMPOSE_REPLY_TO_ALL:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, FALSE, FALSE, text);
-               break;
-       case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, TRUE, FALSE, FALSE, text);
-               break;
-       case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, TRUE, FALSE, FALSE, NULL);
-               break;
-       case COMPOSE_REPLY_TO_LIST:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, TRUE, FALSE, text);
-               break;
-       case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, text);
-               break;
-       case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
-               break;
-       case COMPOSE_FORWARD:
-               if (prefs_common.forward_as_attachment) {
-                       compose_reply_mode(COMPOSE_FORWARD_AS_ATTACH, mlist, text);
-                       return;
-               } else {
-                       compose_reply_mode(COMPOSE_FORWARD_INLINE, mlist, text);
-                       return;
-               }
-               break;
-       case COMPOSE_FORWARD_INLINE:
-               compose_forward(NULL, msginfo, FALSE, text, FALSE);
-               break;
-       case COMPOSE_FORWARD_AS_ATTACH:
-               compose_forward_multiple(NULL, mlist);
-               break;
-       case COMPOSE_REDIRECT:
-               compose_redirect(NULL, msginfo);
-               break;
-       default:
-               g_warning("compose_reply(): invalid Compose Mode: %d\n", mode);
-       }
+       g_return_if_fail(messageview->msginfo);
 
-       /* summary_set_marks_selected(summaryview); */
-       g_free(text);
-       g_slist_free(mlist);
+       msginfo_list = g_slist_append(msginfo_list, messageview->msginfo);
+       compose_reply_from_messageview(messageview, msginfo_list, action);
+       g_slist_free(msginfo_list);
 }
 
 static void reedit_cb(gpointer data, guint action, GtkWidget *widget)
@@ -1478,9 +1479,10 @@ static void reedit_cb(gpointer data, guint action, GtkWidget *widget)
        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;
+       if (!folder_has_parent_of_type(msginfo->folder, F_DRAFT) &&
+           !folder_has_parent_of_type(msginfo->folder, F_OUTBOX) &&
+           !folder_has_parent_of_type(msginfo->folder, F_QUEUE)) 
+               return;
 
        compose_reedit(msginfo);
 }