2005-02-27 [paul] 1.0.1cvs20.1
[claws.git] / src / messageview.c
index 6591be71e672585df64c1e24399622320680c1a5..d915de2d48b95bb377979758ba5a5953f875b315 100644 (file)
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkcontainer.h>
@@ -32,7 +33,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;
 
@@ -108,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);
@@ -176,17 +178,14 @@ static GtkItemFactoryEntry msgview_entries[] =
        {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,
@@ -210,18 +209,14 @@ static GtkItemFactoryEntry msgview_entries[] =
        {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)},
@@ -241,11 +236,26 @@ static GtkItemFactoryEntry msgview_entries[] =
         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 \
+       {N_("/_View/Decode/---"),               NULL, NULL, 0, "<Separator>"}
+#define DECODE_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)},
+
+#undef DECODE_SEPARATOR
+#undef DECODE_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>"},
@@ -284,7 +294,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},
@@ -411,8 +421,7 @@ MessageView *messageview_create_with_new_window(MainWindow *mainwin)
 
        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);
        gtk_widget_set_size_request(window, prefs_common.msgwin_width,
                                    prefs_common.msgwin_height);
 
@@ -523,8 +532,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;
@@ -626,8 +635,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");
@@ -649,7 +658,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);
@@ -718,6 +733,8 @@ 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);
 
@@ -725,6 +742,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        textview_set_all_headers(messageview->mimeview->textview, all_headers);
 
        mimeview_show_message(messageview->mimeview, mimeinfo, file);
+       messageview_set_position(messageview, 0);
 
        if (messageview->msginfo->partial_recv)
                partial_recv_show(messageview->noticeview, 
@@ -737,6 +755,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;
@@ -895,10 +920,28 @@ void messageview_copy_clipboard(MessageView *messageview)
 void messageview_select_all(MessageView *messageview)
 {
        TextView *text;
+       GtkTextView *edit = NULL;
+       GtkTextBuffer *textbuf;
+       gint body_pos = 0;
+       GtkTextIter start, end;
+       
+       g_return_if_fail(messageview != NULL);
 
        text = messageview_get_current_textview(messageview);
-       if (text)
-               gtk_editable_select_region(GTK_EDITABLE(text->text), 0, -1);
+       g_return_if_fail(text != NULL);
+
+       edit = GTK_TEXT_VIEW(text->text);
+       g_return_if_fail(edit != NULL);
+
+       textbuf = gtk_text_view_get_buffer(edit);
+       g_return_if_fail(textbuf != NULL);
+
+       gtk_text_buffer_get_bounds(textbuf, &start, &end);
+       
+       gtk_text_buffer_move_mark_by_name(textbuf, 
+               "selection_bound", &start);
+       gtk_text_buffer_move_mark_by_name(textbuf, 
+               "insert", &end);
 }
 
 void messageview_set_position(MessageView *messageview, gint pos)
@@ -943,7 +986,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;
@@ -952,22 +995,24 @@ 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);
 }
 
@@ -1034,7 +1079,7 @@ 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,
-                                            GTK_SIGNAL_FUNC(return_receipt_send_clicked),
+                                            G_CALLBACK(return_receipt_send_clicked),
                                             (gpointer) msginfo);
        noticeview_show(noticeview);
 }
@@ -1071,53 +1116,58 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
        void  *button1_cb = NULL;
        void  *button2_cb = NULL;
 
-       if (!pop3_msg_in_uidl_list(msginfo->account_server, msginfo->account_login,
-                                  msginfo->partial_recv))
-               return;
-       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:
+       if (!partial_msg_in_uidl_list(msginfo)) {
                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;
+                               "retrieved,\nand has been deleted from the "
+                               "server."));
+       } else {
+               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,
-                    GTK_SIGNAL_FUNC(button1_cb), (gpointer) msginfo);
+                    G_CALLBACK(button1_cb), (gpointer) msginfo);
 
        noticeview_set_2ndbutton_text(noticeview, button2);
        noticeview_set_2ndbutton_press_callback(noticeview,
-                    GTK_SIGNAL_FUNC(button2_cb), (gpointer) msginfo);
+                    G_CALLBACK(button2_cb), (gpointer) msginfo);
 
        noticeview_show(noticeview);
 }
@@ -1125,93 +1175,30 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
 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;
-       }
-
-       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,
-                                  folder_item_get_identifier(msginfo->folder), 
-                                  msginfo->msgnum) == 0) {
-               msginfo->planned_download = POP3_PARTIAL_DLOAD_DLOAD;
+       if (partial_mark_for_download(msginfo) == 0) {
                partial_recv_show(noticeview, msginfo);
        }
-
-       procmsg_msginfo_free(tmpmsginfo);
-       g_free(file);
 }
 
 static void partial_recv_del_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;
-       }
-
-       tmpmsginfo = procheader_parse_file(file, msginfo->flags, TRUE, TRUE);
-       tmpmsginfo->folder = msginfo->folder;
-       tmpmsginfo->msgnum = msginfo->msgnum;
-
-       if (pop3_mark_for_delete(tmpmsginfo->account_server, 
-                                  tmpmsginfo->account_login, 
-                                  tmpmsginfo->partial_recv, file,
-                                  folder_item_get_identifier(msginfo->folder), 
-                                  msginfo->msgnum) == 0) {
-               msginfo->planned_download = POP3_PARTIAL_DLOAD_DELE;
+       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)
 {
-       MsgInfo *tmpmsginfo;
-       gchar *file;
-
-       file = procmsg_get_message_file_path(msginfo);
-       if (!file) {
-               g_warning("can't get message file path.\n");
-               return;
-       }
-
-       tmpmsginfo = procheader_parse_file(file, msginfo->flags, TRUE, TRUE);
-       tmpmsginfo->folder = msginfo->folder;
-       tmpmsginfo->msgnum = msginfo->msgnum;
-
-       if (pop3_unmark(tmpmsginfo->account_server, 
-                       tmpmsginfo->account_login, 
-                       tmpmsginfo->partial_recv, file,
-                       folder_item_get_identifier(msginfo->folder), 
-                       msginfo->msgnum) == 0) {
-               msginfo->planned_download = POP3_PARTIAL_DLOAD_UNKN;
+       if (partial_unmark(msginfo) == 0) {
                partial_recv_show(noticeview, msginfo);
        }
-
-       procmsg_msginfo_free(tmpmsginfo);
-       g_free(file);
 }
 
 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)
@@ -1348,10 +1335,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;
@@ -1401,94 +1403,14 @@ 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;
+       GSList *msginfo_list = NULL;
        MsgInfo *msginfo;
-       gchar *text = NULL;
-       ComposeMode mode = (ComposeMode)action;
-       TextView *textview;
-
-       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;
-       }
+       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)
@@ -1576,7 +1498,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;