2008-10-09 [colin] 3.6.0cvs19
[claws.git] / src / messageview.c
index eb3295f6eeb48e915bc6a94997ff1761ff432371..603caade89cd7eb9ce9e9859490874d2984ccbfc 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws 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"
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
@@ -42,6 +37,7 @@
 #include "menu.h"
 #include "about.h"
 #include "filesel.h"
+#include "foldersel.h"
 #include "sourcewindow.h"
 #include "addressbook.h"
 #include "alertpanel.h"
 #include "hooks.h"
 #include "filtering.h"
 #include "partial_download.h"
-#include "gedit-print.h"
+#include "uri_opener.h"
 #include "inc.h"
 #include "log.h"
+#include "combobox.h"
+#include "printing.h"
+#include "quoted-printable.h"
+#include "version.h"
+#include "statusbar.h"
 
 static GList *messageview_list = NULL;
 
@@ -73,10 +74,11 @@ static gint messageview_delete_cb   (GtkWidget              *widget,
                                         MessageView            *messageview);
 static void messageview_size_allocate_cb(GtkWidget     *widget,
                                         GtkAllocation  *allocation);
+#ifndef MAEMO
 static gboolean key_pressed            (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         MessageView    *messageview);
-
+#endif
 static void return_receipt_show                (NoticeView     *noticeview, 
                                         MsgInfo        *msginfo);      
 static void return_receipt_send_clicked (NoticeView    *noticeview, 
@@ -89,246 +91,265 @@ 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,
-                                        GtkWidget      *widget);
-static void print_cb                   (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void close_cb                   (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void copy_cb                    (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void allsel_cb                  (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void search_cb                  (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-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);
-static void show_all_header_cb         (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void hide_quotes_cb             (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void compose_cb                 (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void reply_cb                   (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
+static void save_as_cb                 (GtkAction      *action,
+                                        gpointer        data);
+#if GTK_CHECK_VERSION(2,10,0)
+static void page_setup_cb              (GtkAction      *action,
+                                        gpointer        data);
+#endif
+static void print_cb                   (GtkAction      *action,
+                                        gpointer        data);
+static void close_cb                   (GtkAction      *action,
+                                        gpointer        data);
+static void copy_cb                    (GtkAction      *action,
+                                        gpointer        data);
+static void allsel_cb                  (GtkAction      *action,
+                                        gpointer        data);
+static void search_cb                  (GtkAction      *action,
+                                        gpointer        data);
+
+static void prev_cb                    (GtkAction      *action,
+                                        gpointer        data);
+static void next_cb                    (GtkAction      *action,
+                                        gpointer        data);
+static void prev_unread_cb             (GtkAction      *action,
+                                        gpointer        data);
+static void next_unread_cb             (GtkAction      *action,
+                                        gpointer        data);
+static void prev_new_cb                        (GtkAction      *action,
+                                        gpointer        data);
+static void next_new_cb                        (GtkAction      *action,
+                                        gpointer        data);
+static void prev_marked_cb             (GtkAction      *action,
+                                        gpointer        data);
+static void next_marked_cb             (GtkAction      *action,
+                                        gpointer        data);
+static void prev_labeled_cb            (GtkAction      *action,
+                                        gpointer        data);
+static void next_labeled_cb            (GtkAction      *action,
+                                        gpointer        data);
+static void last_read_cb               (GtkAction      *action,
+                                        gpointer        data);
+static void parent_cb                  (GtkAction      *action,
+                                        gpointer        data);
+static void goto_unread_folder_cb      (GtkAction      *action,
+                                        gpointer        data);
+static void goto_folder_cb             (GtkAction      *action,
+                                        gpointer        data);
+
+static void set_charset_cb             (GtkAction *action, GtkRadioAction *current, gpointer data);
+static void set_decode_cb              (GtkAction *action, GtkRadioAction *current, gpointer data);
+
+static void view_source_cb             (GtkAction      *action,
+                                        gpointer        data);
+
+static void show_all_header_cb         (GtkToggleAction        *action,
+                                        gpointer        data);
+static void msg_hide_quotes_cb         (GtkToggleAction        *action,
+                                        gpointer        data);
+
+static void compose_cb                 (GtkAction      *action,
+                                        gpointer        data);
+static void reply_cb                   (GtkAction      *action,
+                                        gpointer        data);
 
 static PrefsAccount *select_account_from_list
                                        (GList          *ac_list);
-static void addressbook_open_cb                (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void add_address_cb             (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void create_filter_cb           (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void create_processing_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 addressbook_open_cb                (GtkAction      *action,
+                                        gpointer        data);
+static void add_address_cb             (GtkAction      *action,
+                                        gpointer        data);
+static void create_filter_cb           (GtkAction      *action,
+                                        gpointer        data);
+static void create_processing_cb       (GtkAction      *action,
+                                        gpointer        data);
+static void open_urls_cb               (GtkAction      *action,
+                                        gpointer        data);
+
+static void about_cb                   (GtkAction      *action,
+                                        gpointer        data);
+static void messageview_update         (MessageView    *msgview,
+                                        MsgInfo        *old_msginfo);
 static gboolean messageview_update_msg (gpointer source, gpointer data);
 
+static void messageview_nothing_cb        (GtkAction *action, gpointer data)
+{
+
+}
+
 static GList *msgview_list = NULL;
-static GtkItemFactoryEntry msgview_entries[] =
-{
-       {N_("/_File"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_File/_Save as..."),      "<control>S", save_as_cb, 0, NULL},
-       {N_("/_File/_Print..."),        "<control>P", print_cb, 0, NULL},
-       {N_("/_File/---"),              NULL, NULL, 0, "<Separator>"},
-       {N_("/_File/_Close"),           "<control>W", close_cb, 0, NULL},
-
-       {N_("/_Edit"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_Edit/_Copy"),            "<control>C", copy_cb, 0, NULL},
-       {N_("/_Edit/Select _all"),      "<control>A", allsel_cb, 0, NULL},
-       {N_("/_Edit/---"),              NULL, NULL, 0, "<Separator>"},
-       {N_("/_Edit/_Find in current message..."),
-                                       "<control>F", search_cb, 0, NULL},
-
-       {N_("/_View"),                  NULL, NULL, 0, "<Branch>"},
-
-#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/Character _encoding"),      NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/Character _encoding/_Auto detect"),
-                                       NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/7bit ascii (US-ASC_II)"),
-        ENC_ACTION(C_US_ASCII)},
-
-       {N_("/_View/Character _encoding/Unicode (_UTF-8)"),
-        ENC_ACTION(C_UTF_8)},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/Western European (ISO-8859-_1)"),
-        ENC_ACTION(C_ISO_8859_1)},
-       {N_("/_View/Character _encoding/Western European (ISO-8859-15)"),
-        ENC_ACTION(C_ISO_8859_15)},
-       {N_("/_View/Character _encoding/Western European (Windows-1252)"),
-        ENC_ACTION(C_WINDOWS_1252)},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/Central European (ISO-8859-_2)"),
-        ENC_ACTION(C_ISO_8859_2)},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/_Baltic (ISO-8859-13)"),
-        ENC_ACTION(C_ISO_8859_13)},
-       {N_("/_View/Character _encoding/Baltic (ISO-8859-_4)"),
-        ENC_ACTION(C_ISO_8859_4)},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/Greek (ISO-8859-_7)"),
-        ENC_ACTION(C_ISO_8859_7)},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/Hebrew (ISO-8859-_8)"),
-        ENC_ACTION(C_ISO_8859_8)},
-       {N_("/_View/Character _encoding/Hebrew (Windows-1255)"),
-        ENC_ACTION(C_CP1255)},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/Arabic (ISO-8859-_6)"),
-        ENC_ACTION(C_ISO_8859_6)},
-       {N_("/_View/Character _encoding/Arabic (Windows-1256)"),
-        ENC_ACTION(C_CP1256)},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/Turkish (ISO-8859-_9)"),
-        ENC_ACTION(C_ISO_8859_9)},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/Cyrillic (ISO-8859-_5)"),
-        ENC_ACTION(C_ISO_8859_5)},
-       {N_("/_View/Character _encoding/Cyrillic (KOI8-_R)"),
-        ENC_ACTION(C_KOI8_R)},
-       {N_("/_View/Character _encoding/Cyrillic (KOI8-U)"),
-        ENC_ACTION(C_KOI8_U)},
-       {N_("/_View/Character _encoding/Cyrillic (Windows-1251)"),
-        ENC_ACTION(C_CP1251)},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/Japanese (ISO-2022-_JP)"),
-        ENC_ACTION(C_ISO_2022_JP)},
-       {N_("/_View/Character _encoding/Japanese (ISO-2022-JP-2)"),
-        ENC_ACTION(C_ISO_2022_JP_2)},
-       {N_("/_View/Character _encoding/Japanese (_EUC-JP)"),
-        ENC_ACTION(C_EUC_JP)},
-       {N_("/_View/Character _encoding/Japanese (_Shift__JIS)"),
-        ENC_ACTION(C_SHIFT_JIS)},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/Simplified Chinese (_GB2312)"),
-        ENC_ACTION(C_GB2312)},
-       {N_("/_View/Character _encoding/Simplified Chinese (GBK)"),
-        ENC_ACTION(C_GBK)},
-       {N_("/_View/Character _encoding/Traditional Chinese (_Big5)"),
-        ENC_ACTION(C_BIG5)},
-       {N_("/_View/Character _encoding/Traditional Chinese (EUC-_TW)"),
-        ENC_ACTION(C_EUC_TW)},
-       {N_("/_View/Character _encoding/Chinese (ISO-2022-_CN)"),
-        ENC_ACTION(C_ISO_2022_CN)},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/Korean (EUC-_KR)"),
-        ENC_ACTION(C_EUC_KR)},
-       {N_("/_View/Character _encoding/Korean (ISO-2022-KR)"),
-        ENC_ACTION(C_ISO_2022_KR)},
-       ENC_SEPARATOR,
-       {N_("/_View/Character _encoding/Thai (TIS-620)"),
-        ENC_ACTION(C_TIS_620)},
-       {N_("/_View/Character _encoding/Thai (Windows-874)"),
-        ENC_ACTION(C_WINDOWS_874)},
-
-#undef ENC_SEPARATOR
-#undef ENC_ACTION
-
-#define DEC_SEPARATOR \
-       {N_("/_View/Decode/---"),               NULL, NULL, 0, "<Separator>"}
-#define 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"),  "<control>U", view_source_cb, 0, NULL},
-       {N_("/_View/Show all _headers"),"<control>H", show_all_header_cb, 0, "<ToggleItem>"},
-       {N_("/_View/Quotes"),                   NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/Quotes/_Hide all"),         "<control><shift>Q", hide_quotes_cb, 1, "<ToggleItem>"},
-       {N_("/_View/Quotes/Hide from level _2"),NULL, hide_quotes_cb, 2, "<ToggleItem>"},
-       {N_("/_View/Quotes/Hide from level _3"),NULL, hide_quotes_cb, 3, "<ToggleItem>"},
-
-       {N_("/_Message"),               NULL, NULL, 0, "<Branch>"},
-       {N_("/_Message/Compose _new message"),
-                                       "<control>M", compose_cb, 0, NULL},
-       {N_("/_Message/---"),           NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/_Reply"),        "<control>R", reply_cb, COMPOSE_REPLY, NULL},
-       {N_("/_Message/Repl_y to/_all"),
-                                       "<control><shift>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
-       {N_("/_Message/Repl_y to/_sender"),
-                                       NULL, reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
-       {N_("/_Message/Repl_y to/mailing _list"),
-                                       "<control>L", reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
-       {N_("/_Message/---"),           NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/_Forward"),      "<control><alt>F", reply_cb, COMPOSE_FORWARD_INLINE, NULL},
-       {N_("/_Message/For_ward as attachment"),
-                                       NULL, reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
-       {N_("/_Message/Redirec_t"),     NULL, reply_cb, COMPOSE_REDIRECT, NULL},
-
-       {N_("/_Tools"),                 NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tools/_Address book"),   "<control><shift>A", addressbook_open_cb, 0, NULL},
-       {N_("/_Tools/Add sender to address boo_k"),
-                                       NULL, add_address_cb, 0, NULL},
-       {N_("/_Tools/---"),             NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tools/_Create filter rule"),
-                                       NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tools/_Create filter rule/_Automatically"),
-                                       NULL, create_filter_cb, FILTER_BY_AUTO, NULL},
-       {N_("/_Tools/_Create filter rule/by _From"),
-                                       NULL, create_filter_cb, FILTER_BY_FROM, NULL},
-       {N_("/_Tools/_Create filter rule/by _To"),
-                                       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"),
-                                       NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tools/Create processing rule/_Automatically"),
-                                       NULL, create_processing_cb, FILTER_BY_AUTO, NULL},
-       {N_("/_Tools/Create processing rule/by _From"),
-                                       NULL, create_processing_cb, FILTER_BY_FROM, NULL},
-       {N_("/_Tools/Create processing rule/by _To"),
-                                       NULL, create_processing_cb, FILTER_BY_TO, NULL},
-       {N_("/_Tools/Create processing rule/by _Subject"),
-                                       NULL, create_processing_cb, FILTER_BY_SUBJECT, NULL},
-       {N_("/_Tools/---"),             NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tools/Actio_ns"),        NULL, NULL, 0, "<Branch>"},
-
-       {N_("/_Help"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_About"),           NULL, about_cb, 0, NULL}
+static GtkActionEntry msgview_entries[] =
+{
+       {"Menu",                        NULL, "Menu" },
+/* menus */
+       {"File",                        NULL, N_("_File") },
+       {"Edit",                        NULL, N_("_Edit") },
+       {"View",                        NULL, N_("_View") },
+       {"Message",                     NULL, N_("_Message") },
+       {"Tools",                       NULL, N_("_Tools") },
+       {"Help",                        NULL, N_("_Help") },
+       {"PlaceHolder",                 NULL, "Placeholder", NULL, NULL, G_CALLBACK(messageview_nothing_cb) },
+
+/* File menu */
+       {"File/SaveAs",                 NULL, N_("_Save as..."), "<control>S", NULL, G_CALLBACK(save_as_cb) },
+#if GTK_CHECK_VERSION(2,10,0)
+       {"File/PageSetup",              NULL, N_("Page setup..."), NULL, NULL, G_CALLBACK(page_setup_cb) },
+#endif
+       {"File/Print",                  NULL, N_("_Print..."), "<control>P", NULL, G_CALLBACK(print_cb) },
+       {"File/---",                    NULL, "---", NULL, NULL, NULL },
+       {"File/Close",                  NULL, N_("_Close"), "<control>W", NULL, G_CALLBACK(close_cb) },
+
+/* Edit menu */
+       {"Edit/Copy",                   NULL, N_("_Copy"), "<control>C", NULL, G_CALLBACK(copy_cb) },
+       {"Edit/SelectAll",              NULL, N_("_Select all"), "<control>A", NULL, G_CALLBACK(allsel_cb) },
+       {"Edit/---",                    NULL, "---", NULL, NULL, NULL },
+       {"Edit/Find",                   NULL, N_("_Find"), "<control>F", NULL, G_CALLBACK(search_cb) },
+       
+/* View menu */
+       {"View/Goto",                   NULL, N_("_Go to") },
+       {"View/Goto/Prev",              NULL, N_("_Previous message"), "P", NULL, G_CALLBACK(prev_cb) },
+       {"View/Goto/Next",              NULL, N_("_Next message"), "N", NULL, G_CALLBACK(next_cb) },
+       {"View/Goto/---",               NULL, "---", NULL, NULL, NULL },
+       {"View/Goto/PrevUnread",        NULL, N_("P_revious unread message"), "<shift>P", NULL, G_CALLBACK(prev_unread_cb) },
+       {"View/Goto/NextUnread",        NULL, N_("N_ext unread message"), "<shift>N", NULL, G_CALLBACK(next_unread_cb) },
+       /* {"View/Goto/---",            NULL, "---", NULL, NULL, NULL }, */
+       {"View/Goto/PrevNew",           NULL, N_("Previous ne_w message"), NULL, NULL, G_CALLBACK(prev_new_cb) },
+       {"View/Goto/NextNew",           NULL, N_("Ne_xt new message"), NULL, NULL, G_CALLBACK(next_new_cb) },
+       /* {"View/Goto/---",            NULL, "---", NULL, NULL, NULL }, */
+       {"View/Goto/PrevMarked",        NULL, N_("Previous _marked message"), NULL, NULL, G_CALLBACK(prev_marked_cb) },
+       {"View/Goto/NextMarked",        NULL, N_("Next m_arked message"), NULL, NULL, G_CALLBACK(next_marked_cb) },
+       /* {"View/Goto/---",            NULL, "---", NULL, NULL, NULL }, */
+       {"View/Goto/PrevLabeled",       NULL, N_("Previous _labeled message"), NULL, NULL, G_CALLBACK(prev_labeled_cb) },
+       {"View/Goto/NextLabeled",       NULL, N_("Next la_beled message"), NULL, NULL, G_CALLBACK(next_labeled_cb) },
+       /* {"View/Goto/---",            NULL, "---", NULL, NULL, NULL }, */
+       {"View/Goto/LastRead",          NULL, N_("Last read message"), NULL, NULL, G_CALLBACK(last_read_cb) },
+       {"View/Goto/ParentMessage",     NULL, N_("Parent message"), "<control>Up", NULL, G_CALLBACK(parent_cb) },
+       /* {"View/Goto/---",            NULL, "---", NULL, NULL, NULL }, */
+       {"View/Goto/NextUnreadFolder",  NULL, N_("Next unread _folder"), "<shift>G", NULL, G_CALLBACK(goto_unread_folder_cb) },
+       {"View/Goto/OtherFolder",       NULL, N_("_Other folder..."), "G", NULL, G_CALLBACK(goto_folder_cb) },
+       /* {"View/Goto/---",            NULL, "---", NULL, NULL, NULL }, */
+
+       {"View/Encoding",               NULL, N_("Character _encoding") }, /* set_charset_cb */
+       {"View/Encoding/---",           NULL, "---" },
+#define ENC_ACTION(cs_char,c_char,string) \
+       { "View/Encoding/" cs_char, NULL, N_(string), NULL, NULL, c_char }
+
+       {"View/Encoding/Western",       NULL, N_("Western European") },
+       {"View/Encoding/Baltic",        NULL, N_("Baltic") },
+       {"View/Encoding/Hebrew",        NULL, N_("Hebrew") },
+       {"View/Encoding/Arabic",        NULL, N_("Arabic") },
+       {"View/Encoding/Cyrillic",      NULL, N_("Cyrillic") },
+       {"View/Encoding/Japanese",      NULL, N_("Japanese") },
+       {"View/Encoding/Chinese",       NULL, N_("Chinese") },
+       {"View/Encoding/Korean",        NULL, N_("Korean") },
+       {"View/Encoding/Thai",          NULL, N_("Thai") },
+
+       {"View/Decode",                 NULL, N_("Decode") }, /* set_decode_cb */
+       {"View/Decode/---",             NULL, "---" },
+
+#define DEC_ACTION(cs_type,c_type,string) \
+       { "View/Decode/" cs_type, NULL, N_(string), NULL, NULL, c_type }
+
+       {"View/---",                    NULL, "---", NULL, NULL, NULL },
+       {"View/MessageSource",          NULL, N_("Mess_age source"), "<control>U", NULL, G_CALLBACK(view_source_cb) },
+
+       {"View/Quotes",                 NULL, N_("Quotes") }, 
+
+/* Message menu */
+       {"Message/Compose",             NULL, N_("Compose _new message"), "<control>M", NULL, G_CALLBACK(compose_cb) },
+       {"Message/---",                 NULL, "---", NULL, NULL, NULL },
+
+       {"Message/Reply",               NULL, N_("_Reply"), "<control>R", NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REPLY */
+       {"Message/ReplyTo",             NULL, N_("Repl_y to") }, 
+       {"Message/ReplyTo/All",         NULL, N_("_all"), "<control><shift>R", NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REPLY_TO_ALL */
+       {"Message/ReplyTo/Sender",      NULL, N_("_sender"), NULL, NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REPLY_TO_SENDER */
+       {"Message/ReplyTo/List",        NULL, N_("mailing _list"), "<control>L", NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REPLY_TO_LIST */
+       /* {"Message/---",                      NULL, "---", NULL, NULL, NULL }, */
+
+       {"Message/Forward",             NULL, N_("_Forward"), "<control><alt>F", NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_FORWARD_INLINE */
+       {"Message/ForwardAtt",          NULL, N_("For_ward as attachment"), NULL, NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_FORWARD_AS_ATTACH */
+       {"Message/Redirect",            NULL, N_("Redirec_t"), NULL, NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REDIRECT */
+
+/* Tools menu */       
+       {"Tools/AddressBook",           NULL, N_("_Address book"), "<control><shift>A", NULL, G_CALLBACK(addressbook_open_cb) }, 
+       {"Tools/AddSenderToAB",         NULL, N_("Add sender to address boo_k"), NULL, NULL, G_CALLBACK(add_address_cb) }, 
+       {"Tools/---",                   NULL, "---", NULL, NULL, NULL },
+
+       {"Tools/CreateFilterRule",                      NULL, "_Create filter rule" },
+       {"Tools/CreateFilterRule/Automatically",        NULL, N_("_Automatically"), NULL, NULL, G_CALLBACK(create_filter_cb) }, /* FILTER_BY_AUTO */
+       {"Tools/CreateFilterRule/ByFrom",               NULL, N_("By _From"), NULL, NULL, G_CALLBACK(create_filter_cb) }, /* FILTER_BY_FROM */
+       {"Tools/CreateFilterRule/ByTo",                 NULL, N_("By _To"), NULL, NULL, G_CALLBACK(create_filter_cb) }, /* FILTER_BY_TO     */
+       {"Tools/CreateFilterRule/BySubject",            NULL, N_("By _Subject"), NULL, NULL, G_CALLBACK(create_filter_cb) }, /* FILTER_BY_SUBJECT */
+
+       {"Tools/CreateProcessingRule",                  NULL, "Create processing rule" },
+       {"Tools/CreateProcessingRule/Automatically",    NULL, N_("_Automatically"), NULL, NULL, G_CALLBACK(create_processing_cb) }, 
+       {"Tools/CreateProcessingRule/ByFrom",           NULL, N_("By _From"), NULL, NULL, G_CALLBACK(create_processing_cb) }, 
+       {"Tools/CreateProcessingRule/ByTo",             NULL, N_("By _To"), NULL, NULL, G_CALLBACK(create_processing_cb) }, 
+       {"Tools/CreateProcessingRule/BySubject",                NULL, N_("By _Subject"), NULL, NULL, G_CALLBACK(create_processing_cb) }, 
+
+       /* {"Tools/---",                        NULL, "---", NULL, NULL, NULL }, */
+
+       {"Tools/ListUrls",              NULL, N_("List _URLs..."), "<control><shift>U", NULL, G_CALLBACK(open_urls_cb) }, 
+
+       /* {"Tools/---",                        NULL, "---", NULL, NULL, NULL }, */
+       {"Tools/Actions",       NULL, N_("Actio_ns") },
+       {"Tools/Actions/PlaceHolder",   NULL, "Placeholder", NULL, NULL, G_CALLBACK(messageview_nothing_cb) },
+
+/* Help menu */
+       {"Help/About",          NULL, N_("_About"), NULL, NULL, G_CALLBACK(about_cb) }, 
+};
+
+static GtkToggleActionEntry msgview_toggle_entries[] =
+{
+       {"View/AllHeaders",             NULL, N_("Show all _headers"), "<control>H", NULL, G_CALLBACK(show_all_header_cb) }, /* toggle */
+       {"View/Quotes/FoldAll",         NULL, N_("_Fold all"), "<control><shift>Q", NULL, G_CALLBACK(msg_hide_quotes_cb) }, /* 1 toggle */
+       {"View/Quotes/Fold2",           NULL, N_("Fold from level _2"), NULL, NULL, G_CALLBACK(msg_hide_quotes_cb) }, /* 2 toggle */
+       {"View/Quotes/Fold3",           NULL, N_("Fold from level _3"), NULL, NULL, G_CALLBACK(msg_hide_quotes_cb) }, /* 3 toggle */
+};
+
+static GtkRadioActionEntry msgview_radio_enc_entries[] =
+{
+       ENC_ACTION(CS_AUTO, C_AUTO, N_("_Automatic")), /* RADIO set_charset_cb */
+       ENC_ACTION(CS_US_ASCII, C_US_ASCII, N_("7bit ASCII (US-ASC_II)")), /* RADIO set_charset_cb */
+       ENC_ACTION(CS_UTF_8, C_UTF_8, N_("Unicode (_UTF-8)")), /* RADIO set_charset_cb */
+       ENC_ACTION("Western/"CS_ISO_8859_1, C_ISO_8859_1, "ISO-8859-_1"), /* RADIO set_charset_cb */
+       ENC_ACTION("Western/"CS_ISO_8859_15, C_ISO_8859_15, "ISO-8859-15"), /* RADIO set_charset_cb */
+       ENC_ACTION("Western/"CS_WINDOWS_1252, C_WINDOWS_1252, "Windows-1252"), /* RADIO set_charset_cb */
+       ENC_ACTION(CS_ISO_8859_2, C_ISO_8859_2, N_("Central European (ISO-8859-_2)")), /* RADIO set_charset_cb */
+       ENC_ACTION("Baltic/"CS_ISO_8859_13, C_ISO_8859_13, "ISO-8859-13"), /* RADIO set_charset_cb */
+       ENC_ACTION("Baltic/"CS_ISO_8859_4, C_ISO_8859_14, "ISO-8859-_4"), /* RADIO set_charset_cb */
+       ENC_ACTION(CS_ISO_8859_7, C_ISO_8859_7, N_("Greek (ISO-8859-_7)")), /* RADIO set_charset_cb */
+       ENC_ACTION("Hebrew/"CS_ISO_8859_8, C_ISO_8859_8, "ISO-8859-_8"), /* RADIO set_charset_cb */
+       ENC_ACTION("Hebrew/"CS_WINDOWS_1255, C_WINDOWS_1255, "Windows-1255"), /* RADIO set_charset_cb */
+       ENC_ACTION("Arabic/"CS_ISO_8859_6, C_ISO_8859_6, "ISO-8859-_6"), /* RADIO set_charset_cb */
+       ENC_ACTION("Arabic/"CS_WINDOWS_1256, C_WINDOWS_1256, "Windows-1256"), /* RADIO set_charset_cb */
+       ENC_ACTION(CS_ISO_8859_9, C_ISO_8859_9, N_("Turkish (ISO-8859-_9)")), /* RADIO set_charset_cb */
+       ENC_ACTION("Cyrillic/"CS_ISO_8859_5, C_ISO_8859_5, "ISO-8859-_5"), /* RADIO set_charset_cb */
+       ENC_ACTION("Cyrillic/"CS_KOI8_R, C_KOI8_R, "KOI8-_R"), /* RADIO set_charset_cb */
+       ENC_ACTION("Cyrillic/"CS_KOI8_U, C_KOI8_U, "KOI8-_U"), /* RADIO set_charset_cb */
+       ENC_ACTION("Cyrillic/"CS_WINDOWS_1251, C_WINDOWS_1251, "Windows-1251"), /* RADIO set_charset_cb */
+       ENC_ACTION("Japanese/"CS_ISO_2022_JP, C_ISO_2022_JP, "ISO-2022-_JP"), /* RADIO set_charset_cb */
+       ENC_ACTION("Japanese/"CS_ISO_2022_JP_2, C_ISO_2022_JP_2, "ISO-2022-JP-_2"), /* RADIO set_charset_cb */
+       ENC_ACTION("Japanese/"CS_EUC_JP, C_EUC_JP, "_EUC-JP"), /* RADIO set_charset_cb */
+       ENC_ACTION("Japanese/"CS_SHIFT_JIS, C_SHIFT_JIS, "_Shift-JIS"), /* RADIO set_charset_cb */
+       ENC_ACTION("Chinese/"CS_GB2312, C_GB2312, "_GB2312"), /* RADIO set_charset_cb */
+       ENC_ACTION("Chinese/"CS_GBK, C_GBK, "GB_K"), /* RADIO set_charset_cb */
+       ENC_ACTION("Chinese/"CS_BIG5, C_BIG5, "_Big5-JP"), /* RADIO set_charset_cb */
+       ENC_ACTION("Chinese/"CS_EUC_TW, C_EUC_TW, "EUC-_TW"), /* RADIO set_charset_cb */
+       ENC_ACTION("Korean/"CS_EUC_KR, C_EUC_KR, "_EUC-KR"), /* RADIO set_charset_cb */
+       ENC_ACTION("Korean/"CS_ISO_2022_KR, C_ISO_2022_KR, "_ISO-2022-KR"), /* RADIO set_charset_cb */
+       ENC_ACTION("Thai/"CS_TIS_620, C_TIS_620, "_TIS-620-KR"), /* RADIO set_charset_cb */
+       ENC_ACTION("Thai/"CS_WINDOWS_874, C_WINDOWS_874, "_Windows-874"), /* RADIO set_charset_cb */
+};
+
+static GtkRadioActionEntry msgview_radio_dec_entries[] =
+{
+       DEC_ACTION("AutoDetect", 0, N_("_Auto detect")),        /* set_decode_cb */
+       /* --- */
+       DEC_ACTION("8bit", ENC_8BIT, "_8bit"),
+       DEC_ACTION("QP", ENC_QUOTED_PRINTABLE, "_Quoted printable"),
+       DEC_ACTION("B64", ENC_BASE64, "_Base64"),
+       DEC_ACTION("Uuencode", ENC_X_UUENCODE, "_Uuencode"),
 };
 
 MessageView *messageview_create(MainWindow *mainwin)
@@ -371,6 +392,8 @@ MessageView *messageview_create(MainWindow *mainwin)
        messageview->statusbar     = NULL;
        messageview->statusbar_cid = 0;
 
+       messageview->show_full_text= FALSE;
+
        messageview->msginfo_update_callback_id =
                hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, messageview_update_msg, (gpointer) messageview);
 
@@ -384,32 +407,212 @@ GList *messageview_get_msgview_list(void)
 
 void messageview_update_actions_menu(MessageView *msgview)
 {
-       GtkItemFactory *ifactory;
-
        /* Messages opened in a new window do not have a menu bar */
        if (msgview->menubar == NULL)
                return;
-       ifactory = gtk_item_factory_from_widget(msgview->menubar);
-       action_update_msgview_menu(ifactory, "/Tools/Actions", msgview);
+       action_update_msgview_menu(msgview->ui_manager, "/Menu/Tools/Actions", msgview);
 }
 
-void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) 
+static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) 
 {
        GtkWidget *handlebox;
        GtkWidget *vbox;
        GtkWidget *menubar;
-       GtkWidget *statusbar;
-       guint n_menu_entries;
+#ifndef GENERIC_UMPC
+       GtkWidget *statusbar = NULL;
+#endif
+       GtkActionGroup *action_group;
+
 
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_widget_show(vbox);
        gtk_container_add(GTK_CONTAINER(window), vbox); 
 
-       n_menu_entries = sizeof(msgview_entries) / sizeof(msgview_entries[0]);
-       menubar = menubar_create(window, msgview_entries,
-                                n_menu_entries, "<MessageView>", msgview);
-       gtk_widget_show(menubar);
+       msgview->ui_manager = gtk_ui_manager_new();
+       action_group = cm_menu_create_action_group_full(msgview->ui_manager,"Menu", msgview_entries,
+                       G_N_ELEMENTS(msgview_entries), (gpointer)msgview);
+       gtk_action_group_add_toggle_actions(action_group, msgview_toggle_entries,
+                       G_N_ELEMENTS(msgview_toggle_entries), (gpointer)msgview);
+       gtk_action_group_add_radio_actions(action_group, msgview_radio_enc_entries,
+                       G_N_ELEMENTS(msgview_radio_enc_entries), C_AUTO, G_CALLBACK(set_charset_cb), (gpointer)msgview);
+       gtk_action_group_add_radio_actions(action_group, msgview_radio_dec_entries,
+                       G_N_ELEMENTS(msgview_radio_dec_entries), C_AUTO, G_CALLBACK(set_decode_cb), (gpointer)msgview);
+
+#ifndef MAEMO
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
+#else
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
+#endif
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "File", "File", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "View", "View", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "Message", "Message", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "Tools", "Tools", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "Help", "Help", GTK_UI_MANAGER_MENU)
+
+/* File menu */
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "SaveAs", "File/SaveAs", GTK_UI_MANAGER_MENUITEM)
+#if GTK_CHECK_VERSION(2,10,0)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "PageSetup", "File/PageSetup", GTK_UI_MANAGER_MENUITEM)
+#endif
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "Print", "File/Print", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "Separator1", "File/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "Close", "File/Close", GTK_UI_MANAGER_MENUITEM)
+
+/* Edit menu */
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Edit", "Copy", "Edit/Copy", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Edit", "SelectAll", "Edit/SelectAll", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Edit", "Separator1", "Edit/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Edit", "Find", "Edit/Find", GTK_UI_MANAGER_MENUITEM)
+
+/* View menu */
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Goto", "View/Goto", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Prev", "View/Goto/Prev", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Next", "View/Goto/Next", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator1", "View/Goto/---", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevUnread", "View/Goto/PrevUnread", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextUnread", "View/Goto/NextUnread", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator2", "View/Goto/---", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevNew", "View/Goto/PrevNew", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextNew", "View/Goto/NextNew", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator3", "View/Goto/---", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevMarked", "View/Goto/PrevMarked", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextMarked", "View/Goto/NextMarked", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator4", "View/Goto/---", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevLabeled", "View/Goto/PrevLabeled", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextLabeled", "View/Goto/NextLabeled", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator5", "View/Goto/---", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "LastRead", "View/Goto/LastRead", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "ParentMessage", "View/Goto/ParentMessage", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator6", "View/Goto/---", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextUnreadFolder", "View/Goto/NextUnreadFolder", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "OtherFolder", "View/Goto/OtherFolder", GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Separator1", "View/---", GTK_UI_MANAGER_SEPARATOR)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Encoding", "View/Encoding", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", CS_AUTO, "View/Encoding/"CS_AUTO, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Separator1", "View/Encoding/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", CS_US_ASCII, "View/Encoding/"CS_US_ASCII, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", CS_UTF_8, "View/Encoding/"CS_UTF_8, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Separator2", "View/Encoding/---", GTK_UI_MANAGER_SEPARATOR)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Western", "View/Encoding/Western", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Western", CS_ISO_8859_1, "View/Encoding/Western/"CS_ISO_8859_1, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Western", CS_ISO_8859_15, "View/Encoding/Western/"CS_ISO_8859_15, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Western", CS_WINDOWS_1252, "View/Encoding/Western/"CS_WINDOWS_1252, GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", CS_ISO_8859_2, "View/Encoding/"CS_ISO_8859_2, GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Baltic", "View/Encoding/Baltic", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Baltic", CS_ISO_8859_13, "View/Encoding/Baltic/"CS_ISO_8859_13, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Baltic", CS_ISO_8859_4, "View/Encoding/Baltic/"CS_ISO_8859_4, GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", CS_ISO_8859_7, "View/Encoding/"CS_ISO_8859_7, GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Hebrew", "View/Encoding/Hebrew", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Hebrew", CS_ISO_8859_8, "View/Encoding/Hebrew/"CS_ISO_8859_8, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Hebrew", CS_WINDOWS_1255, "View/Encoding/Hebrew/"CS_WINDOWS_1255, GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Arabic", "View/Encoding/Arabic", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Arabic", CS_ISO_8859_6, "View/Encoding/Arabic/"CS_ISO_8859_6, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Arabic", CS_WINDOWS_1256, "View/Encoding/Arabic/"CS_WINDOWS_1256, GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", CS_ISO_8859_9, "View/Encoding/"CS_ISO_8859_9, GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Cyrillic", "View/Encoding/Cyrillic", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_ISO_8859_5, "View/Encoding/Cyrillic/"CS_ISO_8859_5, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_KOI8_R, "View/Encoding/Cyrillic/"CS_KOI8_R, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_KOI8_U, "View/Encoding/Cyrillic/"CS_KOI8_U, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_WINDOWS_1251, "View/Encoding/Cyrillic/"CS_WINDOWS_1251, GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Japanese", "View/Encoding/Japanese", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Japanese", CS_ISO_2022_JP, "View/Encoding/Japanese/"CS_ISO_2022_JP, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Japanese", CS_ISO_2022_JP_2, "View/Encoding/Japanese/"CS_ISO_2022_JP_2, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Japanese", CS_EUC_JP, "View/Encoding/Japanese/"CS_EUC_JP, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Japanese", CS_SHIFT_JIS, "View/Encoding/Japanese/"CS_SHIFT_JIS, GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Chinese", "View/Encoding/Chinese", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Chinese", CS_GB2312, "View/Encoding/Chinese/"CS_GB2312, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Chinese", CS_GBK, "View/Encoding/Chinese/"CS_GBK, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Chinese", CS_BIG5, "View/Encoding/Chinese/"CS_BIG5, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Chinese", CS_EUC_TW, "View/Encoding/Chinese/"CS_EUC_TW, GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Korean", "View/Encoding/Korean", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Korean", CS_EUC_KR, "View/Encoding/Korean/"CS_EUC_KR, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Korean", CS_ISO_2022_KR, "View/Encoding/Korean/"CS_ISO_2022_KR, GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Thai", "View/Encoding/Thai", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Thai", CS_TIS_620, "View/Encoding/Thai/"CS_TIS_620, GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Thai", CS_WINDOWS_874, "View/Encoding/Thai/"CS_WINDOWS_874, GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Decode", "View/Decode", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Decode", "AutoDetect", "View/Decode/AutoDetect", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Decode", "Separator1", "View/Decode/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Decode", "8bit", "View/Decode/8bit", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Decode", "QP", "View/Decode/QP", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Decode", "B64", "View/Decode/B64", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Decode", "Uuencode", "View/Decode/Uuencode", GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Separator2", "View/---", GTK_UI_MANAGER_SEPARATOR)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "MessageSource", "View/MessageSource", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "AllHeaders", "View/AllHeaders", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Quotes", "View/Quotes", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "FoldAll", "View/Quotes/FoldAll", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "Fold2", "View/Quotes/Fold2", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "Fold3", "View/Quotes/Fold3", GTK_UI_MANAGER_MENUITEM)
+
+/* Message menu */
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Compose", "Message/Compose", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Separator1", "Message/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Reply", "Message/Reply", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "ReplyTo", "Message/ReplyTo", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message/ReplyTo", "All", "Message/ReplyTo/All", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message/ReplyTo", "Sender", "Message/ReplyTo/Sender", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message/ReplyTo", "List", "Message/ReplyTo/List", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Separator2", "Message/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Forward", "Message/Forward", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "ForwardAtt", "Message/ForwardAtt", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Redirect", "Message/Redirect", GTK_UI_MANAGER_MENUITEM)
+
+/* Tools menu */
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "AddressBook", "Tools/AddressBook", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "AddSenderToAB", "Tools/AddSenderToAB", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "Separator1", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "CreateFilterRule", "Tools/CreateFilterRule", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateFilterRule", "Automatically", "Tools/CreateFilterRule/Automatically", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateFilterRule", "ByFrom", "Tools/CreateFilterRule/ByFrom", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateFilterRule", "ByTo", "Tools/CreateFilterRule/ByTo", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateFilterRule", "BySubject", "Tools/CreateFilterRule/BySubject", GTK_UI_MANAGER_MENUITEM)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "CreateProcessingRule", "Tools/CreateProcessingRule", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateProcessingRule", "Automatically", "Tools/CreateProcessingRule/Automatically", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateProcessingRule", "ByFrom", "Tools/CreateProcessingRule/ByFrom", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateProcessingRule", "ByTo", "Tools/CreateProcessingRule/ByTo", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateProcessingRule", "BySubject", "Tools/CreateProcessingRule/BySubject", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "Separator2", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
+       
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "ListUrls", "Tools/ListUrls", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "Separator3", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
+
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "Actions", "Tools/Actions", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/Actions", "PlaceHolder", "Tools/Actions/PlaceHolder", GTK_UI_MANAGER_MENUITEM)
+
+/* Help menu */
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Help", "About", "Help/About", GTK_UI_MANAGER_MENUITEM)
+
+       menubar = gtk_ui_manager_get_widget(msgview->ui_manager, "/Menu");
+       gtk_widget_show_all(menubar);
+       gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(msgview->ui_manager));
+
+#ifndef MAEMO
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+#else
+       hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar));
+#endif
 
        if (prefs_common.toolbar_detachable) {
                handlebox = gtk_handle_box_new();
@@ -418,15 +621,27 @@ 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);
-
+#ifndef GENERIC_UMPC
        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");
+#else
+       msgview->statusbar = NULL;
+       msgview->statusbar_cid = 0;
+#endif
+#endif
+
 
        msgview->handlebox = handlebox;
        msgview->menubar   = menubar;
@@ -439,14 +654,14 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        msgview_list = g_list_append(msgview_list, msgview);
 }
 
-MessageView *messageview_create_with_new_window(MainWindow *mainwin)
+static MessageView *messageview_create_with_new_window_visible(MainWindow *mainwin, gboolean show)
 {
        MessageView *msgview;
        GtkWidget *window;
        static GdkGeometry geometry;
 
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_title(GTK_WINDOW(window), _("Sylpheed-Claws - Message View"));
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "messageview");
+       gtk_window_set_title(GTK_WINDOW(window), _("Claws Mail - Message View"));
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 
        if (!geometry.min_height) {
@@ -466,13 +681,20 @@ MessageView *messageview_create_with_new_window(MainWindow *mainwin)
                         msgview);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(messageview_delete_cb), msgview);
+#ifdef MAEMO
+       maemo_connect_key_press_to_mainwindow(GTK_WINDOW(window));
+#else
        g_signal_connect(G_OBJECT(window), "key_press_event",
                         G_CALLBACK(key_pressed), msgview);
-
+#endif
        messageview_add_toolbar(msgview, window);
 
-       gtk_widget_grab_focus(msgview->mimeview->textview->text);
-       gtk_widget_show(window);
+       if (show) {
+               gtk_widget_grab_focus(msgview->mimeview->textview->text);
+               gtk_widget_show(window);
+       } else {
+               gtk_widget_realize(window);
+       }
 
        msgview->new_window = TRUE;
        msgview->window = window;
@@ -485,6 +707,10 @@ MessageView *messageview_create_with_new_window(MainWindow *mainwin)
        return msgview;
 }
 
+MessageView *messageview_create_with_new_window(MainWindow *mainwin)
+{
+       return messageview_create_with_new_window_visible(mainwin, TRUE);
+}
 void messageview_init(MessageView *messageview)
 {
        headerview_init(messageview->headerview);
@@ -532,15 +758,23 @@ static gint disposition_notification_send(MsgInfo *msginfo)
         gchar *addr;
         gchar *addrp;
        gchar *foo = NULL;
-       if ((!msginfo->returnreceiptto) && 
-           (!msginfo->dispositionnotificationto)) 
+       gboolean queued_removed = FALSE;
+       gchar *boundary = NULL;
+       gchar *date = NULL;
+       gchar *orig_to = NULL;
+       gchar *enc_sub = NULL;
+
+       if (!msginfo->extradata)
+               return -1;
+       if (!msginfo->extradata->returnreceiptto && 
+           !msginfo->extradata->dispositionnotificationto) 
                return -1;
 
        /* RFC2298: Test for Return-Path */
-       if (msginfo->dispositionnotificationto)
-               to = msginfo->dispositionnotificationto;
+       if (msginfo->extradata->dispositionnotificationto)
+               to = msginfo->extradata->dispositionnotificationto;
        else
-               to = msginfo->returnreceiptto;
+               to = msginfo->extradata->returnreceiptto;
 
        ok = procheader_get_header_from_msginfo(msginfo, buf, sizeof(buf),
                                "Return-Path:");
@@ -558,7 +792,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"
@@ -606,8 +840,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");
@@ -626,24 +860,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);
+               claws_unlink(tmp);
+               return -1;
+       }
+
        g_free(addrp);
        
        /* check whether we need to save the message */
@@ -652,39 +891,160 @@ 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);
+                       claws_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);
+               claws_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);
+               claws_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);
+                       claws_unlink(tmp);
+                       return -1;
+               }
        } else
-               fprintf(fp, "From: %s\n", account->address);
+               if (fprintf(fp, "From: %s\n", account->address) < 0) {
+                       fclose(fp);
+                       claws_unlink(tmp);
+                       return -1;
+               }
+
 
-       fprintf(fp, "To: %s\n", to);
+       if (fprintf(fp, "To: %s\n", to) < 0) {
+               fclose(fp);
+               claws_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);
+               claws_unlink(tmp);
+               return -1;
+       }
 
        /* Message ID */
-       generate_msgid(buf, sizeof(buf));
-       fprintf(fp, "Message-ID: <%s>\n", buf);
+       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", "");
+       }
+       
+       if (account->gen_msgid) {
+               generate_msgid(buf, sizeof(buf));
+
+               if (fprintf(fp, "Message-ID: <%s>\n", buf) < 0) {
+                       fclose(fp);
+                       claws_unlink(tmp);
+                       return -1;
+               }
+       }
+
+       boundary = generate_mime_boundary("DN");
+       get_rfc822_date(buf, sizeof(buf));
+       date = g_strdup(buf);
+       if (msginfo->to) {
+               orig_to = g_strdup(msginfo->to);
+               extract_address(orig_to);
+       }
+       if (msginfo->subject && *(msginfo->subject)) {
+               enc_sub = g_malloc0(strlen(msginfo->subject)*8);
+               qp_encode_line(enc_sub, (const guchar *)msginfo->subject);
+               g_strstrip(enc_sub);
+       }
+       if (fprintf(fp, "MIME-Version: 1.0\n"
+                       "Content-Type: multipart/report; report-type=disposition-notification;\n"
+                       "  boundary=\"%s\"\n"
+                       "\n"
+                       "--%s\n"
+                       "Content-Type: text/plain; charset=UTF-8\n"
+                       "Content-Transfer-Encoding: quoted-printable\n"
+                       "\n"
+                       "The message sent on: %s\n"
+                       "To: %s\n"
+                       "With subject: \"%s\"\n"
+                       "has been displayed at %s.\n"
+                       "\n"
+                       "There is no guarantee that the message has been read or understood.\n"
+                       "\n"
+                       "--%s\n"
+                       "Content-Type: message/disposition-notification\n"
+                       "\n"
+                       "Reporting-UA: %s\n"
+                       "Original-Recipient: rfc822;%s\n"
+                       "Final-Recipient: rfc822;%s\n"
+                       "Original-Message-ID: <%s>\n"
+                       "Disposition: manual-action/MDN-sent-manually; displayed\n"
+                       "\n"
+                       "--%s\n"
+                       "Content-Type: application/octet-stream\n"
+                       "Reporting-UA: %s\n"
+                       "Original-Recipient: rfc822;%s\n"
+                       "Final-Recipient: rfc822;%s\n"
+                       "Original-Message-ID: <%s>\n"
+                       "Disposition: manual-action/MDN-sent-manually; displayed\n"
+                       "\n"
+                       "--%s--\n", 
+                       boundary, 
+                       boundary,
+                       msginfo->date, 
+                       orig_to?orig_to:"No To:",
+                       enc_sub?enc_sub:"No subject",
+                       date,
+                       boundary,
+                       PROG_VERSION,
+                       orig_to?orig_to:"No To:",
+                       account->address,
+                       msginfo->msgid?msginfo->msgid:"NO MESSAGE ID",
+                       boundary,
+                       PROG_VERSION,
+                       orig_to?orig_to:"No To:",
+                       account->address,
+                       msginfo->msgid?msginfo->msgid:"NO MESSAGE ID",
+                       boundary) < 0) {
+               fclose(fp);
+               claws_unlink(tmp);
+               g_free(boundary);
+               return -1;
+       }
+
+       g_free(enc_sub);
+       g_free(orig_to);
+       g_free(date);
+       g_free(boundary);
 
        if (fclose(fp) == EOF) {
                FILE_OP_ERROR(tmp, "fclose");
-               g_unlink(tmp);
+               claws_unlink(tmp);
                return -1;
        }
 
