2007-10-10 [claws] 3.0.2cvs49
[claws.git] / src / messageview.c
index b7007706d7d1cdf6c4d33a4cf5af4a4d3f3595cf..19f8db7f3f976e6186d9dc2b5b4d887c22733c03 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include "defs.h"
@@ -42,6 +42,7 @@
 #include "menu.h"
 #include "about.h"
 #include "filesel.h"
+#include "foldersel.h"
 #include "sourcewindow.h"
 #include "addressbook.h"
 #include "alertpanel.h"
 #include "filtering.h"
 #include "partial_download.h"
 #include "gedit-print.h"
+#include "uri_opener.h"
 #include "inc.h"
 #include "log.h"
+#include "combobox.h"
+#include "printing.h"
 
 static GList *messageview_list = NULL;
 
@@ -92,6 +96,11 @@ static void partial_recv_unmark_clicked (NoticeView  *noticeview,
 static void save_as_cb                 (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
+#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT)
+static void page_setup_cb              (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+#endif
 static void print_cb                   (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -108,6 +117,49 @@ static void search_cb                      (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void prev_cb                    (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void next_cb                    (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void prev_unread_cb             (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void next_unread_cb             (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void prev_new_cb                        (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void next_new_cb                        (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void prev_marked_cb             (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void next_marked_cb             (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void prev_labeled_cb            (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void next_labeled_cb            (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void last_read_cb               (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void parent_cb                  (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void goto_unread_folder_cb      (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void goto_folder_cb             (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void set_charset_cb             (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -145,11 +197,15 @@ static void create_filter_cb              (gpointer        data,
 static void create_processing_cb       (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
+static void open_urls_cb               (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
 
 static void about_cb                   (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
-static void messageview_update         (MessageView *msgview);
+static void messageview_update         (MessageView    *msgview,
+                                        MsgInfo        *old_msginfo);
 static gboolean messageview_update_msg (gpointer source, gpointer data);
 
 static GList *msgview_list = NULL;
@@ -157,6 +213,9 @@ static GtkItemFactoryEntry msgview_entries[] =
 {
        {N_("/_File"),                  NULL, NULL, 0, "<Branch>"},
        {N_("/_File/_Save as..."),      "<control>S", save_as_cb, 0, NULL},
+#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT)
+       {N_("/_File/Page setup..."),    NULL, page_setup_cb, 0, NULL},
+#endif
        {N_("/_File/_Print..."),        "<control>P", print_cb, 0, NULL},
        {N_("/_File/---"),              NULL, NULL, 0, "<Separator>"},
        {N_("/_File/_Close"),           "<control>W", close_cb, 0, NULL},
@@ -169,6 +228,36 @@ static GtkItemFactoryEntry msgview_entries[] =
                                        "<control>F", search_cb, 0, NULL},
 
        {N_("/_View"),                  NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/_Go to/_Previous message"), "P", prev_cb, 0, NULL},
+       {N_("/_View/_Go to/_Next message"),     "N", next_cb, 0, NULL},
+       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to/P_revious unread message"),
+                                               "<shift>P", prev_unread_cb, 0, NULL},
+       {N_("/_View/_Go to/N_ext unread message"),
+                                               "<shift>N", next_unread_cb, 0, NULL},
+       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to/Previous ne_w message"),     NULL, prev_new_cb, 0, NULL},
+       {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_cb, 0, NULL},
+       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to/Previous _marked message"),
+                                               NULL, prev_marked_cb, 0, NULL},
+       {N_("/_View/_Go to/Next m_arked message"),
+                                               NULL, next_marked_cb, 0, NULL},
+       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to/Previous _labeled message"),
+                                               NULL, prev_labeled_cb, 0, NULL},
+       {N_("/_View/_Go to/Next la_beled message"),
+                                               NULL, next_labeled_cb, 0, NULL},
+       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to/Last read message"),
+                                               NULL, last_read_cb, 0, NULL},
+       {N_("/_View/_Go to/Parent message"),
+                                               "<control>Up", parent_cb, 0, NULL},
+       {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/_Go to/Next unread _folder"),       "<shift>G", goto_unread_folder_cb, 0, NULL},
+       {N_("/_View/_Go to/_Other folder..."),  "G", goto_folder_cb, 0, NULL},
+       {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
 
 #define ENC_SEPARATOR \
        {N_("/_View/Character _encoding/---"),  NULL, NULL, 0, "<Separator>"}
@@ -325,6 +414,8 @@ static GtkItemFactoryEntry msgview_entries[] =
        {N_("/_Tools/Create processing rule/by _Subject"),
                                        NULL, create_processing_cb, FILTER_BY_SUBJECT, NULL},
        {N_("/_Tools/---"),             NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/List _URLs..."),   "<shift><control>U", open_urls_cb, 0, NULL},
+       {N_("/_Tools/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/Actio_ns"),        NULL, NULL, 0, "<Branch>"},
 
        {N_("/_Help"),                  NULL, NULL, 0, "<Branch>"},
@@ -398,7 +489,7 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        GtkWidget *handlebox;
        GtkWidget *vbox;
        GtkWidget *menubar;
-       GtkWidget *statusbar;
+       GtkWidget *statusbar = NULL;
        guint n_menu_entries;
 
        vbox = gtk_vbox_new(FALSE, 0);
@@ -418,15 +509,22 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        }
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
        gtk_widget_realize(handlebox);
+#ifdef MAEMO
+       msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, window,
+                                         (gpointer)msgview);
+       msgview->statusbar = NULL;
+       msgview->statusbar_cid = 0;
+#else
        msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox,
                                          (gpointer)msgview);
-
        statusbar = gtk_statusbar_new();
        gtk_widget_show(statusbar);
        gtk_box_pack_end(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0);
        msgview->statusbar = statusbar;
        msgview->statusbar_cid = gtk_statusbar_get_context_id
                (GTK_STATUSBAR(statusbar), "Message View");
+#endif
+
 
        msgview->handlebox = handlebox;
        msgview->menubar   = menubar;
@@ -445,7 +543,7 @@ static MessageView *messageview_create_with_new_window_visible(MainWindow *mainw
        GtkWidget *window;
        static GdkGeometry geometry;
 
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "messageview");
        gtk_window_set_title(GTK_WINDOW(window), _("Claws Mail - Message View"));
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 
@@ -466,9 +564,12 @@ static MessageView *messageview_create_with_new_window_visible(MainWindow *mainw
                         msgview);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(messageview_delete_cb), msgview);
+#ifdef MAEMO
+       maemo_connect_key_press_to_mainwindow(GTK_WINDOW(window));
+#else
        g_signal_connect(G_OBJECT(window), "key_press_event",
                         G_CALLBACK(key_pressed), msgview);
-
+#endif
        messageview_add_toolbar(msgview, window);
 
        if (show) {
@@ -540,6 +641,8 @@ static gint disposition_notification_send(MsgInfo *msginfo)
         gchar *addr;
         gchar *addrp;
        gchar *foo = NULL;
+       gboolean queued_removed = FALSE;
+       
        if (!msginfo->extradata)
                return -1;
        if (!msginfo->extradata->returnreceiptto && 
@@ -568,7 +671,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        if (ok != 0) {
                AlertValue val;
                gchar *message;
-               message = g_strdup_printf(
+               message = g_markup_printf_escaped(
                  _("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"
@@ -616,8 +719,8 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        }
 
        /* write to temporary file */
-       g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg%d",
-                  get_rc_dir(), G_DIR_SEPARATOR, (gint)msginfo);
+       g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg%p",
+                  get_rc_dir(), G_DIR_SEPARATOR, msginfo);
 
        if ((fp = g_fopen(tmp, "wb")) == NULL) {
                FILE_OP_ERROR(tmp, "fopen");
@@ -636,24 +739,29 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        addrp = addr;
        
        /* write queue headers */
-       fprintf(fp, "AF:\n");
-       fprintf(fp, "NF:0\n");
-       fprintf(fp, "PS:10\n");
-       fprintf(fp, "SRH:1\n");
-       fprintf(fp, "SFN:\n");
-       fprintf(fp, "DSR:\n");
-       fprintf(fp, "MID:\n");
-       fprintf(fp, "CFG:\n");
-       fprintf(fp, "PT:0\n");
-       fprintf(fp, "S:%s\n", account->address);
-       fprintf(fp, "RQ:\n");
-       if (account->smtp_server)
-               fprintf(fp, "SSV:%s\n", account->smtp_server);
-       else
-               fprintf(fp, "SSV:\n");
-       fprintf(fp, "SSH:\n");
-       fprintf(fp, "R:<%s>\n", addrp);
-       
+       if (fprintf(fp, "AF:\n"
+                   "NF:0\n"
+                   "PS:10\n"
+                   "SRH:1\n"
+                   "SFN:\n"
+                   "DSR:\n"
+                   "MID:\n"
+                   "CFG:\n"
+                   "PT:0\n"
+                   "S:%s\n"
+                   "RQ:\n"
+                   "SSV:%s\n"
+                   "SSH:\n"
+                   "R:<%s>\n", 
+                   account->address,
+                   account->smtp_server?account->smtp_server:"",
+                   addrp) < 0) {
+               g_free(addrp);
+               fclose(fp);
+               g_unlink(tmp);
+               return -1;
+       }
+
        g_free(addrp);
        
        /* check whether we need to save the message */
@@ -662,35 +770,80 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                outbox = NULL;
        if (outbox) {
                path = folder_item_get_identifier(outbox);
-               fprintf(fp, "SCF:%s\n", path);
+               if (fprintf(fp, "SCF:%s\n", path) < 0) {
+                       g_free(path);
+                       fclose(fp);
+                       g_unlink(tmp);
+                       return -1;
+               }
                g_free(path);
        }               
 
-       fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
-       
+       if (fprintf(fp, "X-Claws-End-Special-Headers: 1\n") < 0) {
+               fclose(fp);
+               g_unlink(tmp);
+               return -1;
+       }
+
        /* Date */
        get_rfc822_date(buf, sizeof(buf));
-       fprintf(fp, "Date: %s\n", buf);
+       if (fprintf(fp, "Date: %s\n", buf) < 0) {
+               fclose(fp);
+               g_unlink(tmp);
+               return -1;
+       }
 
        /* From */
        if (account->name && *account->name) {
                notification_convert_header
                        (buf, sizeof(buf), account->name,
                         strlen("From: "));
-               fprintf(fp, "From: %s <%s>\n", buf, account->address);
+               if (fprintf(fp, "From: %s <%s>\n", buf, account->address) < 0) {
+                       fclose(fp);
+                       g_unlink(tmp);
+                       return -1;
+               }
        } else
-               fprintf(fp, "From: %s\n", account->address);
+               if (fprintf(fp, "From: %s\n", account->address) < 0) {
+                       fclose(fp);
+                       g_unlink(tmp);
+                       return -1;
+               }
+
 
-       fprintf(fp, "To: %s\n", to);
+       if (fprintf(fp, "To: %s\n", to) < 0) {
+               fclose(fp);
+               g_unlink(tmp);
+               return -1;
+       }
 
        /* Subject */
        notification_convert_header(buf, sizeof(buf), msginfo->subject,
                                    strlen("Subject: "));
-       fprintf(fp, "Subject: Disposition notification: %s\n", buf);
+       if (fprintf(fp, "Subject: Disposition notification: %s\n", buf) < 0) {
+               fclose(fp);
+               g_unlink(tmp);
+               return -1;
+       }
 
        /* Message ID */
+       if (account->set_domain && account->domain) {
+               g_snprintf(buf, sizeof(buf), "%s", account->domain); 
+       } else if (!strncmp(get_domain_name(), "localhost", strlen("localhost"))) {
+               g_snprintf(buf, sizeof(buf), "%s", 
+                       strchr(account->address, '@') ?
+                               strchr(account->address, '@')+1 :
+                               account->address);
+       } else {
+               g_snprintf(buf, sizeof(buf), "%s", "");
+       }
        generate_msgid(buf, sizeof(buf));
-       fprintf(fp, "Message-ID: <%s>\n", buf);
+       if (fprintf(fp, "Message-ID: <%s>\n", buf) < 0) {
+               fclose(fp);
+               g_unlink(tmp);
+               return -1;
+       }
+
 
        if (fclose(fp) == EOF) {
                FILE_OP_ERROR(tmp, "fclose");
@@ -714,26 +867,22 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        }
                
        if (prefs_common.work_offline && 
-           !inc_offline_should_override(
+           !inc_offline_should_override(TRUE,
                _("Claws Mail needs network access in order "
                  "to send this email.")))
                return 0;
 
        /* send it */
        path = folder_item_fetch_msg(queue, num);
-       ok = procmsg_send_message_queue(path, &foo, queue, num);
+       ok = procmsg_send_message_queue(path, &foo, queue, num, &queued_removed);
        g_free(path);
        g_free(foo);
-       folder_item_remove_msg(queue, num);
+       if (ok == 0 && !queued_removed)
+               folder_item_remove_msg(queue, num);
 
        return ok;
 }
 
-GList *messageview_get_window_list(void)
-{
-       return messageview_list;
-}
-
 static gboolean find_encrypted_func(GNode *node, gpointer data)
 {
        MimeInfo *mimeinfo = (MimeInfo *) node->data;
@@ -770,6 +919,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                messageview->mimeview->textview->stop_loading = TRUE;
                return 0;
        }
+
        if (messageview->toolbar)
                toolbar_set_learn_button
                        (messageview->toolbar,
@@ -780,20 +930,30 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                         MSG_IS_SPAM(msginfo->flags)?LEARN_HAM:LEARN_SPAM);
 
        if (messageview->toolbar) {
-               if (messageview->toolbar->learn_ham_btn)
-                       gtk_widget_set_sensitive(
-                               messageview->toolbar->learn_ham_btn, 
-                               procmsg_spam_can_learn());
                if (messageview->toolbar->learn_spam_btn)
                        gtk_widget_set_sensitive(
                                messageview->toolbar->learn_spam_btn, 
                                procmsg_spam_can_learn());
        }
        messageview->updating = TRUE;
-       mimeinfo = procmime_scan_message(msginfo);
+
+       file = procmsg_get_message_file_path(msginfo);
+       if (!file) {
+               g_warning("can't get message file path.\n");
+               textview_show_error(messageview->mimeview->textview);
+               return -1;
+       }
+       
+       if (!folder_has_parent_of_type(msginfo->folder, F_QUEUE) &&
+           !folder_has_parent_of_type(msginfo->folder, F_DRAFT))
+               mimeinfo = procmime_scan_file(file);
+       else
+               mimeinfo = procmime_scan_queue_file(file);
+
        messageview->updating = FALSE;
        
        if (messageview->deferred_destroy) {
+               g_free(file);
                messageview_destroy(messageview);
                return 0;
        }
@@ -811,29 +971,13 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                        break;
                }
        }
-       
-       messageview->updating = TRUE;
-       file = procmsg_get_message_file_path(msginfo);
-       messageview->updating = FALSE;
-       
-       if (messageview->deferred_destroy) {
-               g_free(file);
-               messageview_destroy(messageview);
-               return 0;
-       }
-
-       if (!file) {
-               g_warning("can't get message file path.\n");
-               procmime_mimeinfo_free_all(mimeinfo);
-               textview_show_error(messageview->mimeview->textview);
-               return -1;
-       }
-       
+                       
        if (messageview->msginfo != msginfo) {
                procmsg_msginfo_free(messageview->msginfo);
                messageview->msginfo = NULL;
                messageview_set_menu_sensitive(messageview);
-               messageview->msginfo = procmsg_msginfo_get_full_info(msginfo);
+               messageview->msginfo = 
+                       procmsg_msginfo_get_full_info_from_file(msginfo, file);
                if (!messageview->msginfo)
                        messageview->msginfo = procmsg_msginfo_copy(msginfo);
        } else {
@@ -848,11 +992,20 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        textview_set_all_headers(messageview->mimeview->textview, 
                        messageview->all_headers);
 
-       mimeview_show_message(messageview->mimeview, mimeinfo, file);
-       
-       if (messageview->window)
+#ifdef MAEMO
+       maemo_window_full_screen_if_needed(GTK_WINDOW(messageview->window));
+#endif
+       if (messageview->window) {
                gtk_window_set_title(GTK_WINDOW(messageview->window), 
                                _("Claws Mail - Message View"));
+               GTK_EVENTS_FLUSH();
+       }
+       mimeview_show_message(messageview->mimeview, mimeinfo, file);
+       
+#ifndef MAEMO
+       messageview_set_position(messageview, 0);
+#endif
+
        if (messageview->window && msginfo->subject) {
                subject = g_strdup(msginfo->subject);
                if (!g_utf8_validate(subject, -1, NULL)) {
@@ -867,13 +1020,17 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                g_free(subject);
        }
 
+       if (msginfo && msginfo->folder) {
+               msginfo->folder->last_seen = msginfo->msgnum;   
+       }
+
        main_create_mailing_list_menu(messageview->mainwin, messageview->msginfo);
 
-       if (messageview->msginfo->extradata
+       if (messageview->msginfo && messageview->msginfo->extradata
            && messageview->msginfo->extradata->partial_recv)
                partial_recv_show(messageview->noticeview, 
                                  messageview->msginfo);
-       else if (messageview->msginfo->extradata &&
+       else if (messageview->msginfo && messageview->msginfo->extradata &&
            (messageview->msginfo->extradata->dispositionnotificationto || 
             messageview->msginfo->extradata->returnreceiptto) &&
            !MSG_IS_RETRCPT_SENT(messageview->msginfo->flags) &&
@@ -884,8 +1041,11 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                noticeview_hide(messageview->noticeview);
 
        mimeinfo = procmime_mimeinfo_next(mimeinfo);
-       if (mimeinfo && (mimeinfo->type != MIMETYPE_TEXT || 
-           strcasecmp(mimeinfo->subtype, "plain"))) {
+       if (!all_headers && mimeinfo 
+                       && (mimeinfo->type != MIMETYPE_TEXT || 
+           strcasecmp(mimeinfo->subtype, "plain")) 
+                       && (mimeinfo->type != MIMETYPE_MULTIPART || 
+           strcasecmp(mimeinfo->subtype, "signed"))) {
                if (strcasecmp(mimeinfo->subtype, "html"))
                        mimeview_show_part(messageview->mimeview,mimeinfo);
                else if (prefs_common.invoke_plugin_on_html)
@@ -911,6 +1071,8 @@ void messageview_reflect_prefs_pixmap_theme(void)
 
 void messageview_clear(MessageView *messageview)
 {
+       if (!messageview)
+               return;
        procmsg_msginfo_free(messageview->msginfo);
        messageview->msginfo = NULL;
        messageview->filtered = FALSE;
@@ -924,6 +1086,14 @@ void messageview_destroy(MessageView *messageview)
        debug_print("destroy messageview\n");
        messageview_list = g_list_remove(messageview_list, messageview);
 
+       if (messageview->mainwin->summaryview->messageview == messageview) {
+               messageview->mainwin->summaryview->displayed = NULL;
+               messageview->mainwin->summaryview->messageview = NULL;
+       }
+       if (messageview->mainwin->summaryview->ext_messageview == messageview) {
+               messageview->mainwin->summaryview->displayed = NULL;
+               messageview->mainwin->summaryview->ext_messageview = NULL;
+       }
        if (!messageview->deferred_destroy) {
                hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
                              messageview->msginfo_update_callback_id);
@@ -1005,7 +1175,12 @@ void messageview_delete(MessageView *msgview)
                        procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
                        /* NOTE: does not update to next message in summaryview */
                }
-       }               
+       }
+#ifdef MAEMO
+       if (msgview->window) {
+               messageview_destroy(msgview);
+       }
+#endif
 }
 
 /* 
@@ -1013,7 +1188,7 @@ void messageview_delete(MessageView *msgview)
  *        leave unchanged if summaryview is empty
  * \param pointer to MessageView
  */    
-static void messageview_update(MessageView *msgview)
+static void messageview_update(MessageView *msgview, MsgInfo *old_msginfo)
 {
        SummaryView *summaryview = (SummaryView*)msgview->mainwin->summaryview;
 
@@ -1021,7 +1196,7 @@ static void messageview_update(MessageView *msgview)
        
        if (summaryview->selected) {
                MsgInfo *msginfo = summary_get_selected_msg(summaryview);
-               if (msginfo == NULL)
+               if (msginfo == NULL || msginfo == old_msginfo)
                        return;
 
                messageview_show(msgview, msginfo, 
@@ -1053,17 +1228,13 @@ MimeInfo *messageview_get_selected_mime_part(MessageView *messageview)
 
 void messageview_copy_clipboard(MessageView *messageview)
 {
-       TextView *text;
-
-       text = messageview_get_current_textview(messageview);
+       gchar *text = messageview_get_selection(messageview);
        if (text) {
-               GtkTextView *textview = GTK_TEXT_VIEW(text->text);
-               GtkTextBuffer *buffer = gtk_text_view_get_buffer(textview);
-               GtkClipboard *clipboard
-                       = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-
-               gtk_text_buffer_copy_clipboard(buffer, clipboard);
+               gtk_clipboard_set_text(
+                       gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),
+                       text, -1);
        }
+       g_free(text);
 }
 
 void messageview_select_all(MessageView *messageview)
@@ -1096,6 +1267,13 @@ gboolean messageview_search_string(MessageView *messageview, const gchar *str,
 {
        TextView *text;
 
+       if (messageview->mimeview->type == MIMEVIEW_VIEWER) {
+               MimeViewer *viewer = messageview->mimeview->mimeviewer;
+               if (viewer && viewer->text_search) {
+                       return viewer->text_search(viewer, FALSE, str, case_sens);
+               }
+       }
+
        text = messageview_get_current_textview(messageview);
        if (text)
                return textview_search_string(text, str, case_sens);
@@ -1108,6 +1286,13 @@ gboolean messageview_search_string_backward(MessageView *messageview,
 {
        TextView *text;
 
+       if (messageview->mimeview->type == MIMEVIEW_VIEWER) {
+               MimeViewer *viewer = messageview->mimeview->mimeviewer;
+               if (viewer && viewer->text_search) {
+                       return viewer->text_search(viewer, TRUE, str, case_sens);
+               }
+       }
+
        text = messageview_get_current_textview(messageview);
        if (text)       
                return textview_search_string_backward(text,
@@ -1122,7 +1307,7 @@ gboolean messageview_is_visible(MessageView *messageview)
        return messageview->visible;
 }
 
-void messageview_save_as(MessageView *messageview)
+static void messageview_save_as(MessageView *messageview)
 {
        gchar *filename = NULL;
        MsgInfo *msginfo;
@@ -1135,7 +1320,19 @@ void messageview_save_as(MessageView *messageview)
                Xstrdup_a(filename, msginfo->subject, return);
                subst_for_filename(filename);
        }
-       dest = filesel_select_file_save(_("Save as"), filename);
+       if (filename && !g_utf8_validate(filename, -1, NULL)) {
+               gchar *oldstr = filename;
+               filename = conv_codeset_strdup(filename,
+                                              conv_get_locale_charset_str(),
+                                              CS_UTF_8);
+               if (!filename) {
+                       g_warning("messageview_save_as(): failed to convert character set.");
+                       filename = g_strdup(oldstr);
+               }
+               dest = filesel_select_file_save(_("Save as"), filename);
+               g_free(filename);
+       } else
+               dest = filesel_select_file_save(_("Save as"), filename);
        if (!dest) return;
        if (is_file_exist(dest)) {
                AlertValue aval;
@@ -1189,28 +1386,6 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
        return FALSE;
 }
 
-void messageview_toggle_view_real(MessageView *messageview)
-{
-       MainWindow *mainwin = messageview->mainwin;
-       union CompositeWin *cwin = &mainwin->win;
-       GtkWidget *vpaned = NULL;
-       GtkWidget *container = NULL;
-       
-       switch (mainwin->type) {
-       case SEPARATE_NONE:
-               vpaned = cwin->sep_none.vpaned;
-               container = cwin->sep_none.hpaned;
-               break;
-       case SEPARATE_FOLDER:
-               vpaned = cwin->sep_folder.vpaned;
-               container = mainwin->vbox_body;
-               break;
-       case SEPARATE_MESSAGE:
-       case SEPARATE_BOTH:
-               return;
-       }
-}
-
 static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
 {
        gchar *addr = NULL;
@@ -1230,10 +1405,12 @@ static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
        }
 
        if (from_me) {
+               noticeview_set_icon(noticeview, STOCK_PIXMAP_NOTICE_WARN);
                noticeview_set_text(noticeview, _("You asked for a return receipt in this message."));
                noticeview_set_button_text(noticeview, NULL);
                noticeview_set_button_press_callback(noticeview, NULL, NULL);
        } else {
+               noticeview_set_icon(noticeview, STOCK_PIXMAP_NOTICE_WARN);
                noticeview_set_text(noticeview, _("This message asks for a return receipt."));
                noticeview_set_button_text(noticeview, _("Send receipt"));
                noticeview_set_button_press_callback(noticeview,
@@ -1320,6 +1497,7 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
                }
        }
        
+       noticeview_set_icon(noticeview, STOCK_PIXMAP_NOTICE_WARN);
        noticeview_set_text(noticeview, text);
        g_free(text);
        noticeview_set_button_text(noticeview, button1);
@@ -1359,26 +1537,22 @@ static void partial_recv_unmark_clicked(NoticeView *noticeview,
 
 static void select_account_cb(GtkWidget *w, gpointer data)
 {
-       *(gint*)data = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), MENU_VAL_ID));
+       *(gint*)data = combobox_get_active_data(GTK_COMBO_BOX(w));
 }
-       
+
 static PrefsAccount *select_account_from_list(GList *ac_list)
 {
        GtkWidget *optmenu;
-       GtkWidget *menu;
        gint account_id;
 
        g_return_val_if_fail(ac_list != NULL, NULL);
        g_return_val_if_fail(ac_list->data != NULL, NULL);
        
-       optmenu = gtk_option_menu_new();
-       menu = gtkut_account_menu_new(ac_list, 
-                       G_CALLBACK(select_account_cb), 
+       optmenu = gtkut_account_menu_new(ac_list,
+                       G_CALLBACK(select_account_cb),
                        &account_id);
-       if (!menu)
+       if (!optmenu)
                return NULL;
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
-       gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), 0);
        account_id = ((PrefsAccount *) ac_list->data)->account_id;
        if (alertpanel_with_widget(
                                _("Return Receipt Notification"),
@@ -1386,8 +1560,8 @@ static PrefsAccount *select_account_from_list(GList *ac_list)
                                  "accounts.\n"
                                  "Please choose which account do you want to "
                                  "use for sending the receipt notification:"),
-                               _("_Send Notification"), _("+_Cancel"), NULL,
-                               FALSE, optmenu) != G_ALERTDEFAULT)
+                               _("_Cancel"), _("_Send Notification"), NULL,
+                               FALSE, G_ALERTDEFAULT, optmenu) != G_ALERTALTERNATE)
                return NULL;
        return account_find_from_id(account_id);
 }
@@ -1447,9 +1621,12 @@ static void save_as_cb(gpointer data, guint action, GtkWidget *widget)
        messageview_save_as(messageview);
 }
 
-#ifdef USE_GNOMEPRINT
-static void print_mimeview(MimeView *mimeview) 
+#if defined(USE_GNOMEPRINT) || GTK_CHECK_VERSION(2,10,0)
+static void print_mimeview(MimeView *mimeview, gint sel_start, gint sel_end, gint partnum
 {
+#if !defined(USE_GNOMEPRINT) && GTK_CHECK_VERSION(2,10,0)
+       MainWindow *mainwin;
+#endif
        if (!mimeview 
        ||  !mimeview->textview
        ||  !mimeview->textview->text)
@@ -1457,11 +1634,39 @@ static void print_mimeview(MimeView *mimeview)
                                     "contain text."));
        else {
                gtk_widget_realize(mimeview->textview->text);
+               if (partnum > 0) {
+                       mimeview_select_part_num(mimeview, partnum);
+               }
+               if (mimeview->type == MIMEVIEW_VIEWER) {
+                       MimeViewer *viewer = mimeview->mimeviewer;
+                       if (viewer && viewer->print) {
+                               viewer->print(viewer);
+                               return;
+                       }
+               }
+               if (sel_start != -1 && sel_end != -1) {
+                       GtkTextIter start, end;
+                       GtkTextView *text = GTK_TEXT_VIEW(mimeview->textview->text);
+                       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+
+                       gtk_text_buffer_get_iter_at_offset(buffer, &start, sel_start);
+                       gtk_text_buffer_get_iter_at_offset(buffer, &end, sel_end);
+                       gtk_text_buffer_select_range(buffer, &start, &end);
+               }
+#if defined(USE_GNOMEPRINT)
                gedit_print(GTK_TEXT_VIEW(mimeview->textview->text));
+#else
+               /* TODO: Get the real parent window, not the main window */
+               mainwin = mainwindow_get_mainwindow();
+               printing_print(GTK_TEXT_VIEW(mimeview->textview->text),
+                              mainwin ? GTK_WINDOW(mainwin->window) : NULL,
+                               sel_start, sel_end);
+#endif
        }
 }
 
-void messageview_print(MsgInfo *msginfo, gboolean all_headers) 
+void messageview_print(MsgInfo *msginfo, gboolean all_headers, 
+                       gint sel_start, gint sel_end, gint partnum) 
 {
        PangoFontDescription *font_desc = NULL;
        MessageView *tmpview = messageview_create_with_new_window_visible(
@@ -1483,24 +1688,37 @@ void messageview_print(MsgInfo *msginfo, gboolean all_headers)
        tmpview->all_headers = all_headers;
        if (msginfo && messageview_show(tmpview, msginfo, 
                tmpview->all_headers) >= 0) {
-                       print_mimeview(tmpview->mimeview);
+                       print_mimeview(tmpview->mimeview, 
+                               sel_start, sel_end, partnum);
        }
        messageview_destroy(tmpview);
 }
 #endif
 
+#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT)
+static void page_setup_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       printing_page_setup(messageview ?
+                           GTK_WINDOW(messageview->window) : NULL);
+}
+#endif
+
 static void print_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MessageView *messageview = (MessageView *)data;
-#ifndef USE_GNOMEPRINT
+#if !defined(USE_GNOMEPRINT) && !GTK_CHECK_VERSION(2,10,0)
        gchar *cmdline = NULL;
        gchar *p;
+#else
+       gint sel_start = -1, sel_end = -1, partnum = 0;
 #endif
 
        if (!messageview->msginfo) return;
-#ifndef USE_GNOMEPRINT
+
+#if !defined(USE_GNOMEPRINT) && !GTK_CHECK_VERSION(2,10,0)
        cmdline = input_dialog(_("Print"),
-                              _("Enter the print command line:\n"
+                              _("Ente the print command line:\n"
                                 "('%s' will be replaced with file name)"),
                               prefs_common.print_cmd);
        if (!cmdline) return;
@@ -1514,7 +1732,11 @@ static void print_cb(gpointer data, guint action, GtkWidget *widget)
        procmsg_print_message(messageview->msginfo, cmdline);
        g_free(cmdline);
 #else
-       messageview_print(messageview->msginfo, messageview->all_headers);
+       partnum = mimeview_get_selected_part_num(messageview->mimeview);
+       textview_get_selection_offsets(messageview->mimeview->textview,
+               &sel_start, &sel_end);
+       messageview_print(messageview->msginfo, messageview->all_headers, 
+               sel_start, sel_end, partnum);
 #endif
 }
 
@@ -1542,6 +1764,362 @@ static void search_cb(gpointer data, guint action, GtkWidget *widget)
        message_search(messageview);
 }
 
+static void prev_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       summary_step(messageview->mainwin->summaryview, GTK_SCROLL_STEP_BACKWARD);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void next_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       summary_step(messageview->mainwin->summaryview, GTK_SCROLL_STEP_FORWARD);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void prev_unread_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       summary_select_prev_unread(messageview->mainwin->summaryview);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void next_unread_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       summary_select_next_unread(messageview->mainwin->summaryview);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void prev_new_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       summary_select_prev_new(messageview->mainwin->summaryview);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void next_new_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       summary_select_next_new(messageview->mainwin->summaryview);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void prev_marked_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       summary_select_prev_marked(messageview->mainwin->summaryview);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void next_marked_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       summary_select_next_marked(messageview->mainwin->summaryview);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void prev_labeled_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       summary_select_prev_labeled(messageview->mainwin->summaryview);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void next_labeled_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       summary_select_next_labeled(messageview->mainwin->summaryview);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void last_read_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       summary_select_last_read(messageview->mainwin->summaryview);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void parent_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       summary_select_parent(messageview->mainwin->summaryview);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void goto_unread_folder_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       folderview_select_next_unread(messageview->mainwin->folderview, FALSE);
+       messageview->updating = FALSE;
+
+       if (messageview->deferred_destroy) {
+               debug_print("messageview got away!\n");
+               messageview_destroy(messageview);
+               return;
+       }
+       if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+               MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+               if (msginfo)
+                       messageview_show(messageview, msginfo, 
+                                        messageview->all_headers);
+#endif
+       } else {
+               gtk_widget_destroy(messageview->window);
+       }
+}
+
+static void goto_folder_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       FolderItem *to_folder;
+       messageview->updating = FALSE;
+
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL);
+
+       if (to_folder) {
+               folderview_select(messageview->mainwin->folderview, to_folder);
+
+               if (messageview->deferred_destroy) {
+                       debug_print("messageview got away!\n");
+                       messageview_destroy(messageview);
+                       return;
+               }
+               if (messageview->mainwin->summaryview->selected) {
+#ifndef MAEMO
+                       MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+                      
+                       if (msginfo)
+                               messageview_show(messageview, msginfo, 
+                                                messageview->all_headers);
+#endif
+               } else {
+                       gtk_widget_destroy(messageview->window);
+               }
+       }
+}
+
 static void set_charset_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MessageView *messageview = (MessageView *)data;
@@ -1587,6 +2165,13 @@ static void show_all_header_cb(gpointer data, guint action, GtkWidget *widget)
        MessageView *messageview = (MessageView *)data;
        MsgInfo *msginfo = messageview->msginfo;
 
+       if (messageview->mimeview->textview &&
+           messageview->mimeview->textview->loading) {
+               return;
+       }
+       if (messageview->updating)
+               return;
+
        messageview->all_headers = 
                        GTK_CHECK_MENU_ITEM(widget)->active;
        if (!msginfo) return;
@@ -1675,15 +2260,42 @@ static void addressbook_open_cb(gpointer data, guint action, GtkWidget *widget)
 static void add_address_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MessageView *messageview = (MessageView *)data;
-       MsgInfo *msginfo;
+       MsgInfo *msginfo, *full_msginfo;
        gchar *from;
+       GtkWidget *image = NULL;
+       GdkPixbuf *picture = NULL;
+
+       if (!messageview->msginfo || !messageview->msginfo->from) 
+               return;
 
-       if (!messageview->msginfo) return;
        msginfo = messageview->msginfo;
        Xstrdup_a(from, msginfo->from, return);
        eliminate_address_comment(from);
        extract_address(from);
-       addressbook_add_contact(msginfo->fromname, from, NULL);
+       
+       full_msginfo = procmsg_msginfo_get_full_info(msginfo);
+       if (full_msginfo &&
+           full_msginfo->extradata &&
+           full_msginfo->extradata->face) {
+               image = face_get_from_header(full_msginfo->extradata->face);
+       } 
+#if HAVE_LIBCOMPFACE
+       else if (full_msginfo &&
+                full_msginfo->extradata &&
+                full_msginfo->extradata->xface) {
+               image = xface_get_from_header(full_msginfo->extradata->xface,
+                               &messageview->mainwin->summaryview->ctree->style->white,
+                               messageview->window->window);   
+       }
+#endif
+       procmsg_msginfo_free(full_msginfo);
+       if (image)
+               picture = gtk_image_get_pixbuf(GTK_IMAGE(image));
+
+       addressbook_add_contact(msginfo->fromname, from, NULL, picture);
+
+       if (image)
+               gtk_widget_destroy(image);
 }
 
 static void create_filter_cb(gpointer data, guint action, GtkWidget *widget)
@@ -1711,6 +2323,12 @@ static void create_processing_cb(gpointer data, guint action,
                                    (PrefsFilterType)action, 1);
 }
 
+static void open_urls_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview_list_urls(messageview);
+}
+
 static void about_cb(gpointer data, guint action, GtkWidget *widget)
 {
        about_show();
@@ -1725,8 +2343,9 @@ static gboolean messageview_update_msg(gpointer source, gpointer data)
                return FALSE;
 
        if (msginfo_update->flags & MSGINFO_UPDATE_DELETED) {
+               MsgInfo *old_msginfo = messageview->msginfo;
                messageview_clear(messageview);
-               messageview_update(messageview);
+               messageview_update(messageview, old_msginfo);
        }
 
        return FALSE;
@@ -1743,12 +2362,7 @@ void messageview_set_menu_sensitive(MessageView *messageview)
        if (!messageview->menubar) return;
        ifactory = gtk_item_factory_from_widget(messageview->menubar);
        if (!ifactory) return;
-       if (messageview->mainwin->type == SEPARATE_MESSAGE) {
-               menuitem = gtk_item_factory_get_widget(ifactory, "/View/All headers");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem),
-                        messageview->mimeview->textview->show_all_headers);
-       }
+
        if (prefs_common.hide_quotes) {
                menuitem = NULL;
                if (prefs_common.hide_quotes == 1)
@@ -1772,13 +2386,13 @@ void messageview_learn (MessageView *msgview, gboolean is_spam)
                if (procmsg_spam_learner_learn(msgview->msginfo, NULL, TRUE) == 0)
                        procmsg_msginfo_set_flags(msgview->msginfo, MSG_SPAM, 0);
                else
-                       log_error(_("An error happened while learning.\n"));
+                       log_error(LOG_PROTOCOL, _("An error happened while learning.\n"));
                
        } else {
                if (procmsg_spam_learner_learn(msgview->msginfo, NULL, FALSE) == 0)
                        procmsg_msginfo_unset_flags(msgview->msginfo, MSG_SPAM, 0);
                else
-                       log_error(_("An error happened while learning.\n"));
+                       log_error(LOG_PROTOCOL, _("An error happened while learning.\n"));
        }
        if (msgview->toolbar)
                toolbar_set_learn_button
@@ -1789,3 +2403,22 @@ void messageview_learn (MessageView *msgview, gboolean is_spam)
                        (msgview->mainwin->toolbar,
                         MSG_IS_SPAM(msgview->msginfo->flags)?LEARN_HAM:LEARN_SPAM);
 }
+
+void messageview_list_urls (MessageView        *msgview)
+{
+       GSList *cur = msgview->mimeview->textview->uri_list;
+       GSList *newlist = NULL;
+       for (; cur; cur = cur->next) {
+               ClickableText *uri = (ClickableText *)cur->data;
+               if (uri->uri &&
+                   (!g_ascii_strncasecmp(uri->uri, "ftp.", 4) ||
+                    !g_ascii_strncasecmp(uri->uri, "ftp:", 4) ||
+                    !g_ascii_strncasecmp(uri->uri, "www.", 4) ||
+                    !g_ascii_strncasecmp(uri->uri, "http:", 5) ||
+                    !g_ascii_strncasecmp(uri->uri, "https:", 6)))
+                       newlist = g_slist_prepend(newlist, uri);
+       }
+       newlist = g_slist_reverse(newlist);
+       uri_opener_open(msgview, newlist);
+       g_slist_free(newlist);
+}