2005-06-22 [colin] 1.9.11cvs90
[claws.git] / src / messageview.c
index 7c000ff4deccb9e79a7d81de65e35eac2c27a5c3..54beb02212a232a12af69b0ac485443eeca44338 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
 #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 "prefs_account.h"
 #include "gtkutils.h"
 #include "utils.h"
-#include "rfc2015.h"
 #include "send_message.h"
 #include "stock_pixmap.h"
 #include "hooks.h"
 #include "filtering.h"
-#include "pop.h"
+#include "partial_download.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,
@@ -80,7 +79,11 @@ static void return_receipt_send_clicked (NoticeView  *noticeview,
                                          MsgInfo        *msginfo);
 static void partial_recv_show          (NoticeView     *noticeview, 
                                         MsgInfo        *msginfo);      
-static void partial_recv_dload_clicked (NoticeView     *noticeview, 
+static void partial_recv_dload_clicked         (NoticeView     *noticeview, 
+                                         MsgInfo        *msginfo);
+static void partial_recv_del_clicked   (NoticeView     *noticeview, 
+                                         MsgInfo        *msginfo);
+static void partial_recv_unmark_clicked (NoticeView    *noticeview, 
                                          MsgInfo        *msginfo);
 static void save_as_cb                 (gpointer        data,
                                         guint           action,
@@ -104,6 +107,9 @@ static void search_cb                       (gpointer        data,
 static void set_charset_cb             (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
+static void set_decode_cb              (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
 static void view_source_cb             (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -160,87 +166,102 @@ static GtkItemFactoryEntry msgview_entries[] =
 
        {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
+       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 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"),             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 DEC_SEPARATOR
+#undef DEC_ACTION
 
        {N_("/_View/---"),              NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Mess_age source"),  NULL, view_source_cb, 0, NULL},
@@ -280,7 +301,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},
@@ -379,6 +400,7 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
 
        handlebox = gtk_handle_box_new();
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+       gtk_widget_realize(handlebox);
        msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox,
                                          (gpointer)msgview);
 
@@ -404,11 +426,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_wmclass(GTK_WINDOW(window), "message_view", "Sylpheed");
-       gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
+       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);
 
@@ -417,8 +447,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);
 
@@ -476,7 +506,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;
@@ -519,8 +549,8 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                                   "Return path: %s\n"
                                   "It is advised to not to send the return "
                                   "receipt."), to, buf);
-               val = alertpanel(_("Warning"), message, _("Send"),
-                               _("+Don't Send"), NULL);
+               val = alertpanel_with_type(_("Warning"), message, _("Send"),
+                               _("+Don't Send"), NULL, NULL, ALERT_WARNING);
                g_free(message);                                
                if (val != G_ALERTDEFAULT)
                        return -1;
@@ -530,23 +560,34 @@ 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 "
+               AlertValue val = 
+               alertpanel_with_type(_("Warning"),
+                               _("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;
+                                  "It is advised to not to send the return ."
+                                  "receipt."),
+                               _("Send"), _("+Don't Send"), NULL, 
+                               NULL, ALERT_WARNING);
+               if (val != G_ALERTDEFAULT)
+                       return -1;
        }
 
        if (g_list_length(ac_list) > 1)
                account = select_account_from_list(ac_list);
-       else
+       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",
@@ -622,8 +663,8 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        fprintf(fp, "Subject: Disposition notification: %s\n", buf);
 
        /* Message ID */
-       generate_msgid(account->address, buf, sizeof buf);
-       fprintf(fp, "Message-Id: <%s>\n", buf);
+       generate_msgid(buf, sizeof(buf));
+       fprintf(fp, "Message-ID: <%s>\n", buf);
 
        if (fclose(fp) == EOF) {
                FILE_OP_ERROR(tmp, "fclose");
@@ -645,7 +686,13 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                unlink(tmp);
                return -1;
        }
-       
+               
+       if (prefs_common.work_offline)
+               if (alertpanel(_("Offline warning"), 
+                              _("You're working offline. Override?"),
+                              _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+                       return 0;
+
        /* send it */
        path = folder_item_fetch_msg(queue, num);
        ok = procmsg_send_message_queue(path);
@@ -714,13 +761,16 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        if (messageview->msginfo != msginfo) {
                procmsg_msginfo_free(messageview->msginfo);
                messageview->msginfo = procmsg_msginfo_get_full_info(msginfo);
+               if (!messageview->msginfo)
+                       messageview->msginfo = procmsg_msginfo_copy(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);
+       messageview_set_position(messageview, 0);
 
        if (messageview->msginfo->partial_recv)
                partial_recv_show(messageview->noticeview, 
@@ -733,6 +783,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;
@@ -781,6 +838,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);
 }
 
@@ -797,7 +856,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;
 
@@ -893,8 +952,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)
@@ -939,7 +1005,7 @@ void messageview_save_as(MessageView *messageview)
 {
        gchar *filename = NULL;
        MsgInfo *msginfo;
-       gchar *src, *dest;
+       gchar *src, *dest, *tmp;
 
        if (!messageview->msginfo) return;
        msginfo = messageview->msginfo;
@@ -948,28 +1014,32 @@ void messageview_save_as(MessageView *messageview)
                Xstrdup_a(filename, msginfo->subject, return);
                subst_for_filename(filename);
        }
-       dest = filesel_select_file(_("Save as"), filename);
+       dest = filesel_select_file_save(_("Save as"), filename);
        if (!dest) return;
        if (is_file_exist(dest)) {
                AlertValue aval;
 
                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) {
-               alertpanel_error(_("Can't save the file `%s'."),
-                                g_basename(dest));
+               tmp =  g_path_get_basename(dest);
+               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,
@@ -984,8 +1054,10 @@ 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;
+       }
        return FALSE;
 }
 
@@ -1027,10 +1099,10 @@ void messageview_toggle_view_real(MessageView *messageview)
 
 static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
 {
-       noticeview_set_text(noticeview, _("This message asks for a return receipt"));
+       noticeview_set_text(noticeview, _("This message asks for a return receipt."));
        noticeview_set_button_text(noticeview, _("Send receipt"));
        noticeview_set_button_press_callback(noticeview,
-                                            GTK_SIGNAL_FUNC(return_receipt_send_clicked),
+                                            G_CALLBACK(return_receipt_send_clicked),
                                             (gpointer) msginfo);
        noticeview_show(noticeview);
 }
@@ -1062,63 +1134,94 @@ static void return_receipt_send_clicked(NoticeView *noticeview, MsgInfo *msginfo
 static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
 {
        gchar *text = NULL;
-       if (!msginfo->planned_download) {
+       gchar *button1 = NULL;
+       gchar *button2 = NULL;
+       void  *button1_cb = NULL;
+       void  *button2_cb = NULL;
+
+       if (!partial_msg_in_uidl_list(msginfo)) {
                text = g_strdup_printf(_("This message has been partially "
-                                "retrieved; it is %s large."), 
-                                to_human_readable(
-                                       (off_t)(msginfo->total_size)));
-
-               noticeview_set_text(noticeview, text);
-               g_free(text);
-               noticeview_set_button_text(noticeview, _("Mark for download"));
-               noticeview_set_button_press_callback(noticeview,
-                            GTK_SIGNAL_FUNC(partial_recv_dload_clicked),
-                            (gpointer) msginfo);
-               noticeview_show(noticeview);
+                               "retrieved,\nand has been deleted from the "
+                               "server."));
        } else {
-               text = g_strdup_printf(_("This message has been partially "
-                                "retrieved and is planned for "
-                                "download; it is %s large."), 
-                                to_human_readable(
-                                       (off_t)(msginfo->total_size)));
-
-               noticeview_set_text(noticeview, text);
-               noticeview_set_button_text(noticeview, NULL);
-               g_free(text);
-               noticeview_show(noticeview);
+               switch (msginfo->planned_download) {
+               case POP3_PARTIAL_DLOAD_UNKN:
+                       text = g_strdup_printf(_("This message has been "
+                                       "partially retrieved;\nit is %s."),
+                                       to_human_readable(
+                                               (off_t)(msginfo->total_size)));
+                       button1 = _("Mark for download");
+                       button2 = _("Mark for deletion");
+                       button1_cb = partial_recv_dload_clicked;
+                       button2_cb = partial_recv_del_clicked;
+                       break;
+               case POP3_PARTIAL_DLOAD_DLOAD:
+                       text = g_strdup_printf(_("This message has been "
+                                       "partially retrieved;\nit is %s and "
+                                       "will be downloaded."),
+                                       to_human_readable(
+                                               (off_t)(msginfo->total_size)));
+                       button1 = _("Unmark");
+                       button1_cb = partial_recv_unmark_clicked;
+                       button2 = _("Mark for deletion");
+                       button2_cb = partial_recv_del_clicked;
+                       break;
+               case POP3_PARTIAL_DLOAD_DELE:
+                       text = g_strdup_printf(_("This message has been "
+                                       "partially retrieved;\nit is %s and "
+                                       "will be deleted."),
+                                       to_human_readable(
+                                               (off_t)(msginfo->total_size)));
+                       button1 = _("Mark for download");
+                       button1_cb = partial_recv_dload_clicked;
+                       button2 = _("Unmark");
+                       button2_cb = partial_recv_unmark_clicked;
+                       break;
+               default:
+                       return;
+               }
        }
+       
+       noticeview_set_text(noticeview, text);
+       g_free(text);
+       noticeview_set_button_text(noticeview, button1);
+       noticeview_set_button_press_callback(noticeview,
+                    G_CALLBACK(button1_cb), (gpointer) msginfo);
+
+       noticeview_set_2ndbutton_text(noticeview, button2);
+       noticeview_set_2ndbutton_press_callback(noticeview,
+                    G_CALLBACK(button2_cb), (gpointer) msginfo);
+
+       noticeview_show(noticeview);
 }
 
 static void partial_recv_dload_clicked(NoticeView *noticeview, 
                                       MsgInfo *msginfo)
 {
-       MsgInfo *tmpmsginfo;
-       gchar *file;
-
-       file = procmsg_get_message_file_path(msginfo);
-       if (!file) {
-               g_warning("can't get message file path.\n");
-               return;
+       if (partial_mark_for_download(msginfo) == 0) {
+               partial_recv_show(noticeview, msginfo);
        }
+}
 
-       tmpmsginfo = procheader_parse_file(file, msginfo->flags, TRUE, TRUE);
-       tmpmsginfo->folder = msginfo->folder;
-       tmpmsginfo->msgnum = msginfo->msgnum;
-
-       if (pop3_mark_for_download(tmpmsginfo->account_server, 
-                                  tmpmsginfo->account_login, 
-                                  tmpmsginfo->partial_recv, file) == 0) {
-               msginfo->planned_download = 1;
+static void partial_recv_del_clicked(NoticeView *noticeview, 
+                                      MsgInfo *msginfo)
+{
+       if (partial_mark_for_delete(msginfo) == 0) {
                partial_recv_show(noticeview, msginfo);
        }
+}
 
-       procmsg_msginfo_free(tmpmsginfo);
-       g_free(file);
+static void partial_recv_unmark_clicked(NoticeView *noticeview, 
+                                      MsgInfo *msginfo)
+{
+       if (partial_unmark(msginfo) == 0) {
+               partial_recv_show(noticeview, msginfo);
+       }
 }
 
 static void select_account_cb(GtkWidget *w, gpointer data)
 {
-       *(gint*)data = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(w)));
+       *(gint*)data = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), MENU_VAL_ID));
 }
        
 static PrefsAccount *select_account_from_list(GList *ac_list)