@@ -693,37 +1053,33 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        if (!queue) queue = folder_get_default_queue();
        if (!queue) {
                g_warning("can't find queue folder\n");
-               g_unlink(tmp);
+               claws_unlink(tmp);
                return -1;
        }
        folder_item_scan(queue);
        if ((num = folder_item_add_msg(queue, tmp, NULL, TRUE)) < 0) {
                g_warning("can't queue the message\n");
-               g_unlink(tmp);
+               claws_unlink(tmp);
                return -1;
        }
                
        if (prefs_common.work_offline && 
-           !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+           !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);
+       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;
@@ -755,6 +1111,15 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        gchar *subject = NULL;
        g_return_val_if_fail(msginfo != NULL, -1);
 
+       if (msginfo != messageview->msginfo)
+               messageview->show_full_text = FALSE;
+
+       if (messageview->mimeview->textview &&
+           messageview->mimeview->textview->loading) {
+               messageview->mimeview->textview->stop_loading = TRUE;
+               return 0;
+       }
+
        if (messageview->toolbar)
                toolbar_set_learn_button
                        (messageview->toolbar,
@@ -765,20 +1130,49 @@ 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)
+               if (messageview->toolbar->learn_spam_btn) {
+                       gboolean can_learn = FALSE;
+                       if (procmsg_spam_can_learn() &&
+                           (msginfo->folder &&
+                            msginfo->folder->folder->klass->type != F_UNKNOWN &&
+                            msginfo->folder->folder->klass->type != F_NEWS))
+                               can_learn = TRUE;
+
                        gtk_widget_set_sensitive(
                                messageview->toolbar->learn_spam_btn, 
-                               procmsg_spam_can_learn());
+                               can_learn);
+               }
        }
