fix bug 4155, 'remember directory of last saving'
[claws.git] / src / messageview.c
index 5a9d7286ed0f563aed6228efdce7b4afca1c9820..62d63ad0f77cfe44416c699b94279d3d2d26666e 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 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
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #include "defs.h"
@@ -39,7 +38,6 @@
 #include "filesel.h"
 #include "foldersel.h"
 #include "sourcewindow.h"
-#include "addressbook.h"
 #include "alertpanel.h"
 #include "inputdialog.h"
 #include "mainwindow.h"
 #include "uri_opener.h"
 #include "inc.h"
 #include "log.h"
+#include "privacy.h"
 #include "combobox.h"
 #include "printing.h"
 #include "quoted-printable.h"
 #include "version.h"
 #include "statusbar.h"
+#include "folder_item_prefs.h"
+#include "avatars.h"
+#include "file-utils.h"
 
+#ifndef USE_ALT_ADDRBOOK
+       #include "addressbook.h"
+#else
+       #include "addressadd.h"
+       #include "addressbook-dbus.h"
+#endif
 static GList *messageview_list = NULL;
 
 static gint messageview_delete_cb      (GtkWidget              *widget,
@@ -74,11 +82,9 @@ 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, 
@@ -126,7 +132,9 @@ 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,
+static void prev_history_cb            (GtkAction      *action,
+                                        gpointer        data);
+static void next_history_cb            (GtkAction      *action,
                                         gpointer        data);
 static void parent_cb                  (GtkAction      *action,
                                         gpointer        data);
@@ -135,6 +143,15 @@ static void goto_unread_folder_cb  (GtkAction      *action,
 static void goto_folder_cb             (GtkAction      *action,
                                         gpointer        data);
 
+static void scroll_prev_line_cb         (GtkAction      *action,
+                                         gpointer        data);
+static void scroll_next_line_cb         (GtkAction      *action,
+                                          gpointer        data);
+static void scroll_next_page_cb         (GtkAction      *action,
+                                         gpointer        data);
+static void scroll_prev_page_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);
 
@@ -152,7 +169,8 @@ static void reply_cb                        (GtkAction      *action,
                                         gpointer        data);
 
 static PrefsAccount *select_account_from_list
-                                       (GList          *ac_list);
+                                       (GList          *ac_list,
+                                        gboolean        has_accounts);
 static void addressbook_open_cb                (GtkAction      *action,
                                         gpointer        data);
 static void add_address_cb             (GtkAction      *action,
@@ -170,6 +188,16 @@ static void messageview_update             (MessageView    *msgview,
                                         MsgInfo        *old_msginfo);
 static gboolean messageview_update_msg (gpointer source, gpointer data);
 
+static void save_part_as_cb(GtkAction *action, gpointer data);
+static void view_part_as_text_cb(GtkAction *action, gpointer data);
+static void open_part_cb(GtkAction *action, gpointer data);
+#ifndef G_OS_WIN32
+static void open_part_with_cb(GtkAction *action, gpointer data);
+#endif
+static void check_signature_cb(GtkAction *action, gpointer data);
+static void goto_next_part_cb(GtkAction *action, gpointer data);
+static void goto_prev_part_cb(GtkAction *action, gpointer data);
+
 static void messageview_nothing_cb        (GtkAction *action, gpointer data)
 {
 
@@ -178,129 +206,146 @@ static void messageview_nothing_cb         (GtkAction *action, gpointer data)
 static GList *msgview_list = NULL;
 static GtkActionEntry msgview_entries[] =
 {
-       {"Menu",                        NULL, "Menu" },
+       {"Menu",                                     NULL, "Menu", NULL, NULL, NULL },
 /* 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",                                     NULL, N_("_File"), NULL, NULL, NULL },
+       {"Edit",                                     NULL, N_("_Edit"), NULL, NULL, NULL },
+       {"View",                                     NULL, N_("_View"), NULL, NULL, NULL },
+       {"Message",                                  NULL, N_("_Message"), NULL, NULL, NULL },
+       {"Tools",                                    NULL, N_("_Tools"), NULL, NULL, NULL },
+       {"Help",                                     NULL, N_("_Help"), NULL, NULL, NULL },
+       {"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) },
-       {"File/PageSetup",              NULL, N_("Page setup..."), NULL, NULL, G_CALLBACK(page_setup_cb) },
-       {"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) },
+       {"File/SaveAs",                              NULL, N_("_Save email as..."), "<control>S", NULL, G_CALLBACK(save_as_cb) },
+       {"File/SavePartAs",                          NULL, N_("_Save part as..."), "Y", NULL, G_CALLBACK(save_part_as_cb) },
+       {"File/PageSetup",                           NULL, N_("Page setup..."), NULL, NULL, G_CALLBACK(page_setup_cb) },
+       {"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) },
+       {"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, "---" },
+       {"View/Goto",                                NULL, N_("_Go to"), NULL, NULL, NULL },
+       {"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/PrevHistory",                    NULL, N_("Previous opened message"), "<alt>Left", NULL, G_CALLBACK(prev_history_cb) },
+       {"View/Goto/NextHistory",                    NULL, N_("Next opened message"), "<alt>Right", NULL, G_CALLBACK(next_history_cb) },
+       /* {"View/Goto/---",                         NULL, "---", NULL, NULL, NULL }, */
+       {"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/Folder",                         NULL, N_("F_older..."), "G", NULL, G_CALLBACK(goto_folder_cb) },
+       /* {"View/Goto/---",                         NULL, "---", NULL, NULL, NULL }, */
+       {"View/Goto/NextPart",                       NULL, N_("Next part"), "A", NULL, G_CALLBACK(goto_next_part_cb) },
+       {"View/Goto/PrevPart",                       NULL, N_("Previous part"), "Z", NULL, G_CALLBACK(goto_prev_part_cb) },
+       {"View/Scroll",                              NULL, N_("Message scroll"), NULL, NULL, NULL },
+       {"View/Scroll/PrevLine",                     NULL, N_("Previous line"), NULL, NULL, G_CALLBACK(scroll_prev_line_cb) },
+       {"View/Scroll/NextLine",                     NULL, N_("Next line"), NULL, NULL, G_CALLBACK(scroll_next_line_cb) },
+       {"View/Scroll/PrevPage",                     NULL, N_("Previous page"), NULL, NULL, G_CALLBACK(scroll_prev_page_cb) },
+       {"View/Scroll/NextPage",                     NULL, N_("Next page"), NULL, NULL, G_CALLBACK(scroll_next_page_cb) },
+       /* {"View/Scroll/---",                       NULL, "---", NULL, NULL, NULL }, */
+
+       {"View/Encoding",                            NULL, N_("Character _encoding"), NULL, NULL, NULL }, /* set_charset_cb */
+       {"View/Encoding/---",                        NULL, "---", NULL, NULL, 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/Encoding/Western",                    NULL, N_("Western European"), NULL, NULL, NULL },
+       {"View/Encoding/Baltic",                     NULL, N_("Baltic"), NULL, NULL, NULL },
+       {"View/Encoding/Hebrew",                     NULL, N_("Hebrew"), NULL, NULL, NULL },
+       {"View/Encoding/Arabic",                     NULL, N_("Arabic"), NULL, NULL, NULL },
+       {"View/Encoding/Cyrillic",                   NULL, N_("Cyrillic"), NULL, NULL, NULL },
+       {"View/Encoding/Japanese",                   NULL, N_("Japanese"), NULL, NULL, NULL },
+       {"View/Encoding/Chinese",                    NULL, N_("Chinese"), NULL, NULL, NULL },
+       {"View/Encoding/Korean",                     NULL, N_("Korean"), NULL, NULL, NULL },
+       {"View/Encoding/Thai",                       NULL, N_("Thai"), NULL, NULL, NULL },
 
-       {"View/Decode",                 NULL, N_("Decode") }, /* set_decode_cb */
-       {"View/Decode/---",             NULL, "---" },
+       {"View/Decode",                              NULL, N_("Decode"), NULL, NULL, NULL }, /* set_decode_cb */
+       {"View/Decode/---",                          NULL, "---", NULL, NULL, 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/---",                                 NULL, "---", NULL, NULL, NULL },
+       {"View/MessageSource",                       NULL, N_("Mess_age source"), "<control>U", NULL, G_CALLBACK(view_source_cb) },
+       {"View/Part",                                NULL, N_("Message part"), NULL, NULL, NULL },
+       {"View/Part/AsText",                         NULL, N_("View as text"), "T", NULL, G_CALLBACK(view_part_as_text_cb) },
+       {"View/Part/Open",                           NULL, N_("Open"), "L", NULL, G_CALLBACK(open_part_cb) },
+#ifndef G_OS_WIN32
+       {"View/Part/OpenWith",                       NULL, N_("Open with..."), "O", NULL, G_CALLBACK(open_part_with_cb) },
+#endif
 
-       {"View/Quotes",                 NULL, N_("Quotes") }, 
+       {"View/Quotes",                              NULL, N_("Quotes"), NULL, NULL, NULL }, 
 
 /* Message menu */
-       {"Message/Compose",             NULL, N_("Compose _new message"), "<control>M", NULL, G_CALLBACK(compose_cb) },
-       {"Message/---",                 NULL, "---", NULL, NULL, NULL },
+       {"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/Reply",                            NULL, N_("_Reply"), "<control>R", NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REPLY */
+       {"Message/ReplyTo",                          NULL, N_("Repl_y to"), NULL, NULL, NULL }, 
+       {"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 */
+       {"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 */
+       {"Message/CheckSignature",                   NULL, N_("Check signature"), "C", NULL, G_CALLBACK(check_signature_cb) },
 
 /* 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/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, N_("_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/CreateFilterRule",                   NULL, N_("_Create filter rule"), NULL, NULL, NULL },
+       {"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, N_("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/CreateProcessingRule",               NULL, N_("Create processing rule"), NULL, NULL, NULL },
+       {"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/---",                        NULL, "---", NULL, NULL, NULL }, */
+       {"Tools/ListUrls",                           NULL, N_("List _URLs..."), "<control><shift>U", NULL, G_CALLBACK(open_urls_cb) }, 
 
-       {"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) },
+       /* {"Tools/---",                             NULL, "---", NULL, NULL, NULL }, */
+       {"Tools/Actions",                            NULL, N_("Actio_ns"), NULL, NULL, NULL },
+       {"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) }, 
+       {"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 */
+       {"View/AllHeaders",         NULL, N_("Show all _headers"), "<control>H", NULL, G_CALLBACK(show_all_header_cb), FALSE }, /* toggle */
+       {"View/Quotes/CollapseAll", NULL, N_("_Collapse all"), "<control><shift>Q", NULL, G_CALLBACK(msg_hide_quotes_cb), FALSE }, /* 1 toggle */
+       {"View/Quotes/Collapse2",   NULL, N_("Collapse from level _2"), NULL, NULL, G_CALLBACK(msg_hide_quotes_cb), FALSE }, /* 2 toggle */
+       {"View/Quotes/Collapse3",   NULL, N_("Collapse from level _3"), NULL, NULL, G_CALLBACK(msg_hide_quotes_cb), FALSE }, /* 3 toggle */
 };
 
 static GtkRadioActionEntry msgview_radio_enc_entries[] =
@@ -322,6 +367,7 @@ static GtkRadioActionEntry msgview_radio_enc_entries[] =
        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_MACCYR, C_MACCYR, "MAC_CYR"), /* 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 */
@@ -390,6 +436,7 @@ MessageView *messageview_create(MainWindow *mainwin)
        messageview->statusbar_cid = 0;
 
        messageview->show_full_text= FALSE;
+       messageview->update_needed = FALSE;
 
        messageview->msginfo_update_callback_id =
                hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, messageview_update_msg, (gpointer) messageview);
@@ -397,7 +444,7 @@ MessageView *messageview_create(MainWindow *mainwin)
        return messageview;
 }
 
-GList *messageview_get_msgview_list(void)
+const GList *messageview_get_msgview_list(void)
 {
        return msgview_list;
 }
@@ -435,12 +482,7 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        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)
@@ -450,9 +492,11 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
 
 /* File menu */
        MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "SaveAs", "File/SaveAs", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "SavePartAs", "File/SavePartAs", 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", "PageSetup", "File/PageSetup", GTK_UI_MANAGER_MENUITEM)
        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", "Separator2", "File/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "Close", "File/Close", GTK_UI_MANAGER_MENUITEM)
 
 /* Edit menu */
@@ -465,24 +509,35 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        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", "Separator1", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        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", "Separator2", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        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", "Separator3", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        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", "Separator4", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        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", "Separator5", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevHistory", "View/Goto/PrevHistory", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextHistory", "View/Goto/NextHistory", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator6", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        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", "Separator7", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        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/Goto", "Folder", "View/Goto/Folder", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator8", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextPart", "View/Goto/NextPart", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevPart", "View/Goto/PrevPart", GTK_UI_MANAGER_MENUITEM)
+
+        MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Scroll", "View/Scroll", GTK_UI_MANAGER_MENU)
+        MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Scroll", "PrevLine", "View/Scroll/PrevLine", GTK_UI_MANAGER_MENUITEM)
+        MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Scroll", "NextLine", "View/Scroll/NextLine", GTK_UI_MANAGER_MENUITEM)
+        MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Scroll", "PrevPage", "View/Scroll/PrevPage", GTK_UI_MANAGER_MENUITEM)
+        MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Scroll", "NextPage", "View/Scroll/NextPage", GTK_UI_MANAGER_MENUITEM)
 
        MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Separator1", "View/---", GTK_UI_MANAGER_SEPARATOR)
 
@@ -519,6 +574,7 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        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_MACCYR, "View/Encoding/Cyrillic/"CS_MACCYR, 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)
 
@@ -556,9 +612,15 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        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)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "CollapseAll", "View/Quotes/CollapseAll", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "Collapse2", "View/Quotes/Collapse2", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "Collapse3", "View/Quotes/Collapse3", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Part", "View/Part", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Part", "AsText", "View/Part/AsText", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Part", "Open", "View/Part/Open", GTK_UI_MANAGER_MENUITEM)
+#ifndef G_OS_WIN32
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Part", "OpenWith", "View/Part/OpenWith", GTK_UI_MANAGER_MENUITEM)
+#endif
 
 /* Message menu */
        MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Compose", "Message/Compose", GTK_UI_MANAGER_MENUITEM)
@@ -572,6 +634,7 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        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)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "CheckSignature", "Message/CheckSignature", GTK_UI_MANAGER_MENUITEM)
 
 /* Tools menu */
        MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "AddressBook", "Tools/AddressBook", GTK_UI_MANAGER_MENUITEM)
@@ -604,11 +667,10 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        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
+
+       cm_toggle_menu_set_active_full(msgview->ui_manager, "Menu/View/AllHeaders",
+                                       prefs_common.show_all_headers);
 
        if (prefs_common.toolbar_detachable) {
                handlebox = gtk_handle_box_new();
@@ -617,12 +679,6 @@ static 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
@@ -636,7 +692,6 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        msgview->statusbar = NULL;
        msgview->statusbar_cid = 0;
 #endif
-#endif
 
 
        msgview->handlebox = handlebox;
@@ -680,16 +735,11 @@ static MessageView *messageview_create_with_new_window_visible(MainWindow *mainw
                         msgview);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(messageview_delete_cb), msgview);
-#ifdef MAEMO
-       maemo_connect_key_press_to_mainwindow(GTK_WINDOW(window));
-#else
        g_signal_connect(G_OBJECT(window), "key_press_event",
                         G_CALLBACK(key_pressed), msgview);
-#endif
        messageview_add_toolbar(msgview, window);
 
        if (show) {
-               gtk_widget_grab_focus(msgview->mimeview->textview->text);
                gtk_widget_show(window);
        } else {
                gtk_widget_realize(window);
@@ -703,6 +753,11 @@ static MessageView *messageview_create_with_new_window_visible(MainWindow *mainw
                          prefs_common.toolbar_style);
        messageview_init(msgview);
 
+       if (show) {
+               GTK_EVENTS_FLUSH();
+               gtk_widget_grab_focus(msgview->mimeview->textview->text);
+       }
+
        return msgview;
 }
 
@@ -719,32 +774,35 @@ void messageview_init(MessageView *messageview)
        noticeview_hide(messageview->noticeview);
 }
 