@@ -1131,7 +1234,9 @@ static PrefsAccount *select_account_from_list(GList *ac_list)
        g_return_val_if_fail(ac_list->data != NULL, NULL);
        
        optmenu = gtk_option_menu_new();
-       menu = gtkut_account_menu_new(ac_list, select_account_cb, &account_id);
+       menu = gtkut_account_menu_new(ac_list, 
+                       G_CALLBACK(select_account_cb), 
+                       &account_id);
        if (!menu)
                return NULL;
        gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
@@ -1170,7 +1275,7 @@ gchar *messageview_get_selection(MessageView *msgview)
        textview = messageview_get_current_textview(msgview);
        g_return_val_if_fail(textview != NULL, NULL);
 
-       edit = GTK_EDITABLE(textview->text);
+       edit = GTK_TEXT_VIEW(textview->text);
        g_return_val_if_fail(edit != NULL, NULL);
        body_pos = textview->body_pos;
 
@@ -1223,7 +1328,7 @@ static void print_cb(gpointer data, guint action, GtkWidget *widget)
 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)
@@ -1253,10 +1358,25 @@ static void set_charset_cb(gpointer data, guint action, GtkWidget *widget)
                charset = conv_get_charset_str((CharSet)action);
                g_free(messageview->forced_charset);
                messageview->forced_charset = g_strdup(charset);