+       
+       noticeview_hide(messageview->noticeview);
+       mimeview_clear(messageview->mimeview);
        messageview->updating = TRUE;
-       mimeinfo = procmime_scan_message(msginfo);
+
+       if (msginfo->size > 1024*1024)
+               statuswindow_print_all(_("Fetching message (%s)..."),
+                       to_human_readable(msginfo->size));
+       
+       file = procmsg_get_message_file_path(msginfo);
+
+       if (msginfo->size > 1024*1024)
+               statuswindow_pop_all();
+
+       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;
        }
@@ -796,40 +1190,41 @@ 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 = procmsg_msginfo_get_full_info(msginfo);
+               messageview->msginfo = NULL;
+               messageview_set_menu_sensitive(messageview);
+               messageview->msginfo = 
+                       procmsg_msginfo_get_full_info_from_file(msginfo, file);
                if (!messageview->msginfo)
                        messageview->msginfo = procmsg_msginfo_copy(msginfo);
+       } else {
+               messageview->msginfo = NULL;
+               messageview_set_menu_sensitive(messageview);
+               messageview->msginfo = msginfo;
        }
        headerview_show(messageview->headerview, messageview->msginfo);
 
+       messageview_set_position(messageview, 0);
+
        textview_set_all_headers(messageview->mimeview->textview, 
                        messageview->all_headers);
 