-static void notification_convert_header(gchar *dest, gint len, 
+static void notification_convert_header(gchar **dest,
                                        const gchar *src_,
                                        gint header_len)
 {
        char *src;
 
        cm_return_if_fail(src_ != NULL);
-       cm_return_if_fail(dest != NULL);
 
-       if (len < 1) return;
+       if (header_len < 1) {
+               *dest = g_strdup("");
+               return;
+       }
 
-       Xstrndup_a(src, src_, len, return);
+       Xstrndup_a(src, src_, strlen(src_), return);
 
        remove_return(src);
 
        if (is_ascii_str(src)) {
-               strncpy2(dest, src, len);
-               dest[len - 1] = '\0';
+               *dest = g_strdup(src);
                return;
-       } else
-               conv_encode_header(dest, len, src, header_len, FALSE);
+       } else {
+               *dest = g_malloc(BUFFSIZE);
+               conv_encode_header(*dest, BUFFSIZE, src, header_len, FALSE);
+       }
 }
 
 static gint disposition_notification_send(MsgInfo *msginfo)
 {
-       gchar buf[BUFFSIZE];
+       gchar *buf = NULL;
        gchar tmp[MAXPATHLEN + 1];
        FILE *fp;
        GList *ac_list;
@@ -759,6 +817,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        gchar *foo = NULL;
        gboolean queued_removed = FALSE;
        gchar *boundary = NULL;
+       gchar buf_date[RFC822_DATE_BUFFSIZE];
        gchar *date = NULL;
        gchar *orig_to = NULL;
        gchar *enc_sub = NULL;
@@ -775,8 +834,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        else
                to = msginfo->extradata->returnreceiptto;
 
-       ok = procheader_get_header_from_msginfo(msginfo, buf, sizeof(buf),
-                               "Return-Path:");
+       ok = procheader_get_header_from_msginfo(msginfo, &buf, "Return-Path:");
        if (ok == 0) {
                gchar *to_addr = g_strdup(to);
                extract_address(to_addr);
@@ -784,8 +842,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                ok = strcasecmp(to_addr, buf);
                g_free(to_addr);
        } else {
-               strncpy(buf, _("<No Return-Path found>"), 
-                               sizeof(buf));
+               buf = g_strdup(_("<No Return-Path found>"));
        }
        
        if (ok != 0) {
@@ -796,37 +853,31 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                    "to be sent does not correspond to the return path:\n"
                    "Notification address: %s\n"
                    "Return path: %s\n"
-                   "It is advised to not to send the return receipt."),
+                   "It is advised to not send the return receipt."),
                  to, buf);
                val = alertpanel_full(_("Warning"), message,
-                               _("_Don't Send"), _("_Send"), NULL, FALSE,
-                               NULL, ALERT_WARNING, G_ALERTDEFAULT);
+                               _("_Don't Send"), _("_Send"), NULL, ALERTFOCUS_FIRST, FALSE,
+                               NULL, ALERT_WARNING);
                g_free(message);                                