+               procmime_force_charset(charset);
+               
                messageview_show(messageview, messageview->msginfo, FALSE);
        }
 }
 
+static void set_decode_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       if (GTK_CHECK_MENU_ITEM(widget)->active) {
+               messageview->forced_encoding = (EncodingType)action;
+
+               messageview_show(messageview, messageview->msginfo, FALSE);
+               
+               debug_print("forced encoding: %d\n", action);
+       }
+}
+
+
 static void view_source_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MessageView *messageview = (MessageView *)data;
@@ -1274,6 +1394,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,
@@ -1306,94 +1428,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;
-
-       msginfo = messageview->msginfo;
-       mlist = g_slist_append(NULL, msginfo);
+       GSList *msginfo_list = NULL;
 
-       textview = messageview_get_current_textview(messageview);
-       text = gtkut_editable_get_selection
-               (GTK_EDITABLE(textview->text));
-       if (text && *text == '\0') {
-               g_free(text);
-               text = NULL;
-       }
+       g_return_if_fail(messageview->msginfo);
 
-       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);
-       }
-
-       /* 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)
@@ -1481,7 +1522,7 @@ void messageview_set_menu_sensitive(MessageView *messageview)
        GtkItemFactory *ifactory;
        GtkWidget *menuitem;
 
-       if (!messageview && !messageview->new_window) 
+       if (!messageview || !messageview->new_window) 
                return;
        /* do some smart things */
        if (!messageview->menubar) return;