+#ifdef MAEMO
+       maemo_window_full_screen_if_needed(GTK_WINDOW(messageview->window));
+#endif
+       if (messageview->window) {
+               gtk_window_set_title(GTK_WINDOW(messageview->window), 
+                               _("Claws Mail - Message View"));
+               GTK_EVENTS_FLUSH();
+       }
        mimeview_show_message(messageview->mimeview, mimeinfo, file);
        
-       if (messageview->window)
-               gtk_window_set_title(GTK_WINDOW(messageview->window), 
-                               _("Sylpheed-Claws - Message View"));
+#ifndef GENERIC_UMPC
+       messageview_set_position(messageview, 0);
+#endif
+
        if (messageview->window && msginfo->subject) {
                subject = g_strdup(msginfo->subject);
                if (!g_utf8_validate(subject, -1, NULL)) {
@@ -844,31 +1239,108 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                g_free(subject);
        }
 
-       messageview_set_position(messageview, 0);
+       if (msginfo && msginfo->folder) {
+               msginfo->folder->last_seen = msginfo->msgnum;   
+       }
 
        main_create_mailing_list_menu(messageview->mainwin, messageview->msginfo);
 
-       if (messageview->msginfo->partial_recv)
+       if (messageview->msginfo && messageview->msginfo->extradata
+           && messageview->msginfo->extradata->partial_recv
+           && !noticeview_is_visible(messageview->noticeview))
                partial_recv_show(messageview->noticeview, 
                                  messageview->msginfo);
-       else if ((messageview->msginfo->dispositionnotificationto || 
-            messageview->msginfo->returnreceiptto) &&
+       else if (messageview->msginfo && messageview->msginfo->extradata &&
+           (messageview->msginfo->extradata->dispositionnotificationto || 
+            messageview->msginfo->extradata->returnreceiptto) &&
            !MSG_IS_RETRCPT_SENT(messageview->msginfo->flags) &&
-           !prefs_common.never_send_retrcpt)
+           !prefs_common.never_send_retrcpt &&
+           !noticeview_is_visible(messageview->noticeview))
                return_receipt_show(messageview->noticeview, 
                                    messageview->msginfo);
-       else 
-               noticeview_hide(messageview->noticeview);
 
        mimeinfo = procmime_mimeinfo_next(mimeinfo);
-       if (mimeinfo && (mimeinfo->type != MIMETYPE_TEXT || 
-           strcmp(mimeinfo->subtype, "plain"))) {
-               if (strcmp(mimeinfo->subtype, "html"))
-                       mimeview_show_part(messageview->mimeview,mimeinfo);
-               else if (prefs_common.invoke_plugin_on_html)
+       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")) {
+                       MimeInfo *saved_mimeinfo = mimeinfo;
+                       MimeInfo *alt_parent = mimeinfo;
+
+                       /* if multipart/{related,mixed} part, look inside for a multipart/alternative child */
+                       if (prefs_common.promote_html_part &&
+                           mimeinfo->type == MIMETYPE_MULTIPART &&
+                           (!strcasecmp(mimeinfo->subtype, "related") ||
+                            !strcasecmp(mimeinfo->subtype, "mixed"))) {
+                               for (; mimeinfo; mimeinfo = procmime_mimeinfo_next(mimeinfo)) {
+                                       if (mimeinfo->node->parent != saved_mimeinfo->node) {
+                                               /* only consider children of the 
+                                                * multipart/{related,mixed} part */
+                                               continue;
+                                       }
+                                       if (mimeinfo->type == MIMETYPE_MULTIPART && 
+                                           !strcasecmp(mimeinfo->subtype, "alternative")) {
+                                               /* we got an alternative part */
+                                               alt_parent = mimeinfo;
+                                               break;
+                                       }
+                                       if (mimeinfo->type == MIMETYPE_TEXT && 
+                                           !strcasecmp(mimeinfo->subtype, "html")) {
+                                               /* we got it */
+                                               mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
+                                               goto done;
+                                       }
+                               }
+                       }
+
+                       /* if we now have a multipart/alternative part (possibly inside a
+                        * multipart/{related,mixed} part, look for an HTML part inside */
+                       if (prefs_common.promote_html_part && mimeinfo && 
+                           mimeinfo->type == MIMETYPE_MULTIPART &&
+                           !strcasecmp(mimeinfo->subtype, "alternative")) {
+                               for (; mimeinfo; mimeinfo = procmime_mimeinfo_next(mimeinfo)) {
+                                       if (mimeinfo->node->parent != alt_parent->node) {
+                                               /* only consider children of the 
+                                                * multipart/alternative part, so as
+                                                * not to show html attachments */
+                                               continue;
+                                       }
+                                       if (mimeinfo->type == MIMETYPE_TEXT && 
+                                           !strcasecmp(mimeinfo->subtype, "html")) {
+                                               /* we got it */
+                                               mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
+                                               goto done;
+                                       }
+                               }
+                       }
+                       
+                       /* if we didn't find anything, go back to start */
+                       if (!mimeinfo) 
+                               mimeinfo = saved_mimeinfo;
+
                        mimeview_show_part(messageview->mimeview,mimeinfo);
+                       goto done;
+               } else if (prefs_common.invoke_plugin_on_html) {
+                       mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
+                       goto done;
+               }
        }
-
+       if (!all_headers && mimeinfo &&
+           mimeinfo->type == MIMETYPE_MULTIPART &&
+           mimeview_has_viewer_for_content_type(messageview->mimeview, "text/calendar")) {
+               /* look for a calendar part or it looks really strange */
+               while (mimeinfo) {
+                       if (mimeinfo->type == MIMETYPE_TEXT &&
+                           !strcasecmp(mimeinfo->subtype, "calendar")) {
+                               mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
+                               goto done;
+                       }
+                       mimeinfo = procmime_mimeinfo_next(mimeinfo);
+               }
+       }
+done:
        g_free(file);
 
        return 0;
@@ -888,6 +1360,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;
@@ -901,17 +1375,34 @@ 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);
        }
 
        if (messageview->updating) {
-               debug_print("uh oh, better not touch that now\n");
+               debug_print("uh oh, better not touch that now (fetching)\n");
                messageview->deferred_destroy = TRUE;
                gtk_widget_hide(messageview->window);
                return;
        }
+       
+       if (messageview->mimeview->textview
+       &&  messageview->mimeview->textview->loading) {
+               debug_print("uh oh, better not touch that now (loading text)\n");
+               messageview->deferred_destroy = TRUE;
+               messageview->mimeview->textview->stop_loading = TRUE;
+               gtk_widget_hide(messageview->window);
+               return;
+       }
 
        headerview_destroy(messageview->headerview);
        mimeview_destroy(messageview->mimeview);
@@ -973,7 +1464,12 @@ void messageview_delete(MessageView *msgview)
                        procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
                        /* NOTE: does not update to next message in summaryview */
                }
-       }               
+       }
+#ifdef GENERIC_UMPC
+       if (msgview->window && !prefs_common.always_show_msg) {
+               messageview_destroy(msgview);
+       }
+#endif
 }
 
 /* 
@@ -981,17 +1477,15 @@ 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;
 
        g_return_if_fail(summaryview != NULL);
        
        if (summaryview->selected) {
-               GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-               MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, 
-                                                     summaryview->selected);
-               if (msginfo == NULL)
+               MsgInfo *msginfo = summary_get_selected_msg(summaryview);
+               if (msginfo == NULL || msginfo == old_msginfo)
                        return;
 
                messageview_show(msgview, msginfo, 
@@ -999,14 +1493,6 @@ static void messageview_update(MessageView *msgview)
        } 
 }
 
-void messageview_quote_color_set(void)
-{
-}
-
-void messageview_set_font(MessageView *messageview)
-{
-}
-
 TextView *messageview_get_current_textview(MessageView *messageview)
 {
        TextView *text = NULL;
@@ -1023,17 +1509,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)
@@ -1066,6 +1548,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);
@@ -1078,6 +1567,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,
@@ -1092,7 +1588,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;
@@ -1105,7 +1601,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;
@@ -1119,7 +1627,7 @@ void messageview_save_as(MessageView *messageview)
        src = procmsg_get_message_file(msginfo);
        if (copy_file(src, dest, TRUE) < 0) {
                tmp =  g_path_get_basename(dest);
-               alertpanel_error(_("Can't save the file '%s'."), tmp);
+               alertpanel_error(_("Couldn't save the file '%s'."), tmp);
                g_free(tmp);
        }
        g_free(dest);
@@ -1141,7 +1649,7 @@ static void messageview_size_allocate_cb(GtkWidget *widget,
        prefs_common.msgwin_width  = allocation->width;
        prefs_common.msgwin_height = allocation->height;
 }
-
+#ifndef MAEMO
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                        MessageView *messageview)
 {
@@ -1150,7 +1658,7 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                return TRUE;
        }
 
-       if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0)
+       if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK|GDK_SHIFT_MASK)) != 0)
                return FALSE;
 
        g_signal_stop_emission_by_name(G_OBJECT(widget),
@@ -1158,55 +1666,70 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
        mimeview_pass_key_press_event(messageview->mimeview, event);
        return FALSE;
 }
+#endif
 
-void messageview_toggle_view_real(MessageView *messageview)
+static void messageview_show_partial_display_cb(NoticeView *noticeview, MessageView *messageview)
 {
-       MainWindow *mainwin = messageview->mainwin;
-       union CompositeWin *cwin = &mainwin->win;
-       GtkWidget *vpaned = NULL;
-       GtkWidget *container = NULL;
-       GtkItemFactory *ifactory = gtk_item_factory_from_widget(mainwin->menubar);
-       
-       switch (mainwin->type) {
-       case SEPARATE_NONE:
-               vpaned = cwin->sep_none.vpaned;
-               container = cwin->sep_none.hpaned;
-               break;
-       case SEPARATE_FOLDER:
-               vpaned = cwin->sep_folder.vpaned;
-               container = mainwin->vbox_body;
-               break;
-       case SEPARATE_MESSAGE:
-       case SEPARATE_BOTH:
-               return;
-       }
+       messageview->show_full_text = TRUE;
+       main_window_cursor_wait(mainwindow_get_mainwindow());
+       noticeview_hide(messageview->noticeview);
+       messageview->partial_display_shown = FALSE;
+       GTK_EVENTS_FLUSH();
+       mimeview_handle_cmd(messageview->mimeview, "sc://display_as_text", NULL, NULL);
+       main_window_cursor_normal(mainwindow_get_mainwindow());
+}
 
-       if (vpaned->parent != NULL) {
-               gtk_widget_ref(vpaned);
-               gtkut_container_remove(GTK_CONTAINER(container), vpaned);
-               gtk_widget_reparent(GTK_WIDGET_PTR(messageview), container);
-               menu_set_sensitive(ifactory, "/View/Expand Summary View", FALSE);
-       } else {
-               gtk_widget_reparent(GTK_WIDGET_PTR(messageview), vpaned);
-               gtk_container_add(GTK_CONTAINER(container), vpaned);
-               gtk_widget_unref(vpaned);
-               menu_set_sensitive(ifactory, "/View/Expand Summary View", TRUE);
-               gtk_widget_grab_focus(GTK_WIDGET(mainwin->summaryview->ctree));
-       }
+void messageview_show_partial_display(MessageView *messageview, MsgInfo *msginfo,
+                                            size_t length)
+{
+       gchar *msg = g_strdup_printf(_("Show all %s."), to_human_readable((goffset)length));
+       noticeview_set_icon(messageview->noticeview, STOCK_PIXMAP_NOTICE_WARN);
+       noticeview_set_text(messageview->noticeview, _("Only the first megabyte of text is shown."));
+       noticeview_set_button_text(messageview->noticeview, msg);
+       g_free(msg);
+       noticeview_set_button_press_callback(messageview->noticeview,
+                                            G_CALLBACK(messageview_show_partial_display_cb),
+                                            (gpointer) messageview);
+       noticeview_show(messageview->noticeview);
+       messageview->partial_display_shown = TRUE;
 }
 
 static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
 {
+       gchar *addr = NULL;
+       gboolean from_me = FALSE;
        if (msginfo->folder 
                && (folder_has_parent_of_type(msginfo->folder, F_QUEUE)
                 || folder_has_parent_of_type(msginfo->folder, F_DRAFT)))
                return;
 
-       noticeview_set_text(noticeview, _("This message asks for a return receipt."));
-       noticeview_set_button_text(noticeview, _("Send receipt"));
-       noticeview_set_button_press_callback(noticeview,
-                                            G_CALLBACK(return_receipt_send_clicked),
-                                            (gpointer) msginfo);
+       addr = g_strdup(msginfo->from);
+       if (addr) {
+               extract_address(addr);
+               if (account_find_from_address(addr, FALSE)) {
+                       from_me = TRUE;
+               }
+               g_free(addr);
+       }
+
+       if (from_me) {
+               noticeview_set_icon(noticeview, STOCK_PIXMAP_NOTICE_WARN);
+               if (MSG_IS_RETRCPT_GOT(msginfo->flags)) {
+                       noticeview_set_text(noticeview, _("You got a return receipt for this message : "
+                                                         "it has been displayed by the recipient."));
+               } else {
+                       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,
+                                                    G_CALLBACK(return_receipt_send_clicked),
+                                                    (gpointer) msginfo);
+       }
        noticeview_show(noticeview);
 }
 
@@ -1242,6 +1765,8 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
        void  *button1_cb = NULL;
        void  *button2_cb = NULL;
 
+       if (!msginfo->extradata)
+               return;
        if (!partial_msg_in_uidl_list(msginfo)) {
                text = g_strdup_printf(_("This message has been partially "
                                "retrieved,\nand has been deleted from the "
@@ -1252,7 +1777,7 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
                        text = g_strdup_printf(_("This message has been "
                                        "partially retrieved;\nit is %s."),
                                        to_human_readable(
-                                               (off_t)(msginfo->total_size)));
+                                               (goffset)(msginfo->total_size)));
                        button1 = _("Mark for download");
                        button2 = _("Mark for deletion");
                        button1_cb = partial_recv_dload_clicked;
@@ -1263,7 +1788,7 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
                                        "partially retrieved;\nit is %s and "
                                        "will be downloaded."),
                                        to_human_readable(
-                                               (off_t)(msginfo->total_size)));
+                                               (goffset)(msginfo->total_size)));
                        button1 = _("Unmark");
                        button1_cb = partial_recv_unmark_clicked;
                        button2 = _("Mark for deletion");
@@ -1274,7 +1799,7 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
                                        "partially retrieved;\nit is %s and "
                                        "will be deleted."),
                                        to_human_readable(
-                                               (off_t)(msginfo->total_size)));
+                                               (goffset)(msginfo->total_size)));
                        button1 = _("Mark for download");
                        button1_cb = partial_recv_dload_clicked;
                        button2 = _("Unmark");
@@ -1285,6 +1810,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);
@@ -1324,26 +1850,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"),
@@ -1351,8 +1873,8 @@ static PrefsAccount *select_account_from_list(GList *ac_list)
                                  "accounts.\n"
                                  "Please choose which account do you want to "
                                  "use for sending the receipt notification:"),
-                               _("_Send Notification"), _("+_Cancel"), NULL,
-                               optmenu) != G_ALERTDEFAULT)
+                               _("_Cancel"), _("_Send Notification"), NULL,
+                               FALSE, G_ALERTDEFAULT, optmenu) != G_ALERTALTERNATE)
                return NULL;
        return account_find_from_id(account_id);
 }
@@ -1375,6 +1897,15 @@ gchar *messageview_get_selection(MessageView *msgview)
        
        g_return_val_if_fail(msgview != NULL, NULL);
 
+       if (msgview->mimeview->type == MIMEVIEW_VIEWER) {
+               MimeViewer *viewer = msgview->mimeview->mimeviewer;
+               if (viewer && viewer->get_selection) {
+                       text = viewer->get_selection(viewer);
+                       if (text)
+                               return text;
+               }
+       }
+
        textview = messageview_get_current_textview(msgview);
        g_return_val_if_fail(textview != NULL, NULL);
 
@@ -1397,22 +1928,103 @@ gchar *messageview_get_selection(MessageView *msgview)
        return text;
 }
 
-static void save_as_cb(gpointer data, guint action, GtkWidget *widget)
+static void save_as_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        messageview_save_as(messageview);
 }
 
-static void print_cb(gpointer data, guint action, GtkWidget *widget)
+#if GTK_CHECK_VERSION(2,10,0)
+static void print_mimeview(MimeView *mimeview, gint sel_start, gint sel_end, gint partnum) 
+{
+       MainWindow *mainwin;
+
+       if (!mimeview 
+       ||  !mimeview->textview
+       ||  !mimeview->textview->text)
+               alertpanel_warning(_("Cannot print: the message doesn't "
+                                    "contain text."));
+       else {
+               gtk_widget_realize(mimeview->textview->text);
+               if (partnum > 0) {
+                       mimeview_select_part_num(mimeview, partnum);
+               }
+               if (mimeview->type == MIMEVIEW_VIEWER) {
+                       MimeViewer *viewer = mimeview->mimeviewer;
+                       if (viewer && viewer->print) {
+                               viewer->print(viewer);
+                               return;
+                       }
+               }
+               if (sel_start != -1 && sel_end != -1) {
+                       GtkTextIter start, end;
+                       GtkTextView *text = GTK_TEXT_VIEW(mimeview->textview->text);
+                       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+
+                       gtk_text_buffer_get_iter_at_offset(buffer, &start, sel_start);
+                       gtk_text_buffer_get_iter_at_offset(buffer, &end, sel_end);
+                       gtk_text_buffer_select_range(buffer, &start, &end);
+               }
+               /* 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);
+       }
+}
+
+void messageview_print(MsgInfo *msginfo, gboolean all_headers, 
+                       gint sel_start, gint sel_end, gint partnum) 
+{
+       PangoFontDescription *font_desc = NULL;
+       MessageView *tmpview = messageview_create_with_new_window_visible(
+                               mainwindow_get_mainwindow(), FALSE);
+
+       if (prefs_common.use_different_print_font) {
+               font_desc = pango_font_description_from_string
+                                               (prefs_common.printfont);
+       } else {
+               font_desc = pango_font_description_from_string
+                                               (prefs_common.textfont);
+       }
+       if (font_desc) {
+               gtk_widget_modify_font(tmpview->mimeview->textview->text, 
+                       font_desc);
+               pango_font_description_free(font_desc);
+       }
+
+       tmpview->all_headers = all_headers;
+       if (msginfo && messageview_show(tmpview, msginfo, 
+               tmpview->all_headers) >= 0) {
+                       print_mimeview(tmpview->mimeview, 
+                               sel_start, sel_end, partnum);
+       }
+       messageview_destroy(tmpview);
+}
+#endif
+
+#if GTK_CHECK_VERSION(2,10,0)
+static void page_setup_cb(GtkAction *action, gpointer data)
+{
+       MessageView *messageview = (MessageView *)data;
+       printing_page_setup(messageview ?
+                           GTK_WINDOW(messageview->window) : NULL);
+}
+#endif
+
+static void print_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
-#ifndef USE_GNOMEPRINT
+#if !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 !GTK_CHECK_VERSION(2,10,0)
        cmdline = input_dialog(_("Print"),
                               _("Enter the print command line:\n"
                                 "('%s' will be replaced with file name)"),
@@ -1428,49 +2040,403 @@ static void print_cb(gpointer data, guint action, GtkWidget *widget)
        procmsg_print_message(messageview->msginfo, cmdline);
        g_free(cmdline);
 #else
-       if (!messageview->mimeview 
-       ||  !messageview->mimeview->textview
-       ||  !messageview->mimeview->textview->text)
-               alertpanel_warning(_("Cannot print: the message doesn't "
-                                    "contain text."));
-
-       gedit_print(
-               GTK_TEXT_VIEW(messageview->mimeview
-                               ->textview->text));
+       partnum = mimeview_get_selected_part_num(messageview->mimeview);
+       textview_get_selection_offsets(messageview->mimeview->textview,
+               &sel_start, &sel_end);
+       messageview_print(messageview->msginfo, messageview->all_headers, 
+               sel_start, sel_end, partnum);
 #endif
 }
 
-static void close_cb(gpointer data, guint action, GtkWidget *widget)
+static void close_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        messageview_destroy(messageview);
 }
 
-static void copy_cb(gpointer data, guint action, GtkWidget *widget)
+static void copy_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        messageview_copy_clipboard(messageview);
 }
 
-static void allsel_cb(gpointer data, guint action, GtkWidget *widget)
+static void allsel_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        messageview_select_all(messageview);
 }
 
-static void search_cb(gpointer data, guint action, GtkWidget *widget)
+static void search_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        message_search(messageview);
 }
 
-static void set_charset_cb(gpointer data, guint action, GtkWidget *widget)
+static void prev_cb(GtkAction *action, gpointer data)
 {
        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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       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 GENERIC_UMPC
+               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(GtkAction *action, gpointer data)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview->updating = TRUE;
+       FolderItem *to_folder;
+       messageview->updating = FALSE;
+
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL, FALSE);
+
+       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 GENERIC_UMPC
+                       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(GtkAction *action, GtkRadioAction *current, gpointer data)
+{
+       MessageView *messageview = (MessageView *)data;
+       gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current));
+       gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
        const gchar *charset;
 
-       if (GTK_CHECK_MENU_ITEM(widget)->active) {
-               charset = conv_get_charset_str((CharSet)action);
+       if (active) {
+               charset = conv_get_charset_str((CharSet)value);
                g_free(messageview->forced_charset);
                messageview->forced_charset = g_strdup(charset);
                procmime_force_charset(charset);
@@ -1479,20 +2445,22 @@ static void set_charset_cb(gpointer data, guint action, GtkWidget *widget)
        }
 }
 
-static void set_decode_cb(gpointer data, guint action, GtkWidget *widget)
+static void set_decode_cb(GtkAction *action, GtkRadioAction *current, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
-       if (GTK_CHECK_MENU_ITEM(widget)->active) {
-               messageview->forced_encoding = (EncodingType)action;
+       gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current));
+       gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
+
+       if (active) {
+               messageview->forced_encoding = (EncodingType)value;
 
                messageview_show(messageview, messageview->msginfo, FALSE);
-               
-               debug_print("forced encoding: %d\n", action);
+               debug_print("forced encoding: %d\n", value);
        }
 }
 
 
-static void view_source_cb(gpointer data, guint action, GtkWidget *widget)
+static void view_source_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        SourceWindow *srcwin;
@@ -1504,56 +2472,63 @@ static void view_source_cb(gpointer data, guint action, GtkWidget *widget)
        source_window_show(srcwin);
 }
 
-static void show_all_header_cb(gpointer data, guint action, GtkWidget *widget)
+static void show_all_header_cb(GtkToggleAction *action, gpointer data)
 {
        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;
+                       gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
        if (!msginfo) return;
        messageview->msginfo = NULL;
-       messageview_show(messageview, msginfo,
-                        GTK_CHECK_MENU_ITEM(widget)->active);
+       messageview_show(messageview, msginfo,gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
        procmsg_msginfo_free(msginfo);
        main_window_set_menu_sensitive(messageview->mainwin);
 }
 
-#define SET_CHECK_MENU_ACTIVE(path, active) \
-{ \
-       menuitem = gtk_item_factory_get_widget(ifactory, path); \
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
-}
-
-static void hide_quotes_cb(gpointer data, guint action, GtkWidget *widget)
+static void msg_hide_quotes_cb(GtkToggleAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        MsgInfo *msginfo = messageview->msginfo;
        static gboolean updating_menu = FALSE;
-       GtkItemFactory *ifactory = gtk_item_factory_from_widget(messageview->menubar);
-       GtkWidget *menuitem;
+
        if (updating_menu)
                return;
-
-       prefs_common.hide_quotes = 
-                       GTK_CHECK_MENU_ITEM(widget)->active ? action : 0;
+       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
+               const gchar *a_name = gtk_action_get_name(GTK_ACTION(action));
+               if (!strcmp(a_name, "View/Quotes/FoldAll")) prefs_common.hide_quotes = 1;
+               else if (!strcmp(a_name, "View/Quotes/Fold2")) prefs_common.hide_quotes = 2;
+               else if (!strcmp(a_name, "View/Quotes/Fold3")) prefs_common.hide_quotes = 3;
+       } else
+               prefs_common.hide_quotes = 0;
        
        updating_menu=TRUE;
-       SET_CHECK_MENU_ACTIVE("/View/Quotes/Hide all", FALSE);
-       SET_CHECK_MENU_ACTIVE("/View/Quotes/Hide from level 2", FALSE);
-       SET_CHECK_MENU_ACTIVE("/View/Quotes/Hide from level 3", FALSE);
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), prefs_common.hide_quotes > 0);      
+       
+       cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/FoldAll", (prefs_common.hide_quotes == 1));
+       cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Fold2", (prefs_common.hide_quotes == 2));
+       cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Fold3", (prefs_common.hide_quotes == 3));
+
        updating_menu=FALSE;
        if (!msginfo) return;
        messageview->msginfo = NULL;
        messageview_show(messageview, msginfo,
                         messageview->all_headers);
        procmsg_msginfo_free(msginfo);
+       
+       /* update main window */
        main_window_set_menu_sensitive(messageview->mainwin);
+       summary_redisplay_msg(messageview->mainwin->summaryview);
 }
 #undef SET_CHECK_MENU_ACTIVE
 
-static void compose_cb(gpointer data, guint action, GtkWidget *widget)
+static void compose_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        PrefsAccount *ac = NULL;
@@ -1574,63 +2549,121 @@ static void compose_cb(gpointer data, guint action, GtkWidget *widget)
        compose_new(ac, NULL, NULL);
 }
 
-static void reply_cb(gpointer data, guint action, GtkWidget *widget)
+#define DO_ACTION(name, act)   { if (!strcmp(a_name, name)) action = act; }
+
+static void reply_cb(GtkAction *gaction, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        GSList *msginfo_list = NULL;
-
+       gint action = COMPOSE_REPLY;
+       const gchar *a_name = gtk_action_get_name(gaction);
+       
        g_return_if_fail(messageview->msginfo);
 
+       DO_ACTION("Message/Reply", COMPOSE_REPLY);
+       DO_ACTION("Message/ReplyTo/All", COMPOSE_REPLY_TO_ALL);
+       DO_ACTION("Message/ReplyTo/Sender", COMPOSE_REPLY_TO_SENDER);
+       DO_ACTION("Message/ReplyTo/List", COMPOSE_REPLY_TO_LIST);
+       DO_ACTION("Message/Forward", COMPOSE_FORWARD_INLINE);
+       DO_ACTION("Message/ForwardAtt", COMPOSE_FORWARD_AS_ATTACH);
+       DO_ACTION("Message/Redirect", COMPOSE_REDIRECT);
+
        msginfo_list = g_slist_append(msginfo_list, messageview->msginfo);
        compose_reply_from_messageview(messageview, msginfo_list, action);
        g_slist_free(msginfo_list);
 }
 
-static void addressbook_open_cb(gpointer data, guint action, GtkWidget *widget)
+static void addressbook_open_cb(GtkAction *action, gpointer data)
 {
        addressbook_open(NULL);
 }
 
-static void add_address_cb(gpointer data, guint action, GtkWidget *widget)
+static void add_address_cb(GtkAction *action, gpointer data)
 {
        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)
+static void create_filter_cb(GtkAction *gaction, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        FolderItem * item;
-       
+       gint action = -1;
+       const gchar *a_name = gtk_action_get_name(gaction);
+
        if (!messageview->msginfo) return;
+
+       DO_ACTION("Tools/CreateFilterRule/Automatically", FILTER_BY_AUTO);
+       DO_ACTION("Tools/CreateFilterRule/ByFrom", FILTER_BY_FROM);
+       DO_ACTION("Tools/CreateFilterRule/ByTo", FILTER_BY_TO);
+       DO_ACTION("Tools/CreateFilterRule/BySubject", FILTER_BY_SUBJECT);
        
        item = messageview->msginfo->folder;
        summary_msginfo_filter_open(item,  messageview->msginfo,
                                    (PrefsFilterType)action, 0);
 }
 
-static void create_processing_cb(gpointer data, guint action,
-                                GtkWidget *widget)
+static void create_processing_cb(GtkAction *gaction, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        FolderItem * item;
+       gint action = -1;
+       const gchar *a_name = gtk_action_get_name(gaction);
        
        if (!messageview->msginfo) return;
        
+       DO_ACTION("Tools/CreateProcessingRule/Automatically", FILTER_BY_AUTO);
+       DO_ACTION("Tools/CreateProcessingRule/ByFrom", FILTER_BY_FROM);
+       DO_ACTION("Tools/CreateProcessingRule/ByTo", FILTER_BY_TO);
+       DO_ACTION("Tools/CreateProcessingRule/BySubject", FILTER_BY_SUBJECT);
+
        item = messageview->msginfo->folder;
        summary_msginfo_filter_open(item,  messageview->msginfo,
                                    (PrefsFilterType)action, 1);
 }
 
-static void about_cb(gpointer data, guint action, GtkWidget *widget)
+static void open_urls_cb(GtkAction *action, gpointer data)
+{
+       MessageView *messageview = (MessageView *)data;
+       messageview_list_urls(messageview);
+}
+
+static void about_cb(GtkAction *gaction, gpointer data)
 {
        about_show();
 }
@@ -1644,8 +2677,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;
@@ -1653,35 +2687,14 @@ static gboolean messageview_update_msg(gpointer source, gpointer data)
 
 void messageview_set_menu_sensitive(MessageView *messageview)
 {
-       GtkItemFactory *ifactory;
-       GtkWidget *menuitem;
-
        if (!messageview || !messageview->new_window) 
                return;
        /* do some smart things */
        if (!messageview->menubar) return;
-       ifactory = gtk_item_factory_from_widget(messageview->menubar);
-       if (!ifactory) return;
-       if (messageview->mainwin->type == SEPARATE_MESSAGE) {
-               menuitem = gtk_item_factory_get_widget(ifactory, "/View/Show all headers");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem),
-                        messageview->mimeview->textview->show_all_headers);
-               if (prefs_common.hide_quotes) {
-                       if (prefs_common.hide_quotes == 1)
-                               menuitem = gtk_item_factory_get_widget(ifactory, 
-                                               "/View/Quotes/Hide all");
-                       if (prefs_common.hide_quotes == 2)
-                               menuitem = gtk_item_factory_get_widget(ifactory, 
-                                               "/View/Quotes/Hide from level 2");
-                       if (prefs_common.hide_quotes == 3)
-                               menuitem = gtk_item_factory_get_widget(ifactory, 
-                                               "/View/Quotes/Hide from level 3");
-                       gtk_check_menu_item_set_active
-                               (GTK_CHECK_MENU_ITEM(menuitem),
-                                TRUE);
-               }
-       }
+
+       cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/FoldAll", (prefs_common.hide_quotes == 1));
+       cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Fold2", (prefs_common.hide_quotes == 2));
+       cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Fold3", (prefs_common.hide_quotes == 3));
 }
 
 void messageview_learn (MessageView *msgview, gboolean is_spam)
@@ -1690,13 +2703,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
@@ -1707,3 +2720,31 @@ 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;
+       GHashTable *uri_hashtable = g_hash_table_new(g_str_hash, g_str_equal); 
+       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)))
+               {
+                       if(g_hash_table_lookup(uri_hashtable, uri->uri))
+                               continue;
+                       
+                       newlist = g_slist_prepend(newlist, uri);
+                       g_hash_table_insert(uri_hashtable, uri->uri,
+                                           GUINT_TO_POINTER(g_str_hash(uri->uri)));
+               }
+       }
+       newlist = g_slist_reverse(newlist);
+       uri_opener_open(msgview, newlist);
+       g_slist_free(newlist);
+       g_hash_table_destroy(uri_hashtable);
+}