-               if (val != G_ALERTALTERNATE)
+               if (val != G_ALERTALTERNATE) {
+                       g_free(buf);
                        return -1;
+               }
        }
+       g_free(buf);
+       buf = NULL;
 
        ac_list = account_find_all_from_address(NULL, msginfo->to);
        ac_list = account_find_all_from_address(ac_list, msginfo->cc);
 
        if (ac_list == NULL) {
-               AlertValue val = 
-               alertpanel_full(_("Warning"),
-                 _("This message is asking for a return receipt notification\n"
-                   "but according to its 'To:' and 'CC:' headers it was not\n"
-                   "officially addressed to you.\n"
-                   "It is advised to not to send the return receipt."),
-                 _("_Don't Send"), _("_Send"), NULL, FALSE,
-                 NULL, ALERT_WARNING, G_ALERTDEFAULT);
-               if (val != G_ALERTALTERNATE)
+               ac_list = account_find_all();
+               if ((account = select_account_from_list(ac_list, FALSE)) == NULL)
                        return -1;
-       }
-
-       if (g_list_length(ac_list) > 1) {
-               if ((account = select_account_from_list(ac_list)) == NULL)
+       } else if (g_list_length(ac_list) > 1) {
+               if ((account = select_account_from_list(ac_list, TRUE)) == NULL)
                        return -1;
-       }
-       else if (ac_list != NULL)
+       } else if (ac_list != NULL)
                account = (PrefsAccount *) ac_list->data;
        g_list_free(ac_list);
 
@@ -842,15 +893,15 @@ static gint disposition_notification_send(MsgInfo *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");
+       if ((fp = claws_fopen(tmp, "wb")) == NULL) {
+               FILE_OP_ERROR(tmp, "claws_fopen");
                return -1;
        }
 
        /* chmod for security */
        if (change_file_mode_rw(fp, tmp) < 0) {
                FILE_OP_ERROR(tmp, "chmod");
-               g_warning("can't change file mode\n");
+               g_warning("can't change file mode");
        }
        
        addr = g_strdup(to);
@@ -859,7 +910,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        addrp = addr;
        
        /* write queue headers */
-       if (fprintf(fp, "AF:\n"
+       ok = fprintf(fp, "AF:\n"
                    "NF:0\n"
                    "PS:10\n"
                    "SRH:1\n"
@@ -875,14 +926,11 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                    "R:<%s>\n", 
                    account->address,
                    account->smtp_server?account->smtp_server:"",
-                   addrp) < 0) {
-               g_free(addrp);
-               fclose(fp);
-               claws_unlink(tmp);
-               return -1;
-       }
+                   addrp);
 
        g_free(addrp);
+       if (ok < 0)
+               goto FILE_ERROR;
        
        /* check whether we need to save the message */
        outbox = account_get_special_folder(account, F_OUTBOX); 
@@ -890,91 +938,61 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                outbox = NULL;
        if (outbox) {
                path = folder_item_get_identifier(outbox);
-               if (fprintf(fp, "SCF:%s\n", path) < 0) {
-                       g_free(path);
-                       fclose(fp);
-                       claws_unlink(tmp);
-                       return -1;
-               }
+               ok = fprintf(fp, "SCF:%s\n", path);
                g_free(path);
+               
+               if (ok < 0)
+                       goto FILE_ERROR;
        }               
 
-       if (fprintf(fp, "X-Claws-End-Special-Headers: 1\n") < 0) {
-               fclose(fp);
-               claws_unlink(tmp);
-               return -1;
-       }
+       if (fprintf(fp, "X-Claws-End-Special-Headers: 1\n") < 0)
+               goto FILE_ERROR;
 
        /* Date */
-       get_rfc822_date(buf, sizeof(buf));
-       if (fprintf(fp, "Date: %s\n", buf) < 0) {
-               fclose(fp);
-               claws_unlink(tmp);
-               return -1;
-       }
+       get_rfc822_date(buf_date, sizeof(buf_date));
+       if (fprintf(fp, "Date: %s\n", buf_date) < 0)
+               goto FILE_ERROR;
 
        /* From */
        if (account->name && *account->name) {
-               notification_convert_header
-                       (buf, sizeof(buf), account->name,
-                        strlen("From: "));
+               notification_convert_header(&buf, account->name, strlen("From: "));
+               if (buf == NULL)
+                       goto FILE_ERROR;
                if (fprintf(fp, "From: %s <%s>\n", buf, account->address) < 0) {
-                       fclose(fp);
-                       claws_unlink(tmp);
-                       return -1;
+                       g_free(buf);
+                       goto FILE_ERROR;
                }
+               g_free(buf);
+               buf = NULL;
        } else
-               if (fprintf(fp, "From: %s\n", account->address) < 0) {
-                       fclose(fp);
-                       claws_unlink(tmp);
-                       return -1;
-               }
+               goto FILE_ERROR;
 
-
-       if (fprintf(fp, "To: %s\n", to) < 0) {
-               fclose(fp);
-               claws_unlink(tmp);
-               return -1;
-       }
+       if (fprintf(fp, "To: %s\n", to) < 0)
+               goto FILE_ERROR;
 
        /* Subject */
-       notification_convert_header(buf, sizeof(buf), msginfo->subject,
-                                   strlen("Subject: "));
+       notification_convert_header(&buf, msginfo->subject, strlen("Subject: "));
+       if (buf == NULL)
+               goto FILE_ERROR;
        if (fprintf(fp, "Subject: Disposition notification: %s\n", buf) < 0) {
-               fclose(fp);
-               claws_unlink(tmp);
-               return -1;
+               g_free(buf);
+               goto FILE_ERROR;
        }
+       g_free(buf);
+       buf = NULL;
 
        /* Message ID */
-       if (account->set_domain && account->domain) {
-               g_snprintf(buf, sizeof(buf), "%s", account->domain); 
-       } else if (!strncmp(get_domain_name(), "localhost", strlen("localhost"))) {
-               g_snprintf(buf, sizeof(buf), "%s", 
-                       strchr(account->address, '@') ?
-                               strchr(account->address, '@')+1 :
-                               account->address);
-       } else {
-               g_snprintf(buf, sizeof(buf), "%s", "");
-       }
-       
        if (account->gen_msgid) {
-               gchar *addr = NULL;
-               if (account->msgid_with_addr) {
-                       addr = account->address;
-               }
-               generate_msgid(buf, sizeof(buf), addr);
-
-               if (fprintf(fp, "Message-ID: <%s>\n", buf) < 0) {
-                       fclose(fp);
-                       claws_unlink(tmp);
-                       return -1;
+               gchar *addr = prefs_account_generate_msgid(account);
+               if (fprintf(fp, "Message-ID: <%s>\n", addr) < 0) {
+                       g_free(addr);
+                       goto FILE_ERROR;
                }
+               g_free(addr);
        }
 
        boundary = generate_mime_boundary("DN");
-       get_rfc822_date(buf, sizeof(buf));
-       date = g_strdup(buf);
+       date = g_strdup(buf_date);
        if (msginfo->to) {
                orig_to = g_strdup(msginfo->to);
                extract_address(orig_to);
@@ -984,7 +1002,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                qp_encode_line(enc_sub, (const guchar *)msginfo->subject);
                g_strstrip(enc_sub);
        }
-       if (fprintf(fp, "MIME-Version: 1.0\n"
+       ok = fprintf(fp,"MIME-Version: 1.0\n"
                        "Content-Type: multipart/report; report-type=disposition-notification;\n"
                        "  boundary=\"%s\"\n"
                        "\n"
@@ -1010,6 +1028,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                        "\n"
                        "--%s\n"
                        "Content-Type: application/octet-stream\n"
+                       "\n"
                        "Reporting-UA: %s\n"
                        "Original-Recipient: rfc822;%s\n"
                        "Final-Recipient: rfc822;%s\n"
@@ -1033,20 +1052,18 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                        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;
-       }
+                       boundary);
 
        g_free(enc_sub);
        g_free(orig_to);
        g_free(date);
        g_free(boundary);
 
-       if (fclose(fp) == EOF) {
-               FILE_OP_ERROR(tmp, "fclose");
+       if (ok < 0)
+               goto FILE_ERROR;        
+
+       if (claws_safe_fclose(fp) == EOF) {
+               FILE_OP_ERROR(tmp, "claws_fclose");
                claws_unlink(tmp);
                return -1;
        }
@@ -1055,13 +1072,13 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        queue = account_get_special_folder(account, F_QUEUE);
        if (!queue) queue = folder_get_default_queue();
        if (!queue) {
-               g_warning("can't find queue folder\n");
+               g_warning("can't find queue folder");
                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_warning("can't queue the message");
                claws_unlink(tmp);
                return -1;
        }
@@ -1074,13 +1091,18 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 
        /* send it */
        path = folder_item_fetch_msg(queue, num);
-       ok = procmsg_send_message_queue(path, &foo, queue, num, &queued_removed);
+       ok = procmsg_send_message_queue_with_lock(path, &foo, queue, num, &queued_removed);
        g_free(path);
        g_free(foo);
        if (ok == 0 && !queued_removed)
                folder_item_remove_msg(queue, num);
 
        return ok;
+
+FILE_ERROR:
+       claws_fclose(fp);
+       claws_unlink(tmp);
+       return -1;
 }
 
 static gboolean find_encrypted_func(GNode *node, gpointer data)
@@ -1129,12 +1151,177 @@ static MimeInfo *find_broken_part(MimeInfo *rootinfo)
        return brokeninfo;
 }
 
+static void messageview_register_nav(MessageView *messageview)
+{
+       gchar *id;
+       gint pos = -1;
+       GList *existing;
+
+       cm_return_if_fail(messageview);
+       cm_return_if_fail(messageview->msginfo);
+
+       id = procmsg_msginfo_get_identifier(messageview->msginfo);
+       existing = g_list_find_custom(messageview->trail, id, (GCompareFunc)g_strcmp0);
+
+       if (existing != NULL)
+               pos = g_list_position(messageview->trail, existing);
+       else
+               pos = -1;
+
+       if (pos != -1) {
+               messageview->trail_pos = pos;
+               g_free(id);
+       } else {
+               /* Cut the end of the list */
+               GList *end = g_list_nth(messageview->trail, messageview->trail_pos + 1);
+               if (end) {
+                       if (end->prev) {
+                               end->prev->next = NULL;
+                               end->prev = NULL;
+                               list_free_strings_full(end);
+                       } else {
+                               list_free_strings_full(messageview->trail);
+                               messageview->trail = NULL;
+                       }
+               }
+               messageview->trail = g_list_append(messageview->trail, id);
+               messageview->trail_pos = (gint)g_list_length(messageview->trail) - 1;
+               
+               /* Cut the beginning if needed */
+               while (messageview->trail_pos > prefs_common.nav_history_length) {
+                       g_free(messageview->trail->data);
+                       messageview->trail = g_list_delete_link(messageview->trail,
+                                               messageview->trail);
+                       messageview->trail_pos--;
+               }
+       }
+       messageview_set_menu_sensitive(messageview);
+}
+
+gboolean messageview_nav_has_prev(MessageView *messageview) {
+       return messageview != NULL && messageview->trail != NULL
+               && messageview->trail_pos > 0;
+}
+
+gboolean messageview_nav_has_next(MessageView *messageview) {
+       if (!messageview || !messageview->trail)
+               return FALSE;
+       
+       return sc_g_list_bigger(messageview->trail, messageview->trail_pos + 1);
+}
+
+MsgInfo *messageview_nav_get_prev(MessageView *messageview) {
+       GList *item;
+       MsgInfo *info;
+
+       cm_return_val_if_fail(messageview, NULL);
+       cm_return_val_if_fail(messageview->trail, NULL);
+
+       do {
+               if (!messageview_nav_has_prev(messageview))
+                       return NULL;
+
+               item = g_list_nth(messageview->trail, messageview->trail_pos - 1);
+               cm_return_val_if_fail(item != NULL, NULL);
+
+               info = procmsg_get_msginfo_from_identifier((const gchar *)item->data);
+               if (info != NULL)
+                       break;
+
+               g_free(item->data);
+               messageview->trail = g_list_delete_link(messageview->trail, item);
+               if (messageview->trail_pos > 0)
+                       messageview->trail_pos--;
+       } while (info == NULL);
+
+       return info;
+}
+
+MsgInfo *messageview_nav_get_next(MessageView *messageview) {
+       GList *item;
+       MsgInfo *info;
+
+       cm_return_val_if_fail(messageview, NULL);
+       cm_return_val_if_fail(messageview->trail, NULL);
+
+       do {
+               if (!messageview_nav_has_next(messageview))
+                       return NULL;
+
+               item = g_list_nth(messageview->trail, messageview->trail_pos + 1);
+               cm_return_val_if_fail(item != NULL, NULL);
+
+               info = procmsg_get_msginfo_from_identifier((const gchar *)item->data);
+               if (info != NULL)
+                       break;
+
+               g_free(item->data);
+               messageview->trail = g_list_delete_link(messageview->trail, item);
+       } while (info == NULL);
+       
+       return info;
+}
+
+static gboolean messageview_try_select_mimeinfo(MessageView *messageview, MsgInfo *msginfo, MimeInfo *mimeinfo)
+{
+       if (mimeinfo->type == MIMETYPE_TEXT) {
+               if (!strcasecmp(mimeinfo->subtype, "calendar")
+                               && mimeview_has_viewer_for_content_type(messageview->mimeview, "text/calendar")) {
+                       mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
+                       return TRUE;
+               } else if (!strcasecmp(mimeinfo->subtype, "html")
+                               && mimeinfo->disposition != DISPOSITIONTYPE_ATTACHMENT
+                               && ((msginfo->folder && msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_ALWAYS)
+                                       || ((msginfo->folder && msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_DEFAULT)
+                                               && prefs_common.promote_html_part))) {
+                       mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
+                       return TRUE;
+               }
+       }
+       return FALSE;
+}
+
+static void messageview_find_part_depth_first(MimeInfoSearch *context, MimeMediaType type, const gchar *subtype)
+{
+       MimeInfo * mimeinfo = context->current;
+
+       if (!mimeinfo)
+               return;
+
+       debug_print("found part %d/%s\n", mimeinfo->type, mimeinfo->subtype);
+
+       if (mimeinfo->type == type
+                       && !strcasecmp(mimeinfo->subtype, subtype)) {
+               context->found = mimeinfo;
+       } else if (mimeinfo->type == MIMETYPE_MULTIPART) {
+               if (!strcasecmp(mimeinfo->subtype, "alternative")
+                               || !strcasecmp(mimeinfo->subtype, "related")) {
+                       context->found = procmime_mimeinfo_next(mimeinfo);
+                       while (context->found && context->found != context->parent) {
+                               if (context->found->type == type
+                                       && !strcasecmp(context->found->subtype, subtype))
+                                               break;
+                               context->found = procmime_mimeinfo_next(context->found);
+                       }
+                       if (context->found == context->parent)
+                               context->found = NULL;
+               }
+               if (!context->found
+                       && (!strcasecmp(mimeinfo->subtype, "related")
+                               || !strcasecmp(mimeinfo->subtype, "mixed"))) {
+                       context->parent = mimeinfo;
+                       context->current = procmime_mimeinfo_next(mimeinfo);
+                       messageview_find_part_depth_first(context, type, subtype);
+               }
+       }
+}
+
 gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                      gboolean all_headers)
 {
        gchar *text = NULL;
        gchar *file;
-       MimeInfo *mimeinfo, *encinfo, *brokeninfo;
+       MimeInfo *mimeinfo, *encinfo, *root;
        gchar *subject = NULL;
        cm_return_val_if_fail(msginfo != NULL, -1);
 
@@ -1176,16 +1363,16 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        messageview->updating = TRUE;
 
        if (msginfo->size > 1024*1024)
-               statuswindow_print_all(_("Fetching message (%s)..."),
+               statusbar_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();
+               statusbar_pop_all();
 
        if (!file) {
-               g_warning("can't get message file path.\n");
+               g_warning("can't get message file path.");
                textview_show_error(messageview->mimeview->textview);
                return -1;
        }
@@ -1226,7 +1413,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        }
                        
        if (messageview->msginfo != msginfo) {
-               procmsg_msginfo_free(messageview->msginfo);
+               procmsg_msginfo_free(&(messageview->msginfo));
                messageview->msginfo = NULL;
                messageview_set_menu_sensitive(messageview);
                messageview->msginfo = 
@@ -1238,16 +1425,12 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                messageview_set_menu_sensitive(messageview);
                messageview->msginfo = msginfo;
        }
-       headerview_show(messageview->headerview, messageview->msginfo);
+       if (prefs_common.display_header_pane)
+               headerview_show(messageview->headerview, messageview->msginfo);
 
+       messageview_register_nav(messageview);
        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"));
@@ -1273,7 +1456,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                g_free(subject);
        }
 
-       if (msginfo && msginfo->folder) {
+       if (msginfo->folder) {
                msginfo->folder->last_seen = msginfo->msgnum;   
        }
 
@@ -1293,7 +1476,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                return_receipt_show(messageview->noticeview, 
                                    messageview->msginfo);
 
-       if ((brokeninfo = find_broken_part(mimeinfo)) != NULL) {
+       if (find_broken_part(mimeinfo) != NULL) {
                noticeview_set_icon(messageview->noticeview,
                                    STOCK_PIXMAP_NOTICE_WARN);
                if (!noticeview_is_visible(messageview->noticeview)) {
@@ -1313,78 +1496,41 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                noticeview_show(messageview->noticeview);
        }
                        
+       root = mimeinfo;
        mimeinfo = procmime_mimeinfo_next(mimeinfo);
-       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 (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, "calendar") &&
-                                           mimeview_has_viewer_for_content_type(messageview->mimeview,
-                                                                                "text/calendar")) {
-                                               mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
+       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")) {
+                       MimeInfoSearch context = {
+                               .parent = root,
+                               .current = mimeinfo,
+                               .found = NULL
+                       };
+                       if (mimeview_has_viewer_for_content_type(messageview->mimeview, "text/calendar")) {
+                               MimeInfoSearch cal_context = context;
+                               messageview_find_part_depth_first(&cal_context, MIMETYPE_TEXT, "calendar");
+                               if (cal_context.found) { /* calendar found */
+                                       mimeinfo = cal_context.found;
+                                       if (messageview_try_select_mimeinfo(messageview, msginfo, mimeinfo))
                                                goto done;
-                                       } else if (mimeinfo->type == MIMETYPE_TEXT && 
-                                           !strcasecmp(mimeinfo->subtype, "html") &&
-                                           prefs_common.promote_html_part) {
-                                               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 (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, "calendar") &&
-                                           mimeview_has_viewer_for_content_type(messageview->mimeview,
-                                                                                "text/calendar")) {
-                                               mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
-                                               goto done;
-                                       } else if (mimeinfo->type == MIMETYPE_TEXT && 
-                                           !strcasecmp(mimeinfo->subtype, "html") &&
-                                           prefs_common.promote_html_part) {
-                                               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);
+                       messageview_find_part_depth_first(&context, MIMETYPE_TEXT, "html");
+                       if (context.found &&
+                           ((msginfo->folder && msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_ALWAYS) ||
+                            ((msginfo->folder && msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_DEFAULT) &&
+                             prefs_common.promote_html_part))) { /* html found */
+                               mimeinfo = context.found;
+                               if (messageview_try_select_mimeinfo(messageview, msginfo, mimeinfo))
+                                       goto done;
+                       } else
+                               mimeinfo = root; /* nothing found */
+
+                       if (!mimeview_show_part(messageview->mimeview, mimeinfo))
+                               mimeview_select_mimepart_icon(messageview->mimeview, root);
                        goto done;
                } else if (prefs_common.invoke_plugin_on_html) {
                        mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
@@ -1404,7 +1550,10 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                        mimeinfo = procmime_mimeinfo_next(mimeinfo);
                }
        }
+
+       mimeview_select_mimepart_icon(messageview->mimeview, root);
 done:
+       messageview_set_menu_sensitive(messageview);
        /* plugins may hook in here to work with the message view */
        hooks_invoke(MESSAGE_VIEW_SHOW_DONE_HOOKLIST, messageview);
 
@@ -1429,9 +1578,16 @@ void messageview_clear(MessageView *messageview)
 {
        if (!messageview)
                return;
-       procmsg_msginfo_free(messageview->msginfo);
+       procmsg_msginfo_free(&(messageview->msginfo));
        messageview->msginfo = NULL;
        messageview->filtered = FALSE;
+
+       if (messageview->window) {
+               gtk_window_set_title(GTK_WINDOW(messageview->window), 
+                               _("Claws Mail - Message View"));
+               GTK_EVENTS_FLUSH();
+       }
+
        mimeview_clear(messageview->mimeview);
        headerview_clear(messageview->headerview);
        noticeview_hide(messageview->noticeview);
@@ -1450,10 +1606,9 @@ void messageview_destroy(MessageView *messageview)
                messageview->mainwin->summaryview->displayed = NULL;
                messageview->mainwin->summaryview->ext_messageview = NULL;
        }
-       if (!messageview->deferred_destroy) {
+       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 (fetching)\n");
@@ -1475,13 +1630,16 @@ void messageview_destroy(MessageView *messageview)
        mimeview_destroy(messageview->mimeview);
        noticeview_destroy(messageview->noticeview);
 
-       procmsg_msginfo_free(messageview->msginfo);
+       procmsg_msginfo_free(&(messageview->msginfo));
        toolbar_clear_list(TOOLBAR_MSGVIEW);
        if (messageview->toolbar) {
                toolbar_destroy(messageview->toolbar);
                g_free(messageview->toolbar);
        }
-       
+
+       message_search_close(messageview);
+
+       list_free_strings_full(messageview->trail);
        msgview_list = g_list_remove(msgview_list, messageview); 
 
        if (messageview->window)
@@ -1655,52 +1813,6 @@ gboolean messageview_is_visible(MessageView *messageview)
        return messageview->visible;
 }
 
-static void messageview_save_as(MessageView *messageview)
-{
-       gchar *filename = NULL;
-       MsgInfo *msginfo;
-       gchar *src, *dest, *tmp;
-
-       if (!messageview->msginfo) return;
-       msginfo = messageview->msginfo;
-
-       if (msginfo->subject) {
-               Xstrdup_a(filename, msginfo->subject, return);
-               subst_for_filename(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;
-
-               aval = alertpanel(_("Overwrite"),
-                                 _("Overwrite existing file?"),
-                                 GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL);
-               if (G_ALERTALTERNATE != aval) return;
-       }
-
-       src = procmsg_get_message_file(msginfo);
-       if (copy_file(src, dest, TRUE) < 0) {
-               tmp =  g_path_get_basename(dest);
-               alertpanel_error(_("Couldn't save the file '%s'."), tmp);
-               g_free(tmp);
-       }
-       g_free(dest);
-       g_free(src);
-}
-
 static gint messageview_delete_cb(GtkWidget *widget, GdkEventAny *event,
                                  MessageView *messageview)
 {
@@ -1716,26 +1828,22 @@ 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)
 {
-       if (event && event->keyval == GDK_Escape && messageview->window) {
+       if (event && event->keyval == GDK_KEY_Escape && messageview->window) {
                messageview_destroy(messageview);
                return TRUE;
        }
 
        if (event && (event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0)
                return FALSE;
-       if (event && (event->state & GDK_SHIFT_MASK) && event->keyval != GDK_space) 
+       if (event && (event->state & GDK_SHIFT_MASK) && event->keyval != GDK_KEY_space) 
                return FALSE;
 
-       g_signal_stop_emission_by_name(G_OBJECT(widget),
-                                       "key_press_event");
-       mimeview_pass_key_press_event(messageview->mimeview, event);
-       return FALSE;
+       return mimeview_pass_key_press_event(messageview->mimeview, event);
 }
-#endif
 
 static void messageview_show_partial_display_cb(NoticeView *noticeview, MessageView *messageview)
 {
@@ -1784,7 +1892,7 @@ static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
        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 : "
+                       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."));
@@ -1809,7 +1917,7 @@ static void return_receipt_send_clicked(NoticeView *noticeview, MsgInfo *msginfo
 
        file = procmsg_get_message_file_path(msginfo);
        if (!file) {
-               g_warning("can't get message file path.\n");
+               g_warning("can't get message file path.");
                return;
        }
 
@@ -1822,7 +1930,7 @@ static void return_receipt_send_clicked(NoticeView *noticeview, MsgInfo *msginfo
                noticeview_hide(noticeview);
        }               
 
-       procmsg_msginfo_free(tmpmsginfo);
+       procmsg_msginfo_free(&tmpmsginfo);
        g_free(file);
 }
 
@@ -1922,30 +2030,53 @@ static void select_account_cb(GtkWidget *w, gpointer data)
        *(gint*)data = combobox_get_active_data(GTK_COMBO_BOX(w));
 }
 
-static PrefsAccount *select_account_from_list(GList *ac_list)
+static PrefsAccount *select_account_from_list(GList *ac_list, gboolean has_accounts)
 {
        GtkWidget *optmenu;
        gint account_id;
+       AlertValue val;
 
        cm_return_val_if_fail(ac_list != NULL, NULL);
        cm_return_val_if_fail(ac_list->data != NULL, NULL);
-       
+
        optmenu = gtkut_account_menu_new(ac_list,
                        G_CALLBACK(select_account_cb),
                        &account_id);
        if (!optmenu)
                return NULL;
        account_id = ((PrefsAccount *) ac_list->data)->account_id;
-       if (alertpanel_with_widget(
+       if (!has_accounts) {
+               gchar *tr;
+               gchar *text;
+               tr = g_strdup(C_("'%s' stands for 'To' then 'Cc'",
+                   "This message is asking for a return receipt notification\n"
+                   "but according to its '%s' and '%s' headers it was not\n"
+                   "officially addressed to you.\n"
+                   "It is advised to not send the return receipt."));
+               text = g_strdup_printf(tr,
+                 prefs_common_translated_header_name("To"),
+                 prefs_common_translated_header_name("Cc"));
+               val = alertpanel_with_widget(
                                _("Return Receipt Notification"),
-                               _("The message was sent to several of your "
-                                 "accounts.\n"
-                                 "Please choose which account do you want to "
-                                 "use for sending the receipt notification:"),
-                               _("_Cancel"), _("_Send Notification"), NULL,
-                               FALSE, G_ALERTDEFAULT, optmenu) != G_ALERTALTERNATE)
+                               text,
+                               _("_Cancel"), _("_Send Notification"), NULL,
+                               ALERTFOCUS_FIRST, FALSE, optmenu);
+               g_free(tr);
+               g_free(text);
+       } else
+               val = alertpanel_with_widget(
+                               _("Return Receipt Notification"),
+                               _("More than one of your accounts uses the "
+                                "address that this message was sent to.\n"
+                                "Please choose which account you want to "
+                                "use for sending the receipt notification:"),
+                               _("_Cancel"), _("_Send Notification"), NULL,
+                               ALERTFOCUS_FIRST, FALSE, optmenu);
+
+       if (val != G_ALERTALTERNATE)
                return NULL;
-       return account_find_from_id(account_id);
+       else
+               return account_find_from_id(account_id);
 }
 
 /* 
@@ -1963,6 +2094,8 @@ gchar *messageview_get_selection(MessageView *msgview)
        GtkTextView *edit = NULL;
        GtkTextBuffer *textbuf;
        gint body_pos = 0;
+       GtkTextIter start_iter, end_iter;
+       GtkTextMark *body_start, *body_end;
        
        cm_return_val_if_fail(msgview != NULL, NULL);
 
@@ -1984,15 +2117,35 @@ gchar *messageview_get_selection(MessageView *msgview)
 
        textbuf = gtk_text_view_get_buffer(edit);
 
-       if (gtk_text_buffer_get_selection_bounds(textbuf, NULL, NULL))
+       if (gtk_text_buffer_get_selection_bounds(textbuf, NULL, NULL)) {
                return gtkut_text_view_get_selection(edit);
-       else if (msgview->filtered) {
-               GtkTextIter start_iter, end_iter;
-               gtk_text_buffer_get_iter_at_offset(textbuf, &start_iter, body_pos);
-               gtk_text_buffer_get_end_iter(textbuf, &end_iter);
-               gtk_text_buffer_get_text(textbuf, &start_iter, &end_iter, FALSE);
-       } else
-               text = NULL;
+       } else {
+               if (msgview->filtered) {
+                       gtk_text_buffer_get_iter_at_offset(textbuf, &start_iter, body_pos);
+                       gtk_text_buffer_get_end_iter(textbuf, &end_iter);
+               } else {
+                       body_start = gtk_text_buffer_get_mark(textbuf, "body_start");
+
+                       /* If there is no body_start mark, an attachment is likely
+                        * selected, and we're looking at instructions on what to do
+                        * with it. No point in quoting that, so we'll just return NULL,
+                        * so that original message body is quoted instead down the line.
+                        */
+                       if (body_start == NULL) {
+                               return NULL;
+                       }
+
+                       gtk_text_buffer_get_iter_at_mark(textbuf, &start_iter, body_start);
+
+                       body_end = gtk_text_buffer_get_mark(textbuf, "body_end");
+                       if (body_end != NULL) /* Just in case */
+                               gtk_text_buffer_get_iter_at_mark(textbuf, &end_iter, body_end);
+                       else
+                               gtk_text_buffer_get_end_iter(textbuf, &end_iter);
+               }
+
+               return gtk_text_buffer_get_text(textbuf, &start_iter, &end_iter, FALSE);
+       }
 
        return text;
 }
@@ -2000,7 +2153,7 @@ gchar *messageview_get_selection(MessageView *msgview)
 static void save_as_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
-       messageview_save_as(messageview);
+       summary_save_as(messageview->mainwin->summaryview);
 }
 
 static void print_mimeview(MimeView *mimeview, gint sel_start, gint sel_end, gint partnum) 
@@ -2036,7 +2189,10 @@ static void print_mimeview(MimeView *mimeview, gint sel_start, gint sel_end, gin
                mainwin = mainwindow_get_mainwindow();
                printing_print(GTK_TEXT_VIEW(mimeview->textview->text),
                               mainwin ? GTK_WINDOW(mainwin->window) : NULL,
-                               sel_start, sel_end);
+                               sel_start, sel_end,
+                               (mimeview->textview->image 
+                                       ? GTK_IMAGE(mimeview->textview->image)
+                                       : NULL));
        }
 }
 
@@ -2118,7 +2274,7 @@ static void prev_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        messageview->updating = TRUE;
-       summary_step(messageview->mainwin->summaryview, GTK_SCROLL_STEP_BACKWARD);
+       summary_select_prev(messageview->mainwin->summaryview);
        messageview->updating = FALSE;
 
        if (messageview->deferred_destroy) {
@@ -2143,7 +2299,7 @@ static void next_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        messageview->updating = TRUE;
-       summary_step(messageview->mainwin->summaryview, GTK_SCROLL_STEP_FORWARD);
+       summary_select_next(messageview->mainwin->summaryview);
        messageview->updating = FALSE;
 
        if (messageview->deferred_destroy) {
@@ -2364,28 +2520,39 @@ static void next_labeled_cb(GtkAction *action, gpointer data)
        }
 }
 
-static void last_read_cb(GtkAction *action, gpointer data)
+static void prev_history_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;
+       MsgInfo *info = messageview_nav_get_prev(messageview);
+       if (info) {
+               messageview->updating = TRUE;
+               messageview_show(messageview, info, 
+                                        messageview->all_headers);
+               messageview->updating = FALSE;
+               procmsg_msginfo_free(&info);
+               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, 
+}
+
+static void next_history_cb(GtkAction *action, gpointer data)
+{
+       MessageView *messageview = (MessageView *)data;
+       MsgInfo *info = messageview_nav_get_next(messageview);
+       if (info) {
+               messageview->updating = TRUE;
+               messageview_show(messageview, info, 
                                         messageview->all_headers);
-#endif
-       } else {
-               gtk_widget_destroy(messageview->window);
+               messageview->updating = FALSE;
+               procmsg_msginfo_free(&info);
+               if (messageview->deferred_destroy) {
+                       debug_print("messageview got away!\n");
+                       messageview_destroy(messageview);
+                       return;
+               }
        }
 }
 
@@ -2417,8 +2584,9 @@ static void parent_cb(GtkAction *action, gpointer data)
 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);
+       folderview_select_next_with_flag(messageview->mainwin->folderview, MSG_UNREAD);
        messageview->updating = FALSE;
 
        if (messageview->deferred_destroy) {
@@ -2442,11 +2610,10 @@ static void goto_unread_folder_cb(GtkAction *action, gpointer data)
 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);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL, FALSE,
+                       _("Select folder to go to"));
 
        if (to_folder) {
                folderview_select(messageview->mainwin->folderview, to_folder);
@@ -2470,6 +2637,30 @@ static void goto_folder_cb(GtkAction *action, gpointer data)
        }
 }
 
+static void scroll_prev_line_cb(GtkAction *action, gpointer data)
+{
+        MessageView *messageview = (MessageView *)data;
+        mimeview_scroll_one_line(messageview->mimeview,TRUE);
+}
+
+static void scroll_next_line_cb(GtkAction *action, gpointer data)
+{
+        MessageView *messageview = (MessageView *)data;
+        mimeview_scroll_one_line(messageview->mimeview,FALSE);
+}
+
+static void scroll_prev_page_cb(GtkAction *action, gpointer data)
+{
+        MessageView *messageview = (MessageView *)data;
+        mimeview_scroll_page(messageview->mimeview,TRUE);
+}
+
+static void scroll_next_page_cb(GtkAction *action, gpointer data)
+{
+        MessageView *messageview = (MessageView *)data;
+        mimeview_scroll_page(messageview->mimeview,FALSE);
+}
+
 static void set_charset_cb(GtkAction *action, GtkRadioAction *current, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
@@ -2526,13 +2717,14 @@ static void show_all_header_cb(GtkToggleAction *action, gpointer data)
        if (messageview->updating)
                return;
 
-       messageview->all_headers = 
+       messageview->all_headers = prefs_common.show_all_headers =
                        gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
        if (!msginfo) return;
        messageview->msginfo = NULL;
-       messageview_show(messageview, msginfo,gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
-       procmsg_msginfo_free(msginfo);
+       messageview_show(messageview, msginfo, messageview->all_headers);
+       procmsg_msginfo_free(&msginfo);
        main_window_set_menu_sensitive(messageview->mainwin);
+       summary_redisplay_msg(messageview->mainwin->summaryview);
 }
 
 static void msg_hide_quotes_cb(GtkToggleAction *action, gpointer data)
@@ -2545,24 +2737,24 @@ static void msg_hide_quotes_cb(GtkToggleAction *action, gpointer data)
                return;
        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;
+               if (!strcmp(a_name, "View/Quotes/CollapseAll")) prefs_common.hide_quotes = 1;
+               else if (!strcmp(a_name, "View/Quotes/Collapse2")) prefs_common.hide_quotes = 2;
+               else if (!strcmp(a_name, "View/Quotes/Collapse3")) prefs_common.hide_quotes = 3;
        } else
                prefs_common.hide_quotes = 0;
        
        updating_menu=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));
+       cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/CollapseAll", (prefs_common.hide_quotes == 1));
+       cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Collapse2", (prefs_common.hide_quotes == 2));
+       cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Collapse3", (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);
+       procmsg_msginfo_free(&msginfo);
        
        /* update main window */
        main_window_set_menu_sensitive(messageview->mainwin);
@@ -2582,7 +2774,7 @@ static void compose_cb(GtkAction *action, gpointer data)
        if (item) {
                ac = account_find_from_item(item);
                if (ac && ac->protocol == A_NNTP &&
-                   item->stype == F_NEWS) {
+                   FOLDER_TYPE(item->folder) == F_NEWS) {
                        compose_new(ac, item->path, NULL);
                        return;
                }
@@ -2617,7 +2809,17 @@ static void reply_cb(GtkAction *gaction, gpointer data)
 
 static void addressbook_open_cb(GtkAction *action, gpointer data)
 {
+#ifndef USE_ALT_ADDRBOOK
        addressbook_open(NULL);
+#else
+       GError* error = NULL;
+       
+       addressbook_dbus_open(FALSE, &error);
+       if (error) {
+               g_warning("Failed to open address book: %s", error->message);
+               g_error_free(error);
+       }
+#endif
 }
 
 static void add_address_cb(GtkAction *action, gpointer data)
@@ -2625,8 +2827,8 @@ static void add_address_cb(GtkAction *action, gpointer data)
        MessageView *messageview = (MessageView *)data;
        MsgInfo *msginfo, *full_msginfo;
        gchar *from;
-       GtkWidget *image = NULL;
        GdkPixbuf *picture = NULL;
+       AvatarRender *avatarr;
 
        if (!messageview->msginfo || !messageview->msginfo->from) 
                return;
@@ -2637,28 +2839,23 @@ static void add_address_cb(GtkAction *action, gpointer data)
        extract_address(from);
        
        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);
+       avatarr = avatars_avatarrender_new(full_msginfo);
+       hooks_invoke(AVATAR_IMAGE_RENDER_HOOKLIST, avatarr);
 
-       if (image)
-               gtk_widget_destroy(image);
+       procmsg_msginfo_free(&full_msginfo);
+
+       if (avatarr->image != NULL)
+               picture = gtk_image_get_pixbuf(GTK_IMAGE(avatarr->image));
+
+#ifndef USE_ALT_ADDRBOOK
+       addressbook_add_contact(msginfo->fromname, from, NULL, picture);
+#else
+       if (addressadd_selection(msginfo->fromname, from, NULL, picture)) {
+               debug_print( "addressbook_add_contact - added\n" );
+       }
+#endif
+       avatars_avatarrender_free(avatarr);
 }
 
 static void create_filter_cb(GtkAction *gaction, gpointer data)
@@ -2714,29 +2911,52 @@ static gboolean messageview_update_msg(gpointer source, gpointer data)
 {
        MsgInfoUpdate *msginfo_update = (MsgInfoUpdate *) source;
        MessageView *messageview = (MessageView *)data;
+       MsgInfo *old_msginfo = messageview->msginfo;
 
        if (messageview->msginfo != msginfo_update->msginfo)
                return FALSE;
 
-       if (msginfo_update->flags & MSGINFO_UPDATE_DELETED) {
-               MsgInfo *old_msginfo = messageview->msginfo;
-               messageview_clear(messageview);
-               messageview_update(messageview, old_msginfo);
-       }
+       if ((msginfo_update->flags & MSGINFO_UPDATE_DELETED) ||
+           MSG_IS_DELETED(old_msginfo->flags))
+       {
+               if (messageview->new_window) {
+                       if (old_msginfo->folder && old_msginfo->folder->total_msgs == 0) {
+                               messageview_clear(messageview);
+                               textview_show_info(messageview->mimeview->textview,
+                                       _("\n  There are no messages in this folder"));
+                               return FALSE;
+                       }
+                       
+                       if (!prefs_common.always_show_msg) {
+                               messageview_clear(messageview);
+                               textview_show_info(messageview->mimeview->textview,
+                                       MSG_IS_DELETED(old_msginfo->flags) ?
+                                       _("\n  Message has been deleted") :
+                                       _("\n  Message has been deleted or moved to another folder"));
+                       } else
+                               messageview->update_needed = TRUE;
+
+               } else {
+                       messageview_clear(messageview);
+                       messageview_update(messageview, old_msginfo);
+               }
+       } 
 
        return FALSE;
 }
 
 void messageview_set_menu_sensitive(MessageView *messageview)
 {
-       if (!messageview || !messageview->new_window) 
+       if (!messageview || !messageview->ui_manager)
                return;
-       /* do some smart things */
-       if (!messageview->menubar) return;
 
-       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));
+       cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/CollapseAll", (prefs_common.hide_quotes == 1));
+       cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Collapse2", (prefs_common.hide_quotes == 2));
+       cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Collapse3", (prefs_common.hide_quotes == 3));
+       cm_menu_set_sensitive_full(messageview->ui_manager, "Menu/View/Goto/PrevHistory", messageview_nav_has_prev(messageview));
+       cm_menu_set_sensitive_full(messageview->ui_manager, "Menu/View/Goto/NextHistory", messageview_nav_has_next(messageview));
+
+       cm_menu_set_sensitive_full(messageview->ui_manager, "Menu/Message/CheckSignature", messageview->mimeview->signed_part);
 }
 
 void messageview_learn (MessageView *msgview, gboolean is_spam)
@@ -2799,3 +3019,60 @@ void messageview_list_urls (MessageView  *msgview)
        g_slist_free(newlist);
        g_hash_table_destroy(uri_hashtable);
 }
+
+static void save_part_as_cb(GtkAction *action, gpointer data)
+{
+       MessageView *messageview = (MessageView *)data;
+
+       if (messageview->mimeview)
+               mimeview_save_as(messageview->mimeview);
+}
+
+static void view_part_as_text_cb(GtkAction *action, gpointer data)
+{
+       MessageView *messageview = (MessageView *)data;
+
+       if (messageview->mimeview)
+               mimeview_display_as_text(messageview->mimeview);
+}
+
+static void open_part_cb(GtkAction *action, gpointer data)
+{
+       MessageView *messageview = (MessageView *)data;
+
+       if (messageview->mimeview)
+               mimeview_launch(messageview->mimeview, NULL);
+}
+#ifndef G_OS_WIN32
+static void open_part_with_cb(GtkAction *action, gpointer data)
+{
+       MessageView *messageview = (MessageView *)data;
+
+       if (messageview->mimeview)
+               mimeview_open_with(messageview->mimeview);
+}
+#endif
+static void check_signature_cb(GtkAction *action, gpointer data)
+{
+       MessageView *messageview = (MessageView *)data;
+
+       if (messageview->mimeview)
+               mimeview_check_signature(messageview->mimeview);
+}
+
+static void goto_next_part_cb(GtkAction *action, gpointer data)
+{
+       MessageView *messageview = (MessageView *)data;
+
+       if (messageview->mimeview)
+               mimeview_select_next_part(messageview->mimeview);
+}
+
+static void goto_prev_part_cb(GtkAction *action, gpointer data)
+{
+       MessageView *messageview = (MessageView *)data;
+
+       if (messageview->mimeview)
+               mimeview_select_prev_part(messageview->mimeview);
+}
+