sync with 0.8.8cvs5
[claws.git] / src / prefs_common.c
index 3e6ba646afc6dc1c6167fc5c94c01b745c37f1ef..5bb3e391e5605fdfff6bbe6039b17535cd8de46a 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
 
 #include "intl.h"
 #include "main.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
 #include "prefs_common.h"
 #include "prefs_display_header.h"
 #include "prefs_summary_column.h"
 #include "folder.h"
 #include "filesel.h"
 #include "folderview.h"
+#include "stock_pixmap.h"
+#include "quote_fmt.h"
 
-#if USE_PSPELL
-#include "gtkspell.h"
+#if USE_ASPELL
+#include "gtkaspell.h"
 #endif
 
 PrefsCommon prefs_common;
@@ -76,10 +78,14 @@ static struct Receive {
        GtkObject *spinbtn_autochk_adj;
 
        GtkWidget *checkbtn_chkonstartup;
-       GtkWidget *checkbtn_noerrorpanel;
        GtkWidget *checkbtn_scan_after_inc;
 
 
+       GtkWidget *checkbtn_newmail_auto;
+       GtkWidget *checkbtn_newmail_manu;
+       GtkWidget *entry_newmail_notify_cmd;
+       GtkWidget *hbox_newmail_notify;
+
        GtkWidget *spinbtn_maxarticle;
        GtkObject *spinbtn_maxarticle_adj;
 } receive;
@@ -93,9 +99,7 @@ static struct Send {
        GtkWidget *checkbtn_queuemsg;
 
        GtkWidget *optmenu_charset;
-       
-       GtkWidget *checkbtn_returnreceipt;
-} send;
+} p_send;
 
 static struct Compose {
        GtkWidget *checkbtn_autosig;
@@ -105,37 +109,51 @@ static struct Compose {
        GtkWidget *text_fw_quotefmt;
 
        GtkWidget *checkbtn_autoextedit;
-
-       GtkWidget *checkbtn_reply_account_autosel;
-       GtkWidget *checkbtn_forward_account_autosel;
-       GtkWidget *checkbtn_reedit_account_autosel;
-
+       GtkWidget *spinbtn_undolevel;
+       GtkObject *spinbtn_undolevel_adj;
        GtkWidget *spinbtn_linewrap;
        GtkObject *spinbtn_linewrap_adj;
        GtkWidget *checkbtn_wrapquote;
+       GtkWidget *checkbtn_autowrap;
        GtkWidget *checkbtn_wrapatsend;
 
+       GtkWidget *checkbtn_reply_account_autosel;
+       GtkWidget *checkbtn_forward_account_autosel;
+       GtkWidget *checkbtn_reedit_account_autosel;
        GtkWidget *checkbtn_quote;
-       GtkWidget * checkbtn_forward_as_attachment;
-       GtkWidget * checkbtn_smart_wrapping;
-       GtkWidget * checkbtn_block_cursor;
+       GtkWidget *checkbtn_default_reply_list;
+       GtkWidget *checkbtn_forward_as_attachment;
+       GtkWidget *checkbtn_redirect_keep_from;
+       GtkWidget *checkbtn_smart_wrapping;
+       GtkWidget *checkbtn_block_cursor;
+       GtkWidget *checkbtn_reply_with_quote;
+       
+       GtkWidget *checkbtn_autosave;
+       GtkWidget *entry_autosave_length;
+} compose;
 
        /* spelling */
-#if USE_PSPELL
-       GtkWidget *checkbtn_enable_pspell;
-       GtkWidget *entry_pspell_path;
-       GtkWidget *btn_pspell_path;
+#if USE_ASPELL
+static struct Spelling {
+       GtkWidget *checkbtn_enable_aspell;
+       GtkWidget *entry_aspell_path;
+       GtkWidget *btn_aspell_path;
        GtkWidget *optmenu_dictionary;
+       GtkWidget *optmenu_sugmode;
+       GtkWidget *misspelled_btn;
+       GtkWidget *checkbtn_use_alternate;
+       GtkWidget *checkbtn_check_while_typing;
+} spelling;
 #endif
 
-} compose;
-
 static struct Quote {
        GtkWidget *entry_quotemark;
        GtkWidget *text_quotefmt;
 
        GtkWidget *entry_fw_quotemark;
        GtkWidget *text_fw_quotefmt;
+       
+       GtkWidget *entry_quote_chars;
 } quote;
 
 static struct Display {
@@ -147,15 +165,15 @@ static struct Display {
        GtkWidget *entry_boldfont;
 
        GtkWidget *chkbtn_folder_unread;
+       GtkWidget *entry_ng_abbrev_len;
+       GtkWidget *spinbtn_ng_abbrev_len;
+       GtkObject *spinbtn_ng_abbrev_len_adj;
 
        GtkWidget *chkbtn_transhdr;
 
        GtkWidget *chkbtn_swapfrom;
-       GtkWidget *chkbtn_hscrollbar;
        GtkWidget *chkbtn_useaddrbook;
        GtkWidget *chkbtn_expand_thread;
-       GtkWidget *chkbtn_bold_unread;
-
        GtkWidget *entry_datefmt;
 } display;
 
@@ -173,33 +191,37 @@ static struct Message {
        GtkWidget *spinbtn_scrollstep;
        GtkObject *spinbtn_scrollstep_adj;
        GtkWidget *chkbtn_halfpage;
+
+       GtkWidget *chkbtn_display_img;
+       GtkWidget *chkbtn_resize_image;
 } message;
 
 #if USE_GPGME
 static struct Privacy {
-       GtkWidget *checkbtn_default_encrypt;
-        GtkWidget *checkbtn_ascii_armored;
-       GtkWidget *checkbtn_default_sign;
        GtkWidget *checkbtn_auto_check_signatures;
        GtkWidget *checkbtn_gpg_signature_popup;
+       GtkWidget *checkbtn_store_passphrase;
+       GtkWidget *spinbtn_store_passphrase;
+       GtkObject *spinbtn_store_passphrase_adj;
        GtkWidget *checkbtn_passphrase_grab;
        GtkWidget *checkbtn_gpg_warning;
-       GtkWidget *optmenu_default_signkey;
 } privacy;
 #endif
 
 static struct Interface {
        /* GtkWidget *checkbtn_emacs; */
+       GtkWidget *checkbtn_show_msg_with_cursor;
        GtkWidget *checkbtn_openunread;
+       GtkWidget *checkbtn_mark_as_read_on_newwin;
        GtkWidget *checkbtn_openinbox;
        GtkWidget *checkbtn_immedexec;
-       GtkWidget *checkbtn_confonexit;
-       GtkWidget *checkbtn_cleanonexit;
-       GtkWidget *checkbtn_askonclean;
-       GtkWidget *checkbtn_warnqueued;
-       GtkWidget *checkbtn_addaddrbyclick;
        GtkWidget *optmenu_recvdialog;
+       GtkWidget *optmenu_senddialog;
+       GtkWidget *checkbtn_no_recv_err_panel;
+       GtkWidget *checkbtn_close_recv_dialog;
        GtkWidget *optmenu_nextunreadmsgdialog;
+       GtkWidget *entry_pixmap_theme;
+       GtkWidget *combo_pixmap_theme;
 } interface;
 
 static struct Other {
@@ -208,6 +230,19 @@ static struct Other {
        GtkWidget *printcmd_entry;
        GtkWidget *exteditor_combo;
        GtkWidget *exteditor_entry;
+       GtkWidget *checkbtn_addaddrbyclick;
+       GtkWidget *checkbtn_confonexit;
+       GtkWidget *checkbtn_cleanonexit;
+       GtkWidget *checkbtn_askonclean;
+       GtkWidget *checkbtn_warnqueued;
+        GtkWidget *checkbtn_cliplog;
+        GtkWidget *loglength_entry;
+#if 0
+#ifdef USE_OPENSSL
+       GtkWidget *checkbtn_ssl_ask_unknown_valid;
+#endif
+#endif
+
 } other;
 
 static struct MessageColorButtons {
@@ -216,9 +251,14 @@ static struct MessageColorButtons {
        GtkWidget *quote_level3_btn;
        GtkWidget *uri_btn;
        GtkWidget *tgt_folder_btn;
+       GtkWidget *signature_btn;
 } color_buttons;
 
-static GtkWidget *quote_desc_win;
+static struct KeybindDialog {
+       GtkWidget *window;
+       GtkWidget *combo;
+} keybind;
+
 static GtkWidget *font_sel_win;
 static guint font_sel_conn_id; 
 static GtkWidget *quote_color_win;
@@ -226,21 +266,20 @@ static GtkWidget *color_dialog;
 
 static void prefs_common_charset_set_data_from_optmenu(PrefParam *pparam);
 static void prefs_common_charset_set_optmenu         (PrefParam *pparam);
-#if USE_GPGME
-static void prefs_common_default_signkey_set_data_from_optmenu
-                                                       (PrefParam *pparam);
-static void prefs_common_default_signkey_set_optmenu   (PrefParam *pparam);
-static void prefs_common_ascii_armored_warning(GtkWidget* widget, 
-                                              gpointer unused);
-#endif
+static void prefs_common_recv_dialog_newmail_notify_toggle_cb  (GtkWidget *w,
+                                                                gpointer data);
 static void prefs_common_recv_dialog_set_data_from_optmenu(PrefParam *pparam);
 static void prefs_common_recv_dialog_set_optmenu(PrefParam *pparam);
+static void prefs_common_send_dialog_set_data_from_optmenu(PrefParam *pparam);
+static void prefs_common_send_dialog_set_optmenu(PrefParam *pparam);
 static void prefs_nextunreadmsgdialog_set_data_from_optmenu(PrefParam *pparam);
 static void prefs_nextunreadmsgdialog_set_optmenu(PrefParam *pparam);
 
-#if USE_PSPELL
-static void prefs_dictionary_set_data_from_optmenu(PrefParam *param);
-static void prefs_dictionary_set_optmenu(PrefParam *pparam);
+#if USE_ASPELL
+static void prefs_dictionary_set_data_from_optmenu     (PrefParam *param);
+static void prefs_dictionary_set_optmenu               (PrefParam *pparam);
+static void prefs_speller_sugmode_set_data_from_optmenu        (PrefParam *pparam);
+static void prefs_speller_sugmode_set_optmenu          (PrefParam *pparam);
 #endif
 
 
@@ -279,32 +318,39 @@ static PrefParam param[] = {
        {"check_on_startup", "FALSE", &prefs_common.chk_on_startup, P_BOOL,
         &receive.checkbtn_chkonstartup,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"noerrorpanel", "FALSE", &prefs_common.noerrorpanel, P_BOOL,
-        &receive.checkbtn_noerrorpanel,
-        prefs_set_data_from_toggle, prefs_set_toggle},
        {"scan_all_after_inc", "FALSE", &prefs_common.scan_all_after_inc,
         P_BOOL, &receive.checkbtn_scan_after_inc,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"newmail_notify_manu", "FALSE", &prefs_common.newmail_notify_manu,
+        P_BOOL, &receive.checkbtn_newmail_manu,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"newmail_notify_auto", "FALSE", &prefs_common.newmail_notify_auto,
+       P_BOOL, &receive.checkbtn_newmail_auto,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"newmail_notify_cmd", "", &prefs_common.newmail_notify_cmd, P_STRING,
+        &receive.entry_newmail_notify_cmd,
+        prefs_set_data_from_entry, prefs_set_entry},
        {"max_news_articles", "300", &prefs_common.max_articles, P_INT,
         &receive.spinbtn_maxarticle,
         prefs_set_data_from_spinbtn, prefs_set_spinbtn},
 
        /* Send */
        {"use_ext_sendmail", "FALSE", &prefs_common.use_extsend, P_BOOL,
-        &send.checkbtn_extsend,
+        &p_send.checkbtn_extsend,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"ext_sendmail_cmd", DEFAULT_SENDMAIL_CMD,
         &prefs_common.extsend_cmd, P_STRING,
-        &send.entry_extsend, prefs_set_data_from_entry, prefs_set_entry},
+        &p_send.entry_extsend, prefs_set_data_from_entry, prefs_set_entry},
        {"save_message", "TRUE", &prefs_common.savemsg, P_BOOL,
-        &send.checkbtn_savemsg,
+        &p_send.checkbtn_savemsg,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"queue_message", "FALSE", &prefs_common.queue_msg, P_BOOL,
-        &send.checkbtn_queuemsg,
+        &p_send.checkbtn_queuemsg,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"outgoing_charset", CS_AUTO, &prefs_common.outgoing_charset, P_STRING,
-        &send.optmenu_charset,
+        &p_send.optmenu_charset,
         prefs_common_charset_set_data_from_optmenu,
         prefs_common_charset_set_optmenu},
 
@@ -318,39 +364,66 @@ static PrefParam param[] = {
        {"auto_ext_editor", "FALSE", &prefs_common.auto_exteditor, P_BOOL,
         &compose.checkbtn_autoextedit,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"forward_as_attachment", "FALSE", &prefs_common.forward_as_attachment,
+        P_BOOL, &compose.checkbtn_forward_as_attachment,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"redirect_keep_from", "FALSE",
+        &prefs_common.redirect_keep_from, P_BOOL,
+        &compose.checkbtn_redirect_keep_from,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"undo_level", "50", &prefs_common.undolevels, P_INT,
+        &compose.spinbtn_undolevel,
+        prefs_set_data_from_spinbtn, prefs_set_spinbtn},
+       {"block_cursor", "FALSE", &prefs_common.block_cursor,
+        P_BOOL, &compose.checkbtn_block_cursor,
+        prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"linewrap_length", "74", &prefs_common.linewrap_len, P_INT,
+       {"linewrap_length", "72", &prefs_common.linewrap_len, P_INT,
         &compose.spinbtn_linewrap,
         prefs_set_data_from_spinbtn, prefs_set_spinbtn},
        {"linewrap_quotation", "FALSE", &prefs_common.linewrap_quote, P_BOOL,
         &compose.checkbtn_wrapquote,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"linewrap_auto", "FALSE", &prefs_common.autowrap, P_BOOL,
+        &compose.checkbtn_autowrap,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"linewrap_before_sending", "FALSE",
         &prefs_common.linewrap_at_send, P_BOOL,
         &compose.checkbtn_wrapatsend,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"forward_as_attachment", "FALSE", &prefs_common.forward_as_attachment,
-        P_BOOL, &compose.checkbtn_forward_as_attachment,
-        prefs_set_data_from_toggle, prefs_set_toggle},
         {"smart_wrapping", "TRUE", &prefs_common.smart_wrapping,
         P_BOOL, &compose.checkbtn_smart_wrapping,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"block_cursor", "FALSE", &prefs_common.block_cursor,
-        P_BOOL, &compose.checkbtn_block_cursor,
+        {"autosave", "FALSE", &prefs_common.autosave,
+        P_BOOL, &compose.checkbtn_autosave,
         prefs_set_data_from_toggle, prefs_set_toggle},
-#if USE_PSPELL
-       {"enable_pspell", "TRUE", &prefs_common.enable_pspell,
-        P_BOOL, &compose.checkbtn_enable_pspell,
+        {"autosave_length", "50", &prefs_common.autosave_length,
+        P_INT, &compose.entry_autosave_length,
+        prefs_set_data_from_entry, prefs_set_entry},
+#if USE_ASPELL
+       {"enable_aspell", "TRUE", &prefs_common.enable_aspell,
+        P_BOOL, &spelling.checkbtn_enable_aspell,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"pspell_path", "/usr/local/share/pspell/", &prefs_common.pspell_path, 
-        P_STRING, &compose.entry_pspell_path, 
+       {"aspell_path", ASPELL_PATH, &prefs_common.aspell_path, 
+        P_STRING, &spelling.entry_aspell_path, 
         prefs_set_data_from_entry, prefs_set_entry},
        {"dictionary",  "", &prefs_common.dictionary,
-        P_STRING, &compose.optmenu_dictionary, 
+        P_STRING, &spelling.optmenu_dictionary, 
         prefs_dictionary_set_data_from_optmenu, prefs_dictionary_set_optmenu },
+       {"aspell_sugmode",  "1", &prefs_common.aspell_sugmode,
+        P_INT, &spelling.optmenu_sugmode, 
+        prefs_speller_sugmode_set_data_from_optmenu, prefs_speller_sugmode_set_optmenu },
+       {"use_alternate_dict", "FALSE", &prefs_common.use_alternate,
+        P_BOOL, &spelling.checkbtn_use_alternate,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"check_while_typing", "TRUE", &prefs_common.check_while_typing,
+        P_BOOL, &spelling.checkbtn_check_while_typing,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"misspelled_color", "16711680", &prefs_common.misspelled_col, P_INT,
+        NULL, NULL, NULL},
 #endif
        {"reply_with_quote", "TRUE", &prefs_common.reply_with_quote, P_BOOL,
-        NULL, NULL, NULL},
+        &compose.checkbtn_reply_with_quote, prefs_set_data_from_toggle, prefs_set_toggle},
 
        /* Account autoselection */
        {"reply_account_autoselect", "TRUE",
@@ -366,6 +439,10 @@ static PrefParam param[] = {
         &compose.checkbtn_reedit_account_autosel,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
+       {"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL,
+        &compose.checkbtn_default_reply_list,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
        {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
         NULL, NULL, NULL},
 
@@ -376,15 +453,17 @@ static PrefParam param[] = {
         &prefs_common.quotefmt, P_STRING, &quote.text_quotefmt,
         prefs_set_data_from_text, prefs_set_text},
 
-       {"fw_quote_mark", "> ", &prefs_common.fw_quotemark, P_STRING,
+       {"forward_quote_mark", "> ", &prefs_common.fw_quotemark, P_STRING,
         &quote.entry_fw_quotemark,
         prefs_set_data_from_entry, prefs_set_entry},
-       {"fw_quote_format",
+       {"forward_quote_format",
         "\\n\\nBegin forwarded message:\\n\\n"
-        "?d(Date: %d\\n)?f(From: %f\\n)?t(To: %t\\n)?c(Cc: %c\\n)"
-        "?n(Newsgroups: %n\\n)?s(Subject: %s\\n)\\n\\n%M",
+        "?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t\\n}?c{Cc: %c\\n}"
+        "?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M",
         &prefs_common.fw_quotefmt, P_STRING, &quote.text_fw_quotefmt,
         prefs_set_data_from_text, prefs_set_text},
+       {"quote_chars", ">", &prefs_common.quote_chars, P_STRING,
+        &quote.entry_quote_chars, prefs_set_data_from_entry, prefs_set_entry},
 
        /* Display */
        {"widget_font", NULL, &prefs_common.widgetfont, P_STRING,
@@ -411,18 +490,19 @@ static PrefParam param[] = {
         &prefs_common.display_folder_unread, P_BOOL,
         &display.chkbtn_folder_unread,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"newsgroup_abbrev_len", "16",
+        &prefs_common.ng_abbrev_len, P_INT,
+        &display.spinbtn_ng_abbrev_len,
+        prefs_set_data_from_spinbtn, prefs_set_spinbtn},
 
        {"translate_header", "TRUE", &prefs_common.trans_hdr, P_BOOL,
         &display.chkbtn_transhdr,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        /* Display: Summary View */
-       {"enable_swap_from", "TRUE", &prefs_common.swap_from, P_BOOL,
+       {"enable_swap_from", "FALSE", &prefs_common.swap_from, P_BOOL,
         &display.chkbtn_swapfrom,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
-        &display.chkbtn_hscrollbar,
-        prefs_set_data_from_toggle, prefs_set_toggle},
        {"use_address_book", "TRUE", &prefs_common.use_addr_book, P_BOOL,
         &display.chkbtn_useaddrbook,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -432,17 +512,24 @@ static PrefParam param[] = {
        {"expand_thread", "TRUE", &prefs_common.expand_thread, P_BOOL,
         &display.chkbtn_expand_thread,
         prefs_set_data_from_toggle, prefs_set_toggle},
+
+       {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
+        NULL, NULL, NULL},
        {"bold_unread", "TRUE", &prefs_common.bold_unread, P_BOOL,
-        &display.chkbtn_bold_unread,
-        prefs_set_data_from_toggle, prefs_set_toggle},
+        NULL, NULL, NULL},
 
        {"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL,
         NULL, NULL, NULL},
-       
        {"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM,
         NULL, NULL, NULL},
        {"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
         NULL, NULL, NULL},
+       {"show_searchbar", "TRUE", &prefs_common.show_searchbar, P_BOOL,
+        NULL, NULL, NULL},
+
+       {"folderview_vscrollbar_policy", "0",
+        &prefs_common.folderview_vscrollbar_policy, P_ENUM,
+        NULL, NULL, NULL},
 
        {"summary_col_show_mark", "TRUE",
         &prefs_common.summary_col_visible[S_COL_MARK], P_BOOL, NULL, NULL, NULL},
@@ -566,7 +653,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_INT,
         NULL, NULL, NULL},
-       {"signature_color", "0", &prefs_common.sig_col, P_USHORT,
+       {"signature_color", "7960953", &prefs_common.signature_col, P_INT,
         NULL, NULL, NULL},
        {"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors,
         P_BOOL, NULL, NULL, NULL},
@@ -598,6 +685,13 @@ static PrefParam param[] = {
         &message.chkbtn_halfpage,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
+       {"display_img", "TRUE", &prefs_common.display_img, P_BOOL,
+        &message.chkbtn_display_img,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"resize_image", "TRUE", &prefs_common.resize_image, P_BOOL,
+        &message.chkbtn_resize_image,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
        {"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL,
         NULL, NULL, NULL},
 
@@ -611,15 +705,6 @@ static PrefParam param[] = {
 
 #if USE_GPGME
        /* Privacy */
-       {"default_encrypt", "FALSE", &prefs_common.default_encrypt, P_BOOL,
-        &privacy.checkbtn_default_encrypt,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-       {"ascii_armored", "FALSE", &prefs_common.ascii_armored, P_BOOL,
-        &privacy.checkbtn_ascii_armored,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-       {"default_sign", "FALSE", &prefs_common.default_sign, P_BOOL,
-        &privacy.checkbtn_default_sign,
-        prefs_set_data_from_toggle, prefs_set_toggle},
        {"auto_check_signatures", "TRUE",
         &prefs_common.auto_check_signatures, P_BOOL,
         &privacy.checkbtn_auto_check_signatures,
@@ -628,6 +713,13 @@ static PrefParam param[] = {
         &prefs_common.gpg_signature_popup, P_BOOL,
         &privacy.checkbtn_gpg_signature_popup,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"store_passphrase", "FALSE", &prefs_common.store_passphrase, P_BOOL,
+        &privacy.checkbtn_store_passphrase,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"store_passphrase_timeout", "0",
+        &prefs_common.store_passphrase_timeout, P_INT,
+        &privacy.spinbtn_store_passphrase,
+        prefs_set_data_from_spinbtn, prefs_set_spinbtn},
 #ifndef __MINGW32__
        {"passphrase_grab", "FALSE", &prefs_common.passphrase_grab, P_BOOL,
         &privacy.checkbtn_passphrase_grab,
@@ -636,10 +728,6 @@ static PrefParam param[] = {
        {"gpg_warning", "TRUE", &prefs_common.gpg_warning, P_BOOL,
         &privacy.checkbtn_gpg_warning,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"default_signkey", CS_AUTO, &prefs_common.default_signkey, P_STRING,
-        &privacy.optmenu_default_signkey,
-        prefs_common_default_signkey_set_data_from_optmenu,
-        prefs_common_default_signkey_set_optmenu},
 #endif /* USE_GPGME */
 
        /* Interface */
@@ -650,11 +738,18 @@ static PrefParam param[] = {
 
        /* {"emulate_emacs", "FALSE", &prefs_common.emulate_emacs, P_BOOL,
         NULL, NULL, NULL}, */
-
+       {"show_message_with_cursor_key", "FALSE",
+        &prefs_common.show_msg_with_cursor_key,
+        P_BOOL, &interface.checkbtn_show_msg_with_cursor,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"open_unread_on_enter", "FALSE", &prefs_common.open_unread_on_enter,
         P_BOOL, &interface.checkbtn_openunread,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"open_inbox_on_inc", "TRUE", &prefs_common.open_inbox_on_inc,
+       {"mark_as_read_on_new_window", "FALSE",
+        &prefs_common.mark_as_read_on_new_window,
+        P_BOOL, &interface.checkbtn_mark_as_read_on_newwin,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"open_inbox_on_inc", "FALSE", &prefs_common.open_inbox_on_inc,
         P_BOOL, &interface.checkbtn_openinbox,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"immediate_execution", "TRUE", &prefs_common.immediate_exec, P_BOOL,
@@ -664,44 +759,78 @@ static PrefParam param[] = {
         &interface.optmenu_recvdialog,
         prefs_common_recv_dialog_set_data_from_optmenu,
         prefs_common_recv_dialog_set_optmenu},
+       {"send_dialog_mode", "0", &prefs_common.send_dialog_mode, P_ENUM,
+        &interface.optmenu_senddialog,
+        prefs_common_send_dialog_set_data_from_optmenu,
+        prefs_common_send_dialog_set_optmenu},
+       {"no_receive_error_panel", "FALSE", &prefs_common.no_recv_err_panel,
+        P_BOOL, &interface.checkbtn_no_recv_err_panel,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"close_receive_dialog", "TRUE", &prefs_common.close_recv_dialog,
+        P_BOOL, &interface.checkbtn_close_recv_dialog,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"nextunreadmsg_dialog", NULL, &prefs_common.next_unread_msg_dialog, P_ENUM,
         &interface.optmenu_nextunreadmsgdialog,
         prefs_nextunreadmsgdialog_set_data_from_optmenu,
         prefs_nextunreadmsgdialog_set_optmenu},
 
+       {"pixmap_theme_path", DEFAULT_PIXMAP_THEME, 
+        &prefs_common.pixmap_theme_path, P_STRING,
+        &interface.entry_pixmap_theme, prefs_set_data_from_entry, prefs_set_entry},
+       
+       /* Other */
+       {"uri_open_command", DEFAULT_BROWSER_CMD,
+        &prefs_common.uri_cmd, P_STRING,
+        &other.uri_entry, prefs_set_data_from_entry, prefs_set_entry},
+       {"print_command", "lpr %s", &prefs_common.print_cmd, P_STRING,
+        &other.printcmd_entry, prefs_set_data_from_entry, prefs_set_entry},
+       {"ext_editor_command", "gedit %s",
+        &prefs_common.ext_editor_cmd, P_STRING,
+        &other.exteditor_entry, prefs_set_data_from_entry, prefs_set_entry},
+
        {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
-        P_BOOL, &interface.checkbtn_addaddrbyclick,
+        P_BOOL, &other.checkbtn_addaddrbyclick,
         prefs_set_data_from_toggle, prefs_set_toggle},
+
        {"confirm_on_exit", "TRUE", &prefs_common.confirm_on_exit, P_BOOL,
-        &interface.checkbtn_confonexit,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-       {"send_return_receipt", "TRUE", &prefs_common.return_receipt, P_BOOL,
-        &send.checkbtn_returnreceipt,
+        &other.checkbtn_confonexit,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"clean_trash_on_exit", "FALSE", &prefs_common.clean_on_exit, P_BOOL,
-        &interface.checkbtn_cleanonexit,
+        &other.checkbtn_cleanonexit,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"ask_on_cleaning", "TRUE", &prefs_common.ask_on_clean, P_BOOL,
-        &interface.checkbtn_askonclean,
+        &other.checkbtn_askonclean,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"warn_queued_on_exit", "TRUE", &prefs_common.warn_queued_on_exit,
-        P_BOOL, &interface.checkbtn_warnqueued,
+        P_BOOL, &other.checkbtn_warnqueued,
         prefs_set_data_from_toggle, prefs_set_toggle},
+#if 0
+#ifdef USE_OPENSSL
+       {"ssl_ask_unknown_valid", "TRUE", &prefs_common.ssl_ask_unknown_valid,
+        P_BOOL, &other.checkbtn_ssl_ask_unknown_valid,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+#endif
+#endif
+       {"work_offline", "FALSE", &prefs_common.work_offline, P_BOOL,
+        NULL, NULL, NULL},
+       {"summary_quicksearch_type", "0", &prefs_common.summary_quicksearch_type, P_INT,
+        NULL, NULL, NULL},
 
-       /* Other */
-       {"uri_open_command", "netscape -remote 'openURL(%s,raise)'",
-        &prefs_common.uri_cmd, P_STRING,
-        &other.uri_entry, prefs_set_data_from_entry, prefs_set_entry},
-       {"print_command", "lpr %s", &prefs_common.print_cmd, P_STRING,
-        &other.printcmd_entry, prefs_set_data_from_entry, prefs_set_entry},
-       {"ext_editor_command", "gedit %s",
-        &prefs_common.ext_editor_cmd, P_STRING,
-        &other.exteditor_entry, prefs_set_data_from_entry, prefs_set_entry},
-
-       {"kill_score", "-9999", &prefs_common.kill_score, P_INT,
+       {"hide_score", "-9999", &prefs_common.kill_score, P_INT,
         NULL, NULL, NULL},
        {"important_score", "1", &prefs_common.important_score, P_INT,
         NULL, NULL, NULL},
+        {"clip_log", "FALSE", &prefs_common.cliplog, P_BOOL,
+        &other.checkbtn_cliplog,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"log_length", "1000", &prefs_common.loglength, P_INT,
+        &other.loglength_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
+
+       {"cache_max_mem_usage", "4096", &prefs_common.cache_max_mem_usage, P_INT,
+        NULL, NULL, NULL},
+       {"cache_min_keep_time", "15", &prefs_common.cache_min_keep_time, P_INT,
+        NULL, NULL, NULL},
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
@@ -710,6 +839,9 @@ static PrefParam param[] = {
 static void prefs_common_create                (void);
 static void prefs_receive_create       (void);
 static void prefs_send_create          (void);
+#ifdef USE_ASPELL
+static void prefs_spelling_create      (void);
+#endif
 static void prefs_compose_create       (void);
 static void prefs_quote_create         (void);
 static void prefs_display_create       (void);
@@ -737,13 +869,8 @@ static void date_format_select_row         (GtkWidget      *date_format_list,
                                                 gint            column,
                                                 GdkEventButton *event,
                                                 GtkWidget      *date_format);
-static GtkWidget *date_format_create           (GtkButton      *button,
-                                                void           *data);
-
-static void prefs_quote_description_create     (void);
-static void prefs_quote_description_key_pressed        (GtkWidget      *widget,
-                                                GdkEventKey    *event,
-                                                gpointer        data);
+static GtkWidget *date_format_create            (GtkButton      *button,
+                                                 void           *data);
 
 static void prefs_quote_colors_dialog          (void);
 static void prefs_quote_colors_dialog_create   (void);
@@ -771,6 +898,16 @@ static void prefs_font_selection_key_pressed       (GtkWidget      *widget,
                                                 gpointer        data);
 static void prefs_font_selection_ok            (GtkButton      *button, GtkEntry *entry);
 
+static void prefs_keybind_select               (void);
+static gint prefs_keybind_deleted              (GtkWidget      *widget,
+                                                GdkEventAny    *event,
+                                                gpointer        data);
+static void prefs_keybind_key_pressed          (GtkWidget      *widget,
+                                                GdkEventKey    *event,
+                                                gpointer        data);
+static void prefs_keybind_cancel               (void);
+static void prefs_keybind_apply_clicked                (GtkWidget      *widget);
+
 static gint prefs_common_deleted       (GtkWidget      *widget,
                                         GdkEventAny    *event,
                                         gpointer        data);
@@ -782,7 +919,6 @@ static void prefs_common_apply              (void);
 static void prefs_common_cancel                (void);
 
 void prefs_common_init() {
-       prefs_common.fltlist = NULL;
        prefs_common.disphdr_list = NULL;
 }
 
@@ -796,7 +932,7 @@ void prefs_common_read_config(void)
 
        path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMAND_HISTORY,
                           NULL);
-       if ((fp = fopen(path, "r")) == NULL) {
+       if ((fp = fopen(path, "rb")) == NULL) {
                if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
                g_free(path);
                return;
@@ -824,7 +960,7 @@ void prefs_common_save_config(void)
 
        path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMAND_HISTORY,
                           NULL);
-       if ((fp = fopen(path, "w")) == NULL) {
+       if ((fp = fopen(path, "wb")) == NULL) {
                FILE_OP_ERROR(path, "fopen");
                g_free(path);
                return;
@@ -864,7 +1000,7 @@ static void prefs_common_create(void)
 {
        gint page = 0;
 
-       debug_print(_("Creating common preferences window...\n"));
+       debug_print("Creating common preferences window...\n");
 
        prefs_dialog_create(&dialog);
        gtk_window_set_title (GTK_WINDOW(dialog.window),
@@ -873,10 +1009,8 @@ static void prefs_common_create(void)
                            GTK_SIGNAL_FUNC(prefs_common_deleted), NULL);
        gtk_signal_connect (GTK_OBJECT(dialog.window), "key_press_event",
                            GTK_SIGNAL_FUNC(prefs_common_key_pressed), NULL);
-       gtk_signal_connect (GTK_OBJECT(dialog.window), "focus_in_event",
-                           GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
-       gtk_signal_connect (GTK_OBJECT(dialog.window), "focus_out_event",
-                           GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT(dialog.window);
+
        gtk_signal_connect (GTK_OBJECT(dialog.ok_btn), "clicked",
                            GTK_SIGNAL_FUNC(prefs_common_ok), NULL);
        gtk_signal_connect (GTK_OBJECT(dialog.apply_btn), "clicked",
@@ -892,6 +1026,10 @@ static void prefs_common_create(void)
        SET_NOTEBOOK_LABEL(dialog.notebook, _("Send"),      page++);
        prefs_compose_create();
        SET_NOTEBOOK_LABEL(dialog.notebook, _("Compose"),   page++);
+#if USE_ASPELL
+       prefs_spelling_create();
+       SET_NOTEBOOK_LABEL(dialog.notebook, _("Spell Checker"),   page++);
+#endif 
        prefs_quote_create();
        SET_NOTEBOOK_LABEL(dialog.notebook, _("Quote"),   page++);
        prefs_display_create();
@@ -934,10 +1072,16 @@ static void prefs_receive_create(void)
        GtkWidget *spinbtn_autochk;
        GtkWidget *label_autochk2;
        GtkWidget *checkbtn_chkonstartup;
-       GtkWidget *checkbtn_noerrorpanel;
        GtkWidget *checkbtn_scan_after_inc;
 
 
+       GtkWidget *frame_newmail;
+       GtkWidget *hbox_newmail_notify;
+       GtkWidget *checkbtn_newmail_auto;
+       GtkWidget *checkbtn_newmail_manu;
+       GtkWidget *entry_newmail_notify_cmd;
+       GtkWidget *label_newmail_notify_cmd;
+
        GtkWidget *frame_news;
        GtkWidget *label_maxarticle;
        GtkWidget *spinbtn_maxarticle;
@@ -1041,12 +1185,54 @@ static void prefs_receive_create(void)
 
        PACK_CHECK_BUTTON (vbox2, checkbtn_chkonstartup,
                           _("Check new mail on startup"));
-
-       PACK_CHECK_BUTTON (vbox2, checkbtn_noerrorpanel,
-                          _("No error popup on receive error"));
        PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc,
                           _("Update all local folders after incorporation"));
 
+       
+       PACK_FRAME(vbox1, frame_newmail, _("Run command when new mail "
+                                          "arrives"));
+       vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       gtk_widget_show (vbox2);
+       gtk_container_add (GTK_CONTAINER (frame_newmail), vbox2);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+
+       hbox = gtk_hbox_new (TRUE, 8);
+       gtk_widget_show (hbox);
+       PACK_CHECK_BUTTON (hbox, checkbtn_newmail_auto,
+                          _("after autochecking"));
+       PACK_CHECK_BUTTON (hbox, checkbtn_newmail_manu,
+                          _("after manual checking"));
+       gtk_box_pack_start (GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
+       gtk_signal_connect(GTK_OBJECT(checkbtn_newmail_auto), "toggled",
+                          GTK_SIGNAL_FUNC(prefs_common_recv_dialog_newmail_notify_toggle_cb),
+                          NULL);
+       gtk_signal_connect(GTK_OBJECT(checkbtn_newmail_manu), "toggled",
+                          GTK_SIGNAL_FUNC(prefs_common_recv_dialog_newmail_notify_toggle_cb),
+                          NULL);
+
+       hbox_newmail_notify = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox_newmail_notify, FALSE, 
+                           FALSE, 0);
+
+       label_newmail_notify_cmd = gtk_label_new (_("Command to execute:\n"
+                                                   "(use %d as number of new "
+                                                   "mails)"));
+       gtk_label_set_justify(GTK_LABEL(label_newmail_notify_cmd), 
+                             GTK_JUSTIFY_RIGHT);
+       gtk_widget_show (label_newmail_notify_cmd);
+       gtk_box_pack_start (GTK_BOX (hbox_newmail_notify), 
+                           label_newmail_notify_cmd, FALSE, FALSE, 0);
+
+       entry_newmail_notify_cmd = gtk_entry_new ();
+       gtk_widget_show (entry_newmail_notify_cmd);
+       gtk_box_pack_start (GTK_BOX (hbox_newmail_notify), 
+                           entry_newmail_notify_cmd, TRUE, TRUE, 0);
+
+       gtk_widget_set_sensitive(hbox_newmail_notify, 
+                                prefs_common.newmail_notify_auto || 
+                                prefs_common.newmail_notify_manu);
+
        PACK_FRAME(vbox1, frame_news, _("News"));
 
        hbox = gtk_hbox_new (FALSE, 8);
@@ -1085,10 +1271,14 @@ static void prefs_receive_create(void)
        receive.spinbtn_autochk_adj = spinbtn_autochk_adj;
 
        receive.checkbtn_chkonstartup = checkbtn_chkonstartup;
-       receive.checkbtn_noerrorpanel = checkbtn_noerrorpanel;
        receive.checkbtn_scan_after_inc = checkbtn_scan_after_inc;
 
 
+       receive.checkbtn_newmail_auto  = checkbtn_newmail_auto;
+       receive.checkbtn_newmail_manu  = checkbtn_newmail_manu;
+       receive.hbox_newmail_notify    = hbox_newmail_notify;
+       receive.entry_newmail_notify_cmd = entry_newmail_notify_cmd;
+
        receive.spinbtn_maxarticle     = spinbtn_maxarticle;
        receive.spinbtn_maxarticle_adj = spinbtn_maxarticle_adj;
 }
@@ -1110,7 +1300,6 @@ static void prefs_send_create(void)
        GtkWidget *optmenu;
        GtkWidget *optmenu_menu;
        GtkWidget *menuitem;
-       GtkWidget *checkbtn_returnreceipt;
        GtkWidget *label_charset_desc;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
@@ -1152,11 +1341,9 @@ static void prefs_send_create(void)
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
        PACK_CHECK_BUTTON (vbox2, checkbtn_savemsg,
-                          _("Save sent messages to outbox"));
+                          _("Save sent messages to Sent folder"));
        PACK_CHECK_BUTTON (vbox2, checkbtn_queuemsg,
                           _("Queue messages that fail to send"));
-       PACK_CHECK_BUTTON (vbox2, checkbtn_returnreceipt,
-                          _("Send return receipt on request"));
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
@@ -1179,21 +1366,22 @@ static void prefs_send_create(void)
 
        SET_MENUITEM(_("Automatic (Recommended)"),       CS_AUTO);
        SET_MENUITEM(_("7bit ascii (US-ASCII)"),         CS_US_ASCII);
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
        SET_MENUITEM(_("Unicode (UTF-8)"),               CS_UTF_8);
 #endif
-       SET_MENUITEM(_("Western European (ISO-8859-1)"), CS_ISO_8859_1);
-       SET_MENUITEM(_("Central European (ISO-8859-2)"), CS_ISO_8859_2);
-       SET_MENUITEM(_("Baltic (ISO-8859-13)"),          CS_ISO_8859_13);
-       SET_MENUITEM(_("Baltic (ISO-8859-4)"),           CS_ISO_8859_4);
-       SET_MENUITEM(_("Greek (ISO-8859-7)"),            CS_ISO_8859_7);
-       SET_MENUITEM(_("Turkish (ISO-8859-9)"),          CS_ISO_8859_9);
-#if HAVE_LIBJCONV
-       SET_MENUITEM(_("Cyrillic (ISO-8859-5)"),         CS_ISO_8859_5);
+       SET_MENUITEM(_("Western European (ISO-8859-1)"),  CS_ISO_8859_1);
+       SET_MENUITEM(_("Western European (ISO-8859-15)"), CS_ISO_8859_15);
+       SET_MENUITEM(_("Central European (ISO-8859-2)"),  CS_ISO_8859_2);
+       SET_MENUITEM(_("Baltic (ISO-8859-13)"),           CS_ISO_8859_13);
+       SET_MENUITEM(_("Baltic (ISO-8859-4)"),            CS_ISO_8859_4);
+       SET_MENUITEM(_("Greek (ISO-8859-7)"),             CS_ISO_8859_7);
+       SET_MENUITEM(_("Turkish (ISO-8859-9)"),           CS_ISO_8859_9);
+#if HAVE_ICONV
+       SET_MENUITEM(_("Cyrillic (ISO-8859-5)"),          CS_ISO_8859_5);
 #endif
        SET_MENUITEM(_("Cyrillic (KOI8-R)"),             CS_KOI8_R);
-#if HAVE_LIBJCONV
-       SET_MENUITEM(_("Cyrillic (Windows-1251)"),       CS_CP1251);
+#if HAVE_ICONV
+       SET_MENUITEM(_("Cyrillic (Windows-1251)"),       CS_WINDOWS_1251);
        SET_MENUITEM(_("Cyrillic (KOI8-U)"),             CS_KOI8_U);
 #endif
        SET_MENUITEM(_("Japanese (ISO-2022-JP)"),        CS_ISO_2022_JP);
@@ -1225,34 +1413,44 @@ static void prefs_send_create(void)
                            FALSE, FALSE, 0);
        gtk_label_set_justify(GTK_LABEL (label_charset_desc), GTK_JUSTIFY_LEFT);
 
-       send.checkbtn_extsend = checkbtn_extsend;
-       send.entry_extsend    = entry_extsend;
-       /* send.button_extsend   = button_extsend; */
+       p_send.checkbtn_extsend = checkbtn_extsend;
+       p_send.entry_extsend    = entry_extsend;
+       /* p_send.button_extsend   = button_extsend; */
+
+       p_send.checkbtn_savemsg  = checkbtn_savemsg;
+       p_send.checkbtn_queuemsg = checkbtn_queuemsg;
+
+       p_send.optmenu_charset = optmenu;
+}
 
-       send.checkbtn_savemsg  = checkbtn_savemsg;
-       send.checkbtn_queuemsg = checkbtn_queuemsg;
-       send.checkbtn_returnreceipt = checkbtn_returnreceipt;
+static void prefs_common_recv_dialog_newmail_notify_toggle_cb(GtkWidget *w, gpointer data)
+{
+       gboolean toggled;
 
-       send.optmenu_charset = optmenu;
+       toggled = gtk_toggle_button_get_active
+                       (GTK_TOGGLE_BUTTON(receive.checkbtn_newmail_manu)) ||
+                 gtk_toggle_button_get_active
+                       (GTK_TOGGLE_BUTTON(receive.checkbtn_newmail_auto));
+       gtk_widget_set_sensitive(receive.hbox_newmail_notify, toggled);
 }
 
-#if USE_PSPELL
+#if USE_ASPELL
 static void prefs_dictionary_set_data_from_optmenu(PrefParam *param)
 {
        gchar *str;
-       gchar *dict_name;
+       gchar *dict_fullname;
        
        g_return_if_fail(param);
        g_return_if_fail(param->data);
        g_return_if_fail(param->widget);
        g_return_if_fail(*(param->widget));
 
-       dict_name = gtkpspell_get_dictionary_menu_active_item
+       dict_fullname = gtkaspell_get_dictionary_menu_active_item
                (gtk_option_menu_get_menu(GTK_OPTION_MENU(*(param->widget))));
        str = *((gchar **) param->data);
        if (str)
                g_free(str);
-       *((gchar **) param->data) = dict_name;
+       *((gchar **) param->data) = dict_fullname;
 }
 
 static void prefs_dictionary_set_optmenu(PrefParam *pparam)
@@ -1272,7 +1470,8 @@ static void prefs_dictionary_set_optmenu(PrefParam *pparam)
                for (cur = GTK_MENU_SHELL(menu)->children;
                     cur != NULL; cur = cur->next) {
                        menuitem = GTK_WIDGET(cur->data);
-                       dict_name = gtk_object_get_data(GTK_OBJECT(menuitem), "dict_name");
+                       dict_name = gtk_object_get_data(GTK_OBJECT(menuitem), 
+                                                       "dict_name");
                        if (!strcmp2(dict_name, *((gchar **)pparam->data))) {
                                gtk_option_menu_set_history(optmenu, n);
                                return;
@@ -1285,61 +1484,247 @@ static void prefs_dictionary_set_optmenu(PrefParam *pparam)
        prefs_dictionary_set_data_from_optmenu(pparam);
 }
 
-static void prefs_compose_checkbtn_enable_pspell_toggle_cb
+static void prefs_speller_sugmode_set_data_from_optmenu(PrefParam *param)
+{
+       gint sugmode;
+       g_return_if_fail(param);
+       g_return_if_fail(param->data);
+       g_return_if_fail(param->widget);
+       g_return_if_fail(*(param->widget));
+
+       sugmode = gtkaspell_get_sugmode_from_option_menu
+               (GTK_OPTION_MENU(*(param->widget)));
+       *((gint *) param->data) = sugmode;
+}
+
+static void prefs_speller_sugmode_set_optmenu(PrefParam *pparam)
+{
+       GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
+       gint sugmode;
+
+       g_return_if_fail(optmenu != NULL);
+       g_return_if_fail(pparam->data != NULL);
+
+       sugmode = *(gint *) pparam->data;
+       gtkaspell_sugmode_option_menu_set(optmenu, sugmode);
+}
+       
+       
+static void prefs_spelling_checkbtn_enable_aspell_toggle_cb
        (GtkWidget *widget,
         gpointer data)
 {
        gboolean toggled;
 
        toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-       gtk_widget_set_sensitive(compose.entry_pspell_path, toggled);
-       gtk_widget_set_sensitive(compose.optmenu_dictionary, toggled);
-       gtk_widget_set_sensitive(compose.btn_pspell_path, toggled);
+
+       gtk_widget_set_sensitive(spelling.entry_aspell_path,   toggled);
+       gtk_widget_set_sensitive(spelling.optmenu_dictionary,  toggled);
+       gtk_widget_set_sensitive(spelling.optmenu_sugmode,     toggled);
+       gtk_widget_set_sensitive(spelling.btn_aspell_path,     toggled);
+       gtk_widget_set_sensitive(spelling.misspelled_btn,      toggled);
+       gtk_widget_set_sensitive(spelling.checkbtn_use_alternate,      toggled);
+       gtk_widget_set_sensitive(spelling.checkbtn_check_while_typing, toggled);
 }
 
-static void prefs_compose_btn_pspell_path_clicked_cb(GtkWidget *widget,
+static void prefs_spelling_btn_aspell_path_clicked_cb(GtkWidget *widget,
                                                     gpointer data)
 {
        gchar *file_path, *tmp;
        GtkWidget *new_menu;
 
        file_path = filesel_select_file(_("Select dictionaries location"),
-                                       prefs_common.pspell_path);
+                                       prefs_common.aspell_path);
        if (file_path == NULL) {
                /* don't change */      
        }
        else {
          tmp=g_dirname(file_path);
          
-               if (prefs_common.pspell_path)
-                       g_free(prefs_common.pspell_path);
-               prefs_common.pspell_path = g_strdup_printf("%s%s",tmp,G_DIR_SEPARATOR_S);
+               if (prefs_common.aspell_path)
+                       g_free(prefs_common.aspell_path);
+               prefs_common.aspell_path = g_strdup_printf("%s%s",tmp,
+                                                          G_DIR_SEPARATOR_S);
 
-               new_menu = gtkpspell_dictionary_option_menu_new(prefs_common.pspell_path);
-               gtk_option_menu_set_menu(GTK_OPTION_MENU(compose.optmenu_dictionary),
+               new_menu = gtkaspell_dictionary_option_menu_new(prefs_common.aspell_path);
+               gtk_option_menu_set_menu(GTK_OPTION_MENU(spelling.optmenu_dictionary),
                                         new_menu);
 
-               gtk_entry_set_text(GTK_ENTRY(compose.entry_pspell_path), prefs_common.pspell_path);                                      
+               gtk_entry_set_text(GTK_ENTRY(spelling.entry_aspell_path), 
+                                  prefs_common.aspell_path);                                    
                /* select first one */
-               gtk_option_menu_set_history(GTK_OPTION_MENU(compose.optmenu_dictionary), 0);
-               
-               prefs_common.dictionary = gtkpspell_get_dictionary_menu_active_item(
-                               gtk_option_menu_get_menu(GTK_OPTION_MENU(compose.optmenu_dictionary)));
-               g_free(tmp);
+               gtk_option_menu_set_history(GTK_OPTION_MENU(
+                                       spelling.optmenu_dictionary), 0);
        
+               if (prefs_common.dictionary)
+                       g_free(prefs_common.dictionary);
+
+               prefs_common.dictionary = 
+                       gtkaspell_get_dictionary_menu_active_item(
+                               gtk_option_menu_get_menu(
+                                       GTK_OPTION_MENU(
+                                               spelling.optmenu_dictionary)));
+               g_free(tmp);
 
        }
 }
+
+static void prefs_spelling_create()
+{
+       GtkWidget *vbox1;
+       GtkWidget *frame_spell;
+       GtkWidget *vbox_spell;
+       GtkWidget *hbox_aspell_path;
+       GtkWidget *checkbtn_enable_aspell;
+       GtkWidget *label_aspell_path;
+       GtkWidget *entry_aspell_path;
+       GtkWidget *btn_aspell_path;
+       GtkWidget *spell_table;
+       GtkWidget *label_dictionary;
+       GtkWidget *optmenu_dictionary;
+       GtkWidget *sugmode_label;
+       GtkWidget *sugmode_optmenu;
+       GtkWidget *checkbtn_use_alternate;
+       GtkWidget *help_label;
+       GtkWidget *checkbtn_check_while_typing;
+       GtkWidget *color_label;
+       GtkWidget *col_align;
+
+       vbox1 = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox1);
+       gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+
+       /* spell checker defaults */                       
+       PACK_FRAME(vbox1, frame_spell, _("Global spelling checker settings"));
+       vbox_spell = gtk_vbox_new(FALSE, VSPACING_NARROW);
+       gtk_widget_show (vbox_spell);
+       gtk_container_add(GTK_CONTAINER(frame_spell), vbox_spell);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox_spell), 8);
+
+       PACK_CHECK_BUTTON(vbox_spell, checkbtn_enable_aspell, 
+                         _("Enable spell checker"));
+
+       gtk_signal_connect(GTK_OBJECT(checkbtn_enable_aspell), "toggled",
+                          GTK_SIGNAL_FUNC(prefs_spelling_checkbtn_enable_aspell_toggle_cb),
+                          NULL);
+
+       /* Check while typing */
+       PACK_CHECK_BUTTON(vbox_spell, checkbtn_check_while_typing, 
+                         _("Check while typing"));
+
+       PACK_CHECK_BUTTON(vbox_spell, checkbtn_use_alternate, 
+                         _("Enable alternate dictionary"));
+
+       help_label = gtk_label_new(_("Enabling an alternate dictionary makes switching\n"
+                                    "with the last used dictionary faster."));
+       gtk_misc_set_alignment (GTK_MISC (help_label), 0, 0);
+       gtk_widget_show(help_label);
+       gtk_box_pack_start(GTK_BOX(vbox_spell), help_label, FALSE, TRUE, 0);
+       
+       spell_table = gtk_table_new(4, 3, FALSE);
+       gtk_container_set_border_width (GTK_CONTAINER (spell_table), VSPACING);
+       gtk_table_set_row_spacings(GTK_TABLE(spell_table), 8);
+       gtk_table_set_col_spacings(GTK_TABLE(spell_table), 8);
+
+       gtk_box_pack_start(GTK_BOX(vbox_spell), spell_table, TRUE, TRUE, 0);
+
+       label_aspell_path = gtk_label_new (_("Dictionaries path:"));
+       gtk_misc_set_alignment(GTK_MISC(label_aspell_path), 1.0, 0.5);
+       gtk_widget_show(label_aspell_path);
+       gtk_table_attach (GTK_TABLE (spell_table), label_aspell_path, 0, 1, 0,
+                         1, GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+       
+       hbox_aspell_path = gtk_hbox_new (FALSE, 8);
+       gtk_table_attach (GTK_TABLE (spell_table), hbox_aspell_path, 1, 2, 0,
+                         1, GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+       gtk_widget_show(hbox_aspell_path);
+
+       entry_aspell_path = gtk_entry_new();
+       gtk_widget_show(entry_aspell_path);
+       gtk_box_pack_start(GTK_BOX(hbox_aspell_path), entry_aspell_path, TRUE,
+                          TRUE, 0);    
+       
+       gtk_widget_set_sensitive(entry_aspell_path, prefs_common.enable_aspell);
+
+       btn_aspell_path = gtk_button_new_with_label(" ... ");
+       gtk_widget_show(btn_aspell_path);
+       gtk_box_pack_start(GTK_BOX(hbox_aspell_path), btn_aspell_path, FALSE, FALSE, 0);
+       gtk_widget_set_sensitive(btn_aspell_path, prefs_common.enable_aspell);
+
+       gtk_signal_connect(GTK_OBJECT(btn_aspell_path), "clicked", 
+                          GTK_SIGNAL_FUNC(prefs_spelling_btn_aspell_path_clicked_cb),
+                          NULL);
+
+       label_dictionary = gtk_label_new(_("Default dictionary:"));
+       gtk_misc_set_alignment(GTK_MISC(label_dictionary), 1.0, 0.5);
+       gtk_widget_show(label_dictionary);
+       gtk_table_attach (GTK_TABLE (spell_table), label_dictionary, 0, 1, 1, 2,
+                         GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+
+       optmenu_dictionary = gtk_option_menu_new();
+       gtk_widget_show(optmenu_dictionary);
+       gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_dictionary), 
+                                gtkaspell_dictionary_option_menu_new(
+                                        prefs_common.aspell_path));
+       gtk_table_attach (GTK_TABLE (spell_table), optmenu_dictionary, 1, 2, 1,
+                         2, GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+       gtk_widget_set_sensitive(optmenu_dictionary, prefs_common.enable_aspell);
+
+       /* Suggestion mode */
+       sugmode_label = gtk_label_new(_("Default suggestion mode"));
+       gtk_misc_set_alignment(GTK_MISC(sugmode_label), 1.0, 0.5);
+       gtk_widget_show(sugmode_label);
+       gtk_table_attach(GTK_TABLE (spell_table), sugmode_label, 0, 1, 2, 3,
+                        GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+
+       sugmode_optmenu = gtk_option_menu_new();
+       gtk_widget_show(sugmode_optmenu);
+       gtk_option_menu_set_menu(GTK_OPTION_MENU(sugmode_optmenu),
+                           gtkaspell_sugmode_option_menu_new(prefs_common.aspell_sugmode));
+       gtk_table_attach(GTK_TABLE(spell_table), sugmode_optmenu, 1, 2, 2, 3,
+                        GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+       gtk_widget_set_sensitive(sugmode_optmenu, prefs_common.enable_aspell);
+
+       /* Color */
+       color_label = gtk_label_new(_("Misspelled word color:"));
+       gtk_misc_set_alignment(GTK_MISC(color_label), 1.0, 0.5);
+       gtk_table_attach (GTK_TABLE (spell_table), color_label, 0, 1, 3, 4,
+                         GTK_FILL, GTK_SHRINK, 0, 0);
+       gtk_widget_show(color_label);
+       
+       col_align = gtk_alignment_new(0.0, 0.5, 0, 0);
+       gtk_widget_show(col_align);
+       gtk_table_attach (GTK_TABLE (spell_table), col_align, 1, 2, 3, 4,
+                         GTK_FILL, GTK_SHRINK, 0, 0);
+
+       spelling.misspelled_btn = gtk_button_new_with_label ("");
+       set_button_bg_color(spelling.misspelled_btn,
+                           prefs_common.misspelled_col);
+       gtk_widget_set_usize (spelling.misspelled_btn, 30, 20);
+       gtk_widget_set_sensitive(spelling.misspelled_btn, prefs_common.enable_aspell);
+       gtk_signal_connect (GTK_OBJECT (spelling.misspelled_btn), "clicked",
+                           GTK_SIGNAL_FUNC(quote_color_set_dialog), "Misspelled word");
+       gtk_container_add(GTK_CONTAINER(col_align), spelling.misspelled_btn);
+
+
+       spelling.checkbtn_enable_aspell = checkbtn_enable_aspell;
+       spelling.entry_aspell_path      = entry_aspell_path;
+       spelling.btn_aspell_path        = btn_aspell_path;
+       spelling.optmenu_dictionary     = optmenu_dictionary;
+       spelling.optmenu_sugmode        = sugmode_optmenu;
+       spelling.checkbtn_use_alternate = checkbtn_use_alternate;
+       spelling.checkbtn_check_while_typing = checkbtn_check_while_typing;
+}
+
 #endif
 
+
 static void prefs_compose_create(void)
 {
        GtkWidget *vbox1;
-        GtkWidget *vbox2;
-        GtkWidget *vbox3;
+       GtkWidget *vbox2;
        GtkWidget *hbox1;
-       GtkWidget *hbox2;
-       GtkWidget *btn_quotefmt;
 
        GtkWidget *frame_sig;
        GtkWidget *vbox_sig;
@@ -1347,18 +1732,20 @@ static void prefs_compose_create(void)
        GtkWidget *label_sigsep;
        GtkWidget *entry_sigsep;
 
-       GtkWidget *frame_editor;
-       GtkWidget *hbox_editor;
        GtkWidget *checkbtn_autoextedit;
 
        GtkWidget *frame_autosel;
-        GtkWidget *hbox_autosel;
-        GtkWidget *vbox_autosel;
+       GtkWidget *hbox_autosel;
        GtkWidget *checkbtn_reply_account_autosel;
        GtkWidget *checkbtn_forward_account_autosel;
        GtkWidget *checkbtn_reedit_account_autosel;
 
-        GtkWidget *vbox_linewrap;
+       GtkWidget *hbox_undolevel;
+       GtkWidget *label_undolevel;
+       GtkObject *spinbtn_undolevel_adj;
+       GtkWidget *spinbtn_undolevel;
+
+       GtkWidget *vbox_linewrap;
 
        GtkWidget *hbox3;
        GtkWidget *hbox4;
@@ -1367,46 +1754,27 @@ static void prefs_compose_create(void)
        GtkObject *spinbtn_linewrap_adj;
        GtkWidget *spinbtn_linewrap;
        GtkWidget *checkbtn_wrapquote;
+       GtkWidget *checkbtn_autowrap;
        GtkWidget *checkbtn_wrapatsend;
 
-       GtkWidget *frame_reply;
-       GtkWidget *checkbtn_quote;
+       GtkWidget *checkbtn_default_reply_list;
+
        GtkWidget *checkbtn_forward_as_attachment;
+       GtkWidget *checkbtn_redirect_keep_from;
        GtkWidget *checkbtn_smart_wrapping;
        GtkWidget *checkbtn_block_cursor;
+       GtkWidget *frame_msgwrap;
 
-#if USE_PSPELL
-       GtkWidget *frame_spell;
-       GtkWidget *hbox_spell;
-       GtkWidget *vbox_spell;
-       GtkWidget *hbox_pspell_path;
-       GtkWidget *checkbtn_enable_pspell;
-       GtkWidget *label_pspell_path;
-       GtkWidget *entry_pspell_path;
-       GtkWidget *btn_pspell_path;
-       GtkWidget *hbox_dictionary;
-       GtkWidget *label_dictionary;
-       GtkWidget *optmenu_dictionary;
-#endif
+       GtkWidget *hbox_autosave;
+       GtkWidget *checkbtn_autosave;
+       GtkWidget *entry_autosave_length;
+       GtkWidget *label_autosave_length;
+       
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-
-
-       hbox1 = gtk_hbox_new (FALSE, 32);
-       gtk_widget_show (hbox1);
-
-       hbox2 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox2);
-       gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
-
-
-       hbox1 = gtk_hbox_new (FALSE, 32);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
-
        PACK_FRAME(vbox1, frame_sig, _("Signature"));
 
        vbox_sig = gtk_vbox_new (FALSE, VSPACING_NARROW);
@@ -1431,7 +1799,7 @@ static void prefs_compose_create(void)
        gtk_widget_set_usize (entry_sigsep, 64, -1);
 
         /* Account autoselection */
-       PACK_FRAME(vbox1, frame_autosel, _("Automatic Account Selection"));
+       PACK_FRAME(vbox1, frame_autosel, _("Automatic account selection"));
 
        hbox_autosel = gtk_hbox_new (FALSE, VSPACING_NARROW);
        gtk_widget_show (hbox_autosel);
@@ -1449,15 +1817,65 @@ static void prefs_compose_create(void)
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
+       PACK_CHECK_BUTTON (vbox2, checkbtn_default_reply_list,
+                          _("Reply button invokes mailing list reply"));
+
        PACK_CHECK_BUTTON (vbox2, checkbtn_autoextedit,
                           _("Automatically launch the external editor"));
 
-       PACK_VSPACER (vbox2, vbox3, VSPACING_NARROW_2);
+       hbox5 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox5);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox5, FALSE, FALSE, 0);
+
+       PACK_CHECK_BUTTON (hbox5, checkbtn_forward_as_attachment,
+                          _("Forward as attachment"));
+
+       PACK_CHECK_BUTTON (hbox5, checkbtn_block_cursor,
+                         _("Block cursor"));
+
+       PACK_CHECK_BUTTON (vbox2, checkbtn_redirect_keep_from,
+                          _("Keep the original 'From' header when redirecting"));
+
+       
+       hbox_autosave = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox_autosave);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox_autosave, FALSE, FALSE, 0);
+       
+       PACK_CHECK_BUTTON (hbox_autosave, checkbtn_autosave,
+                          _("Autosave to Drafts folder every "));
+
+       entry_autosave_length = gtk_entry_new();
+       gtk_widget_set_usize (entry_autosave_length, 64, -1);   
+       gtk_widget_show (entry_autosave_length);
+       gtk_box_pack_start (GTK_BOX (hbox_autosave), entry_autosave_length, FALSE, FALSE, 0);
+       
+       label_autosave_length = gtk_label_new(_("characters"));
+       gtk_widget_show (label_autosave_length);
+       gtk_box_pack_start (GTK_BOX (hbox_autosave), label_autosave_length, FALSE, FALSE, 0);
+       
+       hbox_undolevel = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox_undolevel);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox_undolevel, FALSE, FALSE, 0);
+
+       label_undolevel = gtk_label_new (_("Undo level"));
+       gtk_widget_show (label_undolevel);
+       gtk_box_pack_start (GTK_BOX (hbox_undolevel), label_undolevel, FALSE, FALSE, 0);
+
+       spinbtn_undolevel_adj = gtk_adjustment_new (50, 0, 100, 1, 10, 10);
+       spinbtn_undolevel = gtk_spin_button_new
+               (GTK_ADJUSTMENT (spinbtn_undolevel_adj), 1, 0);
+       gtk_widget_show (spinbtn_undolevel);
+       gtk_box_pack_start (GTK_BOX (hbox_undolevel), spinbtn_undolevel, FALSE, FALSE, 0);
+       gtk_widget_set_usize (spinbtn_undolevel, 64, -1);
+       gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_undolevel), TRUE);
 
         /* line-wrapping */
+       PACK_FRAME(vbox1, frame_msgwrap, _("Message wrapping"));
+
        vbox_linewrap = gtk_vbox_new (FALSE, VSPACING_NARROW);
        gtk_widget_show (vbox_linewrap);
-       gtk_box_pack_start (GTK_BOX (vbox1), vbox_linewrap, FALSE, FALSE, 0);
+       gtk_container_add (GTK_CONTAINER (frame_msgwrap), vbox_linewrap);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox_linewrap), 8);
 
        hbox3 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox3);
@@ -1480,79 +1898,20 @@ static void prefs_compose_create(void)
        gtk_widget_show (label_linewrap);
        gtk_box_pack_start (GTK_BOX (hbox3), label_linewrap, FALSE, FALSE, 0);
 
-       PACK_VSPACER (vbox2, vbox3, VSPACING_NARROW_2);
-
-       hbox4 = gtk_hbox_new (FALSE, 32);
+       hbox4 = gtk_hbox_new (FALSE, VSPACING);
        gtk_widget_show (hbox4);
        gtk_box_pack_start (GTK_BOX (vbox_linewrap), hbox4, FALSE, FALSE, 0);
 
        PACK_CHECK_BUTTON (hbox4, checkbtn_wrapquote, _("Wrap quotation"));
+
+       PACK_CHECK_BUTTON (hbox4, checkbtn_autowrap, _("Wrap on input"));
+
        PACK_CHECK_BUTTON
                (hbox4, checkbtn_wrapatsend, _("Wrap before sending"));
 
-       PACK_CHECK_BUTTON (vbox1, checkbtn_forward_as_attachment,
-                          _("Forward as attachment"));
-
-       PACK_CHECK_BUTTON (vbox1, checkbtn_smart_wrapping,
+       PACK_CHECK_BUTTON (vbox_linewrap, checkbtn_smart_wrapping,
                           _("Smart wrapping (EXPERIMENTAL)"));
        
-       PACK_CHECK_BUTTON (vbox1, checkbtn_block_cursor,
-                         _("Block cursor"));
-
-#if USE_PSPELL
-       /* spell checker defaults */                       
-       PACK_FRAME(vbox1, frame_spell, _("Global spelling checker settings"));
-       vbox_spell = gtk_vbox_new(FALSE, VSPACING_NARROW);
-       gtk_widget_show (vbox_spell);
-       gtk_container_add(GTK_CONTAINER(frame_spell), vbox_spell);
-       gtk_container_set_border_width(GTK_CONTAINER(vbox_spell), 8);
-
-       PACK_CHECK_BUTTON(vbox_spell, checkbtn_enable_pspell, 
-                         _("Enable spell checker (EXPERIMENTAL)"));
-
-       gtk_signal_connect(GTK_OBJECT(checkbtn_enable_pspell), "toggled",
-                          GTK_SIGNAL_FUNC(prefs_compose_checkbtn_enable_pspell_toggle_cb),
-                          NULL);
-
-       hbox_pspell_path = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show(hbox_pspell_path);
-       gtk_box_pack_start(GTK_BOX(vbox_spell), hbox_pspell_path, TRUE, TRUE, 0);
-
-       label_pspell_path = gtk_label_new (_("Dictionaries path"));
-       gtk_widget_show(label_pspell_path);
-       gtk_box_pack_start(GTK_BOX(hbox_pspell_path), label_pspell_path, FALSE, FALSE, 0);
-       
-       entry_pspell_path = gtk_entry_new();
-       gtk_widget_show(entry_pspell_path);
-       gtk_box_pack_start(GTK_BOX(hbox_pspell_path), entry_pspell_path, FALSE, FALSE, 0);
-       gtk_widget_set_usize(entry_pspell_path, 150, -1);
-       gtk_widget_set_sensitive(entry_pspell_path, prefs_common.enable_pspell);
-
-       btn_pspell_path = gtk_button_new_with_label(_("..."));
-       gtk_widget_show(btn_pspell_path);
-       gtk_box_pack_start(GTK_BOX(hbox_pspell_path), btn_pspell_path, FALSE, FALSE, 0);
-       gtk_widget_set_sensitive(btn_pspell_path, prefs_common.enable_pspell);
-
-       gtk_signal_connect(GTK_OBJECT(btn_pspell_path), "clicked", 
-                          GTK_SIGNAL_FUNC(prefs_compose_btn_pspell_path_clicked_cb),
-                          NULL);
-
-       hbox_dictionary = gtk_hbox_new(FALSE, 8);
-       gtk_widget_show(hbox_dictionary);
-       gtk_box_pack_start(GTK_BOX(vbox_spell), hbox_dictionary, TRUE, TRUE, 0);
-
-       label_dictionary = gtk_label_new(_("Dictionary"));
-       gtk_widget_show(label_dictionary);
-       gtk_box_pack_start(GTK_BOX(hbox_dictionary), label_dictionary, FALSE, FALSE, 0);
-
-       optmenu_dictionary = gtk_option_menu_new();
-       gtk_widget_show(optmenu_dictionary);
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_dictionary), 
-                                gtkpspell_dictionary_option_menu_new(prefs_common.pspell_path));
-       gtk_box_pack_start(GTK_BOX(hbox_dictionary), optmenu_dictionary, FALSE, FALSE, 0);
-       gtk_widget_set_sensitive(optmenu_dictionary, prefs_common.enable_pspell);
-#endif
-
        /*
        compose.checkbtn_quote   = checkbtn_quote;
        compose.entry_quotemark  = entry_quotemark;
@@ -1567,24 +1926,27 @@ static void prefs_compose_create(void)
        compose.checkbtn_forward_account_autosel = checkbtn_forward_account_autosel;
        compose.checkbtn_reedit_account_autosel  = checkbtn_reedit_account_autosel;
 
-       compose.spinbtn_linewrap     = spinbtn_linewrap;
-       compose.spinbtn_linewrap_adj = spinbtn_linewrap_adj;
-       compose.checkbtn_wrapquote   = checkbtn_wrapquote;
-       compose.checkbtn_wrapatsend  = checkbtn_wrapatsend;
+       compose.spinbtn_undolevel     = spinbtn_undolevel;
+       compose.spinbtn_undolevel_adj = spinbtn_undolevel_adj;
 
+       compose.spinbtn_linewrap      = spinbtn_linewrap;
+       compose.spinbtn_linewrap_adj  = spinbtn_linewrap_adj;
+       compose.checkbtn_wrapquote    = checkbtn_wrapquote;
+       compose.checkbtn_autowrap     = checkbtn_autowrap;
+       compose.checkbtn_wrapatsend   = checkbtn_wrapatsend;
+
+       compose.checkbtn_autosave     = checkbtn_autosave;
+       compose.entry_autosave_length = entry_autosave_length;
+       
        compose.checkbtn_forward_as_attachment =
                checkbtn_forward_as_attachment;
+       compose.checkbtn_redirect_keep_from =
+               checkbtn_redirect_keep_from;
        compose.checkbtn_smart_wrapping = 
                checkbtn_smart_wrapping;
        compose.checkbtn_block_cursor   =
                checkbtn_block_cursor;
-
-#if USE_PSPELL
-       compose.checkbtn_enable_pspell = checkbtn_enable_pspell;
-       compose.entry_pspell_path      = entry_pspell_path;
-       compose.btn_pspell_path        = btn_pspell_path;
-       compose.optmenu_dictionary     = optmenu_dictionary;
-#endif
+       compose.checkbtn_default_reply_list = checkbtn_default_reply_list;
 }
 
 static void prefs_quote_create(void)
@@ -1602,8 +1964,13 @@ static void prefs_quote_create(void)
        GtkWidget *entry_fw_quotemark;
        GtkWidget *text_fw_quotefmt;
 
+       GtkWidget *entry_quote_chars;
+       GtkWidget *label_quote_chars;
+       
        GtkWidget *btn_quotedesc;
 
+       GtkWidget *checkbtn_reply_with_quote;
+
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
@@ -1611,6 +1978,8 @@ static void prefs_quote_create(void)
 
        /* reply */
 
+       PACK_CHECK_BUTTON (vbox1, checkbtn_reply_with_quote, _("Reply will quote by default"));
+
        PACK_FRAME (vbox1, frame_quote, _("Reply format"));
 
        vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
@@ -1698,12 +2067,42 @@ static void prefs_quote_create(void)
        gtk_widget_show (btn_quotedesc);
        gtk_box_pack_start (GTK_BOX (hbox1), btn_quotedesc, FALSE, FALSE, 0);
        gtk_signal_connect(GTK_OBJECT(btn_quotedesc), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_quote_description), NULL);
+                          GTK_SIGNAL_FUNC(quote_fmt_quote_description), NULL);
+
+       /* quote chars */
+
+       PACK_FRAME (vbox1, frame_quote, _("Quotation characters"));
+
+       vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       gtk_widget_show (vbox_quote);
+       gtk_container_add (GTK_CONTAINER (frame_quote), vbox_quote);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
+
+       hbox1 = gtk_hbox_new (FALSE, 32);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
+
+       hbox2 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox2);
+       gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
+
+       label_quote_chars = gtk_label_new (_("Treat these characters as quotation marks: "));
+       gtk_widget_show (label_quote_chars);
+       gtk_box_pack_start (GTK_BOX (hbox2), label_quote_chars, FALSE, FALSE, 0);
+
+       entry_quote_chars = gtk_entry_new ();
+       gtk_widget_show (entry_quote_chars);
+       gtk_box_pack_start (GTK_BOX (hbox2), entry_quote_chars,
+                           FALSE, FALSE, 0);
+       gtk_widget_set_usize (entry_quote_chars, 64, -1);
+
 
+       compose.checkbtn_reply_with_quote= checkbtn_reply_with_quote;
        quote.entry_quotemark    = entry_quotemark;
        quote.text_quotefmt      = text_quotefmt;
        quote.entry_fw_quotemark = entry_fw_quotemark;
        quote.text_fw_quotefmt   = text_fw_quotefmt;
+       quote.entry_quote_chars  = entry_quote_chars;
 }
 
 static void prefs_display_create(void)
@@ -1714,17 +2113,18 @@ static void prefs_display_create(void)
        GtkWidget *label_textfont;
        GtkWidget *entry_textfont;
        GtkWidget *button_textfont;
-       GtkWidget *chkbtn_folder_unread;
        GtkWidget *chkbtn_transhdr;
+       GtkWidget *chkbtn_folder_unread;
+       GtkWidget *hbox1;
+       GtkWidget *label_ng_abbrev;
+       GtkWidget *spinbtn_ng_abbrev_len;
+       GtkObject *spinbtn_ng_abbrev_len_adj;
        GtkWidget *frame_summary;
        GtkWidget *vbox2;
        GtkWidget *chkbtn_swapfrom;
-       GtkWidget *chkbtn_hscrollbar;
        GtkWidget *chkbtn_useaddrbook;
        GtkWidget *chkbtn_expand_thread;
-       GtkWidget *chkbtn_bold_unread;
        GtkWidget *vbox3;
-       GtkWidget *hbox1;
        GtkWidget *label_datefmt;
        GtkWidget *button_datefmt;
        GtkWidget *entry_datefmt;
@@ -1757,7 +2157,7 @@ static void prefs_display_create(void)
        gtk_table_attach (GTK_TABLE (table1), entry_textfont, 1, 2, 0, 1,
                          (GTK_EXPAND | GTK_FILL), 0, 0, 0);
 
-       button_textfont = gtk_button_new_with_label ("... ");
+       button_textfont = gtk_button_new_with_label (" ... ");
 
        gtk_widget_show (button_textfont);
        gtk_table_attach (GTK_TABLE (table1), button_textfont, 2, 3, 0, 1,
@@ -1833,6 +2233,32 @@ static void prefs_display_create(void)
        PACK_CHECK_BUTTON (vbox2, chkbtn_folder_unread,
                           _("Display unread number next to folder name"));
 
+       PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
+
+       label_ng_abbrev = gtk_label_new
+               (_("Abbreviate newsgroup names longer than"));
+       gtk_widget_show (label_ng_abbrev);
+       gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
+
+       spinbtn_ng_abbrev_len_adj = gtk_adjustment_new (16, 0, 999, 1, 10, 10);
+       spinbtn_ng_abbrev_len = gtk_spin_button_new
+               (GTK_ADJUSTMENT (spinbtn_ng_abbrev_len_adj), 1, 0);
+       gtk_widget_show (spinbtn_ng_abbrev_len);
+       gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_ng_abbrev_len,
+                           FALSE, FALSE, 0);
+       gtk_widget_set_usize (spinbtn_ng_abbrev_len, 56, -1);
+       gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_ng_abbrev_len),
+                                    TRUE);
+
+       label_ng_abbrev = gtk_label_new
+               (_("letters"));
+       gtk_widget_show (label_ng_abbrev);
+       gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
+
        /* ---- Summary ---- */
 
        PACK_FRAME(vbox1, frame_summary, _("Summary View"));
@@ -1844,17 +2270,12 @@ static void prefs_display_create(void)
 
        PACK_CHECK_BUTTON
                (vbox2, chkbtn_swapfrom,
-                _("Display recipient on `From' column if sender is yourself"));
+                _("Display recipient in `From' column if sender is yourself"));
        PACK_CHECK_BUTTON
                (vbox2, chkbtn_useaddrbook,
                 _("Display sender using address book"));
-       PACK_CHECK_BUTTON
-               (vbox2, chkbtn_hscrollbar, _("Enable horizontal scroll bar"));
        PACK_CHECK_BUTTON
                (vbox2, chkbtn_expand_thread, _("Expand threads"));
-       PACK_CHECK_BUTTON
-               (vbox2, chkbtn_bold_unread,
-                _("Display unread messages with bold font"));
 
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
 
@@ -1870,7 +2291,7 @@ static void prefs_display_create(void)
        gtk_widget_show (entry_datefmt);
        gtk_box_pack_start (GTK_BOX (hbox1), entry_datefmt, TRUE, TRUE, 0);
 
-       button_datefmt = gtk_button_new_with_label ("... ");
+       button_datefmt = gtk_button_new_with_label (" ... ");
 
        gtk_widget_show (button_datefmt);
        gtk_box_pack_start (GTK_BOX (hbox1), button_datefmt, FALSE, FALSE, 0);
@@ -1884,7 +2305,7 @@ static void prefs_display_create(void)
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
 
        button_dispitem = gtk_button_new_with_label
-               (_(" Set display item of summary... "));
+               (_(" Set displayed items in summary... "));
        gtk_widget_show (button_dispitem);
        gtk_box_pack_start (GTK_BOX (hbox1), button_dispitem, FALSE, TRUE, 0);
        gtk_signal_connect (GTK_OBJECT (button_dispitem), "clicked",
@@ -1894,13 +2315,13 @@ static void prefs_display_create(void)
        display.entry_textfont  = entry_textfont;
        display.button_textfont = button_textfont;
 
-       display.chkbtn_folder_unread = chkbtn_folder_unread;
-       display.chkbtn_transhdr   = chkbtn_transhdr;
+       display.chkbtn_transhdr           = chkbtn_transhdr;
+       display.chkbtn_folder_unread      = chkbtn_folder_unread;
+       display.spinbtn_ng_abbrev_len     = spinbtn_ng_abbrev_len;
+       display.spinbtn_ng_abbrev_len_adj = spinbtn_ng_abbrev_len_adj;
 
        display.chkbtn_swapfrom      = chkbtn_swapfrom;
-       display.chkbtn_hscrollbar    = chkbtn_hscrollbar;
        display.chkbtn_expand_thread = chkbtn_expand_thread;
-       display.chkbtn_bold_unread   = chkbtn_bold_unread;
        display.chkbtn_useaddrbook   = chkbtn_useaddrbook;
        display.entry_datefmt        = entry_datefmt;
 }
@@ -1932,14 +2353,21 @@ static void prefs_message_create(void)
        GtkWidget *spinbtn_scrollstep;
        GtkWidget *chkbtn_halfpage;
 
+       GtkWidget *chkbtn_display_img;
+       GtkWidget *chkbtn_resize_image;
+
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
+       vbox2 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox2);
+       gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
 
        PACK_CHECK_BUTTON (hbox1, chkbtn_enablecol,
                           _("Enable coloration of message"));
@@ -1955,13 +2383,13 @@ static void prefs_message_create(void)
 
        SET_TOGGLE_SENSITIVITY(chkbtn_enablecol, button_edit_col);
 
-       vbox2 = gtk_vbox_new (FALSE, 0);
-       gtk_widget_show (vbox2);
-       gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
-
        PACK_CHECK_BUTTON
                (vbox2, chkbtn_mbalnum,
-                _("Display 2-byte alphabet and numeric with 1-byte character"));
+                _("Display multi-byte alphanumeric as\n"
+                  "ASCII character (Japanese only)"));
+       gtk_label_set_justify (GTK_LABEL (GTK_BIN(chkbtn_mbalnum)->child),
+                              GTK_JUSTIFY_LEFT);
+
        PACK_CHECK_BUTTON(vbox2, chkbtn_disphdrpane,
                          _("Display header pane above message view"));
 
@@ -2052,6 +2480,16 @@ static void prefs_message_create(void)
 
        SET_TOGGLE_SENSITIVITY (chkbtn_smoothscroll, hbox_scr)
 
+       vbox3 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox3);
+       gtk_box_pack_start (GTK_BOX (vbox1), vbox3, FALSE, FALSE, 0);
+
+       PACK_CHECK_BUTTON(vbox3, chkbtn_display_img,
+                          _("Automatically display attached images"));
+
+       PACK_CHECK_BUTTON(vbox3, chkbtn_resize_image,
+                         _("Resize attached images"));
+
        message.chkbtn_enablecol   = chkbtn_enablecol;
        message.button_edit_col    = button_edit_col;
        message.chkbtn_mbalnum     = chkbtn_mbalnum;
@@ -2064,6 +2502,9 @@ static void prefs_message_create(void)
        message.spinbtn_scrollstep     = spinbtn_scrollstep;
        message.spinbtn_scrollstep_adj = spinbtn_scrollstep_adj;
        message.chkbtn_halfpage        = chkbtn_halfpage;
+
+       message.chkbtn_display_img  = chkbtn_display_img;
+       message.chkbtn_resize_image = chkbtn_resize_image;
 }
 
 #if USE_GPGME
@@ -2071,18 +2512,17 @@ static void prefs_privacy_create(void)
 {
        GtkWidget *vbox1;
        GtkWidget *vbox2;
+       GtkWidget *vbox3;
        GtkWidget *hbox1;
-       GtkWidget *checkbtn_default_encrypt;
-        GtkWidget *checkbtn_ascii_armored;
-       GtkWidget *checkbtn_default_sign;
+       GtkWidget *hbox_spc;
+       GtkWidget *label;
        GtkWidget *checkbtn_auto_check_signatures;
        GtkWidget *checkbtn_gpg_signature_popup;
+       GtkWidget *checkbtn_store_passphrase;
+       GtkObject *spinbtn_store_passphrase_adj;
+       GtkWidget *spinbtn_store_passphrase;
        GtkWidget *checkbtn_passphrase_grab;
        GtkWidget *checkbtn_gpg_warning;
-       GtkWidget *label;
-       GtkWidget *menuitem;
-       GtkWidget *optmenu;
-       GtkWidget *optmenu_menu;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -2093,119 +2533,84 @@ static void prefs_privacy_create(void)
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
-       PACK_CHECK_BUTTON (vbox2, checkbtn_default_encrypt,
-                          _("Encrypt message by default"));
-
-       PACK_CHECK_BUTTON (vbox2, checkbtn_ascii_armored,
-                          _("Plain ASCII armored"));
-       gtk_signal_connect(GTK_OBJECT(checkbtn_ascii_armored), "toggled",
-                               prefs_common_ascii_armored_warning, (gpointer)0);
-
-       PACK_CHECK_BUTTON (vbox2, checkbtn_default_sign,
-                          _("Sign message by default"));
-
        PACK_CHECK_BUTTON (vbox2, checkbtn_auto_check_signatures,
                           _("Automatically check signatures"));
 
        PACK_CHECK_BUTTON (vbox2, checkbtn_gpg_signature_popup,
                           _("Show signature check result in a popup window"));
 
-#ifndef __MINGW32__
-       PACK_CHECK_BUTTON (vbox2, checkbtn_passphrase_grab,
-                          _("Grab input while entering a passphrase"));
-#endif
+       PACK_CHECK_BUTTON (vbox2, checkbtn_store_passphrase,
+                          _("Store passphrase in memory temporarily"));
 
-       PACK_CHECK_BUTTON
-               (vbox2, checkbtn_gpg_warning,
-                _("Display warning on startup if GnuPG doesn't work"));
+       vbox3 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox3);
+       gtk_box_pack_start (GTK_BOX (vbox2), vbox3, FALSE, FALSE, 0);
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
+
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox_spc);
+       gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
+       gtk_widget_set_usize (hbox_spc, 12, -1);
 
-       /* create default signkey box */
-       label = gtk_label_new (_("Default Sign Key"));
+       label = gtk_label_new (_("Expire after"));
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
-       optmenu = gtk_option_menu_new ();
-       gtk_widget_show (optmenu);
-       gtk_box_pack_start(GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
-       optmenu_menu = gtk_menu_new ();
-
-       MENUITEM_ADD(optmenu_menu, menuitem, "Default Key", "def_key");
-       MENUITEM_ADD(optmenu_menu, menuitem, "Second Key", "2nd_key");
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
-       /* FIXME: disabled because not implemented */
-       gtk_widget_set_sensitive(optmenu, FALSE);
 
-       privacy.checkbtn_default_encrypt = checkbtn_default_encrypt;
-        privacy.checkbtn_ascii_armored   = checkbtn_ascii_armored;
-       privacy.checkbtn_default_sign    = checkbtn_default_sign;
-       privacy.checkbtn_auto_check_signatures
-                                        = checkbtn_auto_check_signatures;
-       privacy.checkbtn_gpg_signature_popup
-                                        = checkbtn_gpg_signature_popup;
-       privacy.checkbtn_passphrase_grab = checkbtn_passphrase_grab;
-       privacy.checkbtn_gpg_warning     = checkbtn_gpg_warning;
-       privacy.optmenu_default_signkey  = optmenu;
-}
+       spinbtn_store_passphrase_adj = gtk_adjustment_new (0, 0, 1440, 1, 5, 5);
+       spinbtn_store_passphrase = gtk_spin_button_new
+               (GTK_ADJUSTMENT (spinbtn_store_passphrase_adj), 1, 0);
+       gtk_widget_show (spinbtn_store_passphrase);
+       gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_store_passphrase, FALSE, FALSE, 0);
+       gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_store_passphrase),
+                                    TRUE);
+       gtk_widget_set_usize (spinbtn_store_passphrase, 64, -1);
 
-static void
-prefs_common_default_signkey_set_data_from_optmenu(PrefParam *pparam)
-{
-#if 0
-       GtkWidget *menu;
-       GtkWidget *menuitem;
-       gchar *charset;
+       label = gtk_label_new (_("minute(s) "));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
 
-       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       charset = gtk_object_get_user_data(GTK_OBJECT(menuitem));
-       g_free(*((gchar **)pparam->data));
-       *((gchar **)pparam->data) = g_strdup(charset);
-#endif
-}
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
 
-static void prefs_common_default_signkey_set_optmenu(PrefParam *pparam)
-{
-#if 0
-       GList *cur;
-       GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
-       GtkWidget *menu;
-       GtkWidget *menuitem;
-       gchar *charset;
-       gint n = 0;
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox_spc);
+       gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
+       gtk_widget_set_usize (hbox_spc, 12, -1);
 
-       g_return_if_fail(optmenu != NULL);
-       g_return_if_fail(*((gchar **)pparam->data) != NULL);
+       label = gtk_label_new (_("(Setting to '0' will store the passphrase\n"
+                                " for the whole session)"));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
-       menu = gtk_option_menu_get_menu(optmenu);
-       for (cur = GTK_MENU_SHELL(menu)->children;
-            cur != NULL; cur = cur->next) {
-               menuitem = GTK_WIDGET(cur->data);
-               charset = gtk_object_get_user_data(GTK_OBJECT(menuitem));
-               if (!strcmp(charset, *((gchar **)pparam->data))) {
-                       gtk_option_menu_set_history(optmenu, n);
-                       return;
-               }
-               n++;
-       }
+       SET_TOGGLE_SENSITIVITY (checkbtn_store_passphrase, vbox3);
 
-       gtk_option_menu_set_history(optmenu, 0);
-       prefs_common_charset_set_data_from_optmenu(pparam);
+#ifndef __MINGW32__
+       PACK_CHECK_BUTTON (vbox2, checkbtn_passphrase_grab,
+                          _("Grab input while entering a passphrase"));
 #endif
-}
 
-static void prefs_common_ascii_armored_warning(GtkWidget* widget,
-                                              gpointer unused)
-{
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))
-               && gtk_notebook_get_current_page(GTK_NOTEBOOK(dialog.notebook))) {
-               alertpanel_message(_("Warning - Privacy/Plain ASCII armored"),
-                       _("Its not recommend to use the old style plain ASCII\n"
-                       "armored mode for encypted messages. It doesn't comply\n"
-                       "with the RFC 3156 - MIME security with OpenPGP."));
-       }
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_gpg_warning,
+                _("Display warning on startup if GnuPG doesn't work"));
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       privacy.checkbtn_auto_check_signatures
+                                            = checkbtn_auto_check_signatures;
+       privacy.checkbtn_gpg_signature_popup
+                                            = checkbtn_gpg_signature_popup;
+       privacy.checkbtn_store_passphrase    = checkbtn_store_passphrase;
+       privacy.spinbtn_store_passphrase     = spinbtn_store_passphrase;
+       privacy.spinbtn_store_passphrase_adj = spinbtn_store_passphrase_adj;
+       privacy.checkbtn_passphrase_grab     = checkbtn_passphrase_grab;
+       privacy.checkbtn_gpg_warning         = checkbtn_gpg_warning;
 }
 #endif /* USE_GPGME */
 
@@ -2215,30 +2620,32 @@ static void prefs_interface_create(void)
        GtkWidget *vbox2;
        GtkWidget *vbox3;
        /* GtkWidget *checkbtn_emacs; */
+       GtkWidget *checkbtn_show_msg_with_cursor;
        GtkWidget *checkbtn_openunread;
+       GtkWidget *checkbtn_mark_as_read_on_newwin;
        GtkWidget *checkbtn_openinbox;
        GtkWidget *checkbtn_immedexec;
+       GtkWidget *frame_dialogs;
+       GtkWidget *vbox_dialogs;
        GtkWidget *hbox1;
        GtkWidget *label;
+       GtkWidget *dialogs_table;
        GtkWidget *optmenu_recvdialog;
+       GtkWidget *optmenu_senddialog;
        GtkWidget *menu;
        GtkWidget *menuitem;
+       GtkWidget *checkbtn_no_recv_err_panel;
+       GtkWidget *checkbtn_close_recv_dialog;
 
-       GtkWidget *frame_addr;
-        GtkWidget *vbox_addr;
-       GtkWidget *checkbtn_addaddrbyclick;
-
-       GtkWidget *frame_exit;
-       GtkWidget *vbox_exit;
-       GtkWidget *checkbtn_confonexit;
-       GtkWidget *checkbtn_cleanonexit;
-       GtkWidget *checkbtn_askonclean;
-       GtkWidget *checkbtn_warnqueued;
+       GtkWidget *button_keybind;
 
-       GtkWidget *hbox2;
        GtkWidget *optmenu_nextunreadmsgdialog;
-       GtkWidget *optmenu_nextunreadmsgdialog_menu;
-       GtkWidget *nextunreadmsgdialog_menuitem;
+
+       GtkWidget *frame_pixmap_theme;
+       GtkWidget *vbox_pixmap_theme;
+       GtkWidget *entry_pixmap_theme;
+       GtkWidget *combo_pixmap_theme;
+       GList *avail_pixmap_themes = NULL;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -2255,10 +2662,18 @@ static void prefs_interface_create(void)
        gtk_label_set_justify (GTK_LABEL (GTK_BIN (checkbtn_emacs)->child),
                               GTK_JUSTIFY_LEFT);   */
 
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_show_msg_with_cursor,
+                _("Open messages in summary with cursor keys"));
+
        PACK_CHECK_BUTTON
                (vbox2, checkbtn_openunread,
                 _("Open first unread message when entering a folder"));
 
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_mark_as_read_on_newwin,
+                _("Only mark message as read when opened in new window"));
+
        PACK_CHECK_BUTTON
                (vbox2, checkbtn_openinbox,
                 _("Go to inbox after receiving new mail"));
@@ -2282,204 +2697,234 @@ static void prefs_interface_create(void)
        gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 8);
        gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
-       PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
-       label = gtk_label_new (_("Show receive dialog"));
-       gtk_widget_show (label);
-       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
-
-       optmenu_recvdialog = gtk_option_menu_new ();
-       gtk_widget_show (optmenu_recvdialog);
-       gtk_box_pack_start (GTK_BOX (hbox1), optmenu_recvdialog,
-                           FALSE, FALSE, 0);
-
-       menu = gtk_menu_new ();
-       MENUITEM_ADD (menu, menuitem, _("Always"), RECV_DIALOG_ALWAYS);
-       MENUITEM_ADD (menu, menuitem, _("Only if a window is active"),
-                     RECV_DIALOG_ACTIVE);
-       MENUITEM_ADD (menu, menuitem, _("Never"), RECV_DIALOG_NEVER);
-
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_recvdialog), menu);
-
-       PACK_FRAME (vbox1, frame_addr, _("Address book"));
-
-       vbox_addr = gtk_vbox_new (FALSE, 0);
-       gtk_widget_show (vbox_addr);
-       gtk_container_add (GTK_CONTAINER (frame_addr), vbox_addr);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox_addr), 8);
+       PACK_FRAME (vbox1, frame_dialogs, _("Dialogs"));
+       vbox_dialogs = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox_dialogs);
+       gtk_container_add (GTK_CONTAINER (frame_dialogs), vbox_dialogs);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox_dialogs), 8);
 
-       PACK_CHECK_BUTTON
-               (vbox_addr, checkbtn_addaddrbyclick,
-                _("Add address to destination when double-clicked"));
+       dialogs_table = gtk_table_new (2, 2, FALSE);
+       gtk_widget_show (dialogs_table);
+       gtk_container_add (GTK_CONTAINER (vbox_dialogs), dialogs_table);
+       gtk_container_set_border_width (GTK_CONTAINER (dialogs_table), 4);
+       gtk_table_set_row_spacings (GTK_TABLE (dialogs_table), VSPACING_NARROW);
+       gtk_table_set_col_spacings (GTK_TABLE (dialogs_table), 8);
 
        /* Next Unread Message Dialog */
-       hbox2 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox2);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0);
+       label = gtk_label_new (_("Show no-unread-message dialog"));
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+       gtk_widget_show (label);
+       gtk_table_attach (GTK_TABLE (dialogs_table), label, 0, 1, 0, 1,
+                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
-       label = gtk_label_new (_("Show no-unread-message dialog"));
-       gtk_widget_show (label);
-       gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
 
        optmenu_nextunreadmsgdialog = gtk_option_menu_new ();
        gtk_widget_show (optmenu_nextunreadmsgdialog);
-       gtk_box_pack_start (GTK_BOX (hbox2), optmenu_nextunreadmsgdialog,
-                           FALSE, FALSE, 0);
-
-       optmenu_nextunreadmsgdialog_menu = gtk_menu_new ();
-       MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem,
-                     _("Always"),  NEXTUNREADMSGDIALOG_ALWAYS);
-       MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem,
-                     _("Assume 'Yes'"),  NEXTUNREADMSGDIALOG_ASSUME_YES);
-       MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem,
-                     _("Assume 'No'"), NEXTUNREADMSGDIALOG_ASSUME_NO);
+       gtk_table_attach (GTK_TABLE (dialogs_table), 
+                         optmenu_nextunreadmsgdialog, 1, 2, 0, 1,
+                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+       
+       menu = gtk_menu_new ();
+       MENUITEM_ADD (menu, menuitem, _("Always"), NEXTUNREADMSGDIALOG_ALWAYS);
+       MENUITEM_ADD (menu, menuitem, _("Assume 'Yes'"), 
+                     NEXTUNREADMSGDIALOG_ASSUME_YES);
+       MENUITEM_ADD (menu, menuitem, _("Assume 'No'"), 
+                     NEXTUNREADMSGDIALOG_ASSUME_NO);
 
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog),
-                                 optmenu_nextunreadmsgdialog_menu);
+       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog), menu);
 
+       label = gtk_label_new (_("Show send dialog"));
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+       gtk_widget_show (label);
+       gtk_table_attach (GTK_TABLE (dialogs_table), label, 0, 1, 1, 2,
+                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+       optmenu_senddialog = gtk_option_menu_new ();
+       gtk_widget_show (optmenu_senddialog);
+       gtk_table_attach (GTK_TABLE (dialogs_table), 
+                         optmenu_senddialog, 1, 2, 1, 2,
+                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+       
+       menu = gtk_menu_new ();
+       MENUITEM_ADD (menu, menuitem, _("Always"), SEND_DIALOG_ALWAYS);
+       MENUITEM_ADD (menu, menuitem, _("Never"), SEND_DIALOG_NEVER);
 
-       /* Receive Dialog */
-/*     hbox = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_senddialog), menu);
 
-       label = gtk_label_new (_("Show receive Dialog"));
+       label = gtk_label_new (_("Show receive dialog"));
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
        gtk_widget_show (label);
-       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+       gtk_table_attach (GTK_TABLE (dialogs_table), label, 0, 1, 2, 3,
+                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
-       recvdialog_optmenu = gtk_option_menu_new ();
-       gtk_widget_show (recvdialog_optmenu);
-       gtk_box_pack_start (GTK_BOX (hbox), recvdialog_optmenu, FALSE, FALSE, 0);
-
-       recvdialog_optmenu_menu = gtk_menu_new ();
+       optmenu_recvdialog = gtk_option_menu_new ();
+       gtk_widget_show (optmenu_recvdialog);
+       gtk_table_attach (GTK_TABLE (dialogs_table), optmenu_recvdialog, 1, 2, 2, 3,
+                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
-       MENUITEM_ADD (recvdialog_optmenu_menu, recvdialog_menuitem, _("Always"),  RECVDIALOG_ALWAYS);
-       MENUITEM_ADD (recvdialog_optmenu_menu, recvdialog_menuitem, _("Only if a sylpheed window is active"),  RECVDIALOG_WINDOW_ACTIVE);
-       MENUITEM_ADD (recvdialog_optmenu_menu, recvdialog_menuitem, _("Never"), RECVDIALOG_NEVER);
+       menu = gtk_menu_new ();
+       MENUITEM_ADD (menu, menuitem, _("Always"), RECV_DIALOG_ALWAYS);
+       MENUITEM_ADD (menu, menuitem, _("Only if a window is active"),
+                     RECV_DIALOG_ACTIVE);
+       MENUITEM_ADD (menu, menuitem, _("Never"), RECV_DIALOG_NEVER);
 
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (recvdialog_optmenu), recvdialog_optmenu_menu);     */
+       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_recvdialog), menu);
 
-       /* On Exit */
-       PACK_FRAME (vbox1, frame_exit, _("On exit"));
+       PACK_CHECK_BUTTON (vbox_dialogs, checkbtn_no_recv_err_panel,
+                          _("Don't popup error dialog on receive error"));
 
-       vbox_exit = gtk_vbox_new (FALSE, 0);
-       gtk_widget_show (vbox_exit);
-       gtk_container_add (GTK_CONTAINER (frame_exit), vbox_exit);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox_exit), 8);
+       PACK_CHECK_BUTTON (vbox_dialogs, checkbtn_close_recv_dialog,
+                          _("Close receive dialog when finished"));
 
-       PACK_CHECK_BUTTON (vbox_exit, checkbtn_confonexit,
-                          _("Confirm on exit"));
 
-       hbox1 = gtk_hbox_new (FALSE, 32);
+       hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox_exit), hbox1, FALSE, FALSE, 0);
-
-       PACK_CHECK_BUTTON (hbox1, checkbtn_cleanonexit,
-                          _("Empty trash on exit"));
-       PACK_CHECK_BUTTON (hbox1, checkbtn_askonclean,
-                          _("Ask before emptying"));
-       SET_TOGGLE_SENSITIVITY (checkbtn_cleanonexit, checkbtn_askonclean);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 
-       PACK_CHECK_BUTTON (vbox_exit, checkbtn_warnqueued,
-                          _("Warn if there are queued messages"));
+       button_keybind = gtk_button_new_with_label (_(" Set key bindings... "));
+       gtk_widget_show (button_keybind);
+       gtk_box_pack_start (GTK_BOX (hbox1), button_keybind, FALSE, FALSE, 0);
+       gtk_signal_connect (GTK_OBJECT (button_keybind), "clicked",
+                           GTK_SIGNAL_FUNC (prefs_keybind_select), NULL);
+
+       PACK_FRAME(vbox1, frame_pixmap_theme, _("Icon theme"));
+       
+       vbox_pixmap_theme = gtk_vbox_new(FALSE, 0);
+       gtk_widget_show(vbox_pixmap_theme);
+       gtk_container_add(GTK_CONTAINER(frame_pixmap_theme), vbox_pixmap_theme);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox_pixmap_theme), 8);
+       avail_pixmap_themes = stock_pixmap_themes_list_new(); 
+       combo_pixmap_theme = gtk_combo_new ();
+       gtk_widget_show (combo_pixmap_theme);
+       gtk_box_pack_start (GTK_BOX (vbox_pixmap_theme), combo_pixmap_theme, TRUE, TRUE, 0);
+       gtk_combo_set_popdown_strings(GTK_COMBO(combo_pixmap_theme), avail_pixmap_themes);
+       entry_pixmap_theme = GTK_COMBO (combo_pixmap_theme)->entry;
+
+       stock_pixmap_themes_list_free(avail_pixmap_themes);
 
        /* interface.checkbtn_emacs          = checkbtn_emacs; */
+       interface.checkbtn_show_msg_with_cursor
+                                             = checkbtn_show_msg_with_cursor;
        interface.checkbtn_openunread         = checkbtn_openunread;
+       interface.checkbtn_mark_as_read_on_newwin
+                                             = checkbtn_mark_as_read_on_newwin;
        interface.checkbtn_openinbox          = checkbtn_openinbox;
        interface.checkbtn_immedexec          = checkbtn_immedexec;
        interface.optmenu_recvdialog          = optmenu_recvdialog;
-       interface.checkbtn_addaddrbyclick     = checkbtn_addaddrbyclick;
+       interface.optmenu_senddialog          = optmenu_senddialog;
+       interface.checkbtn_no_recv_err_panel  = checkbtn_no_recv_err_panel;
+       interface.checkbtn_close_recv_dialog  = checkbtn_close_recv_dialog;
        interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
-       interface.checkbtn_confonexit         = checkbtn_confonexit;
-       interface.checkbtn_cleanonexit        = checkbtn_cleanonexit;
-       interface.checkbtn_askonclean         = checkbtn_askonclean;
-       interface.checkbtn_warnqueued         = checkbtn_warnqueued;
+       interface.combo_pixmap_theme          = combo_pixmap_theme;
+       interface.entry_pixmap_theme          = entry_pixmap_theme;
 }
 
 static void prefs_other_create(void)
 {
        GtkWidget *vbox1;
+       GtkWidget *ext_frame;
+       GtkWidget *ext_table;
        GtkWidget *hbox1;
 
-       GtkWidget *uri_frame;
        GtkWidget *uri_label;
        GtkWidget *uri_combo;
        GtkWidget *uri_entry;
 
-       GtkWidget *print_frame;
        GtkWidget *printcmd_label;
        GtkWidget *printcmd_entry;
 
-       GtkWidget *exteditor_frame;
        GtkWidget *exteditor_label;
        GtkWidget *exteditor_combo;
        GtkWidget *exteditor_entry;
 
+       GtkWidget *frame_addr;
+       GtkWidget *vbox_addr;
+       GtkWidget *checkbtn_addaddrbyclick;
+       
+       GtkWidget *frame_cliplog;
+       GtkWidget *vbox_cliplog;
+       GtkWidget *hbox_cliplog;
+       GtkWidget *checkbtn_cliplog;
+       GtkWidget *loglength_label;
+       GtkWidget *loglength_entry;
+
+       GtkWidget *frame_exit;
+       GtkWidget *vbox_exit;
+       GtkWidget *checkbtn_confonexit;
+       GtkWidget *checkbtn_cleanonexit;
+       GtkWidget *checkbtn_askonclean;
+       GtkWidget *checkbtn_warnqueued;
+#if 0
+#ifdef USE_OPENSSL
+       GtkWidget *frame_ssl;
+       GtkWidget *vbox_ssl;
+       GtkWidget *hbox_ssl;
+       GtkWidget *checkbtn_ssl_ask_unknown_valid;
+#endif
+#endif
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-       PACK_FRAME(vbox1, uri_frame,
-                  _("External Web browser (%s will be replaced with URI)"));
+       PACK_FRAME(vbox1, ext_frame,
+                  _("External commands (%s will be replaced with file name / URI)"));
 
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_container_add (GTK_CONTAINER (uri_frame), hbox1);
-       gtk_container_set_border_width (GTK_CONTAINER (hbox1), 8);
+       ext_table = gtk_table_new (3, 2, FALSE);
+       gtk_widget_show (ext_table);
+       gtk_container_add (GTK_CONTAINER (ext_frame), ext_table);
+       gtk_container_set_border_width (GTK_CONTAINER (ext_table), 8);
+       gtk_table_set_row_spacings (GTK_TABLE (ext_table), VSPACING_NARROW);
+       gtk_table_set_col_spacings (GTK_TABLE (ext_table), 8);
 
-       uri_label = gtk_label_new (_("Command"));
+       uri_label = gtk_label_new (_("Web browser"));
        gtk_widget_show(uri_label);
-       gtk_box_pack_start (GTK_BOX (hbox1), uri_label, FALSE, TRUE, 0);
+       gtk_table_attach (GTK_TABLE (ext_table), uri_label, 0, 1, 0, 1,
+                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+       gtk_misc_set_alignment (GTK_MISC (uri_label), 1, 0.5);
 
        uri_combo = gtk_combo_new ();
        gtk_widget_show (uri_combo);
-       gtk_box_pack_start (GTK_BOX (hbox1), uri_combo, TRUE, TRUE, 0);
+       gtk_table_attach (GTK_TABLE (ext_table), uri_combo, 1, 2, 0, 1,
+                         GTK_EXPAND | GTK_FILL, 0, 0, 0);
        gtkut_combo_set_items (GTK_COMBO (uri_combo),
-                              "netscape -remote 'openURL(%s,raise)'",
+                              DEFAULT_BROWSER_CMD,
+                              "galeon --new-tab '%s'",
+                              "galeon '%s'",
+                              "mozilla -remote 'openurl(%s,new-window)'",
+                              "netscape -remote 'openURL(%s, new-window)'",
                               "netscape '%s'",
-                              "gnome-moz-remote --raise --newwin '%s'",
+                              "gnome-moz-remote --newwin '%s'",
+                              "kfmclient openURL '%s'",
+                              "opera -newwindow '%s'",
                               "kterm -e w3m '%s'",
                               "kterm -e lynx '%s'",
                               NULL);
-
        uri_entry = GTK_COMBO (uri_combo)->entry;
 
-       PACK_FRAME(vbox1, print_frame,
-                  _("Printing (%s will be replaced with file name)"));
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_container_add (GTK_CONTAINER (print_frame), hbox1);
-       gtk_container_set_border_width (GTK_CONTAINER (hbox1), 8);
-
-       printcmd_label = gtk_label_new (_("Command"));
+       printcmd_label = gtk_label_new (_("Print"));
        gtk_widget_show (printcmd_label);
-       gtk_box_pack_start (GTK_BOX (hbox1), printcmd_label, FALSE, FALSE, 0);
+       gtk_table_attach (GTK_TABLE (ext_table), printcmd_label, 0, 1, 1, 2,
+                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+       gtk_misc_set_alignment (GTK_MISC (printcmd_label), 1, 0.5);
 
        printcmd_entry = gtk_entry_new ();
        gtk_widget_show (printcmd_entry);
-       gtk_box_pack_start (GTK_BOX (hbox1), printcmd_entry, TRUE, TRUE, 0);
+       gtk_table_attach (GTK_TABLE (ext_table), printcmd_entry, 1, 2, 1, 2,
+                         GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
-       PACK_FRAME(vbox1, exteditor_frame,
-                  _("External editor (%s will be replaced with file name)"));
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_container_add (GTK_CONTAINER (exteditor_frame), hbox1);
-       gtk_container_set_border_width (GTK_CONTAINER (hbox1), 8);
-
-       exteditor_label = gtk_label_new (_("Command"));
+       exteditor_label = gtk_label_new (_("Editor"));
        gtk_widget_show (exteditor_label);
-       gtk_box_pack_start (GTK_BOX (hbox1), exteditor_label, FALSE, FALSE, 0);
+       gtk_table_attach (GTK_TABLE (ext_table), exteditor_label, 0, 1, 2, 3,
+                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+       gtk_misc_set_alignment (GTK_MISC (exteditor_label), 1, 0.5);
 
        exteditor_combo = gtk_combo_new ();
        gtk_widget_show (exteditor_combo);
-       gtk_box_pack_start (GTK_BOX (hbox1), exteditor_combo, TRUE, TRUE, 0);
+       gtk_table_attach (GTK_TABLE (ext_table), exteditor_combo, 1, 2, 2, 3,
+                         GTK_EXPAND | GTK_FILL, 0, 0, 0);
        gtkut_combo_set_items (GTK_COMBO (exteditor_combo),
                               "gedit %s",
                               "kedit %s",
@@ -2491,12 +2936,107 @@ static void prefs_other_create(void)
                               NULL);
        exteditor_entry = GTK_COMBO (exteditor_combo)->entry;
 
+       PACK_FRAME (vbox1, frame_addr, _("Address book"));
+
+       vbox_addr = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox_addr);
+       gtk_container_add (GTK_CONTAINER (frame_addr), vbox_addr);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox_addr), 8);
+
+       PACK_CHECK_BUTTON
+               (vbox_addr, checkbtn_addaddrbyclick,
+                _("Add address to destination when double-clicked"));
+
+       /* Clip Log */
+       PACK_FRAME (vbox1, frame_cliplog, _("Log Size"));
+
+       vbox_cliplog = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox_cliplog);
+       gtk_container_add (GTK_CONTAINER (frame_cliplog), vbox_cliplog);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox_cliplog), 8);
+       PACK_CHECK_BUTTON (vbox_cliplog, checkbtn_cliplog,
+                          _("Clip the log size"));
+       hbox_cliplog = gtk_hbox_new (FALSE, 3);
+       gtk_container_add (GTK_CONTAINER (vbox_cliplog), hbox_cliplog);
+       gtk_widget_show (hbox_cliplog);
+       
+       loglength_label = gtk_label_new (_("Log window length"));
+       gtk_box_pack_start (GTK_BOX (hbox_cliplog), loglength_label,
+                           FALSE, TRUE, 0);
+       gtk_widget_show (GTK_WIDGET (loglength_label));
+       loglength_entry = gtk_entry_new ();
+       gtk_widget_set_usize (GTK_WIDGET (loglength_entry), 64, -1);
+       gtk_box_pack_start (GTK_BOX (hbox_cliplog), loglength_entry,
+                           FALSE, TRUE, 0);
+       gtk_widget_show (GTK_WIDGET (loglength_entry));
+       loglength_label = gtk_label_new (_("(0 to stop logging in the log window)"));
+       gtk_box_pack_start (GTK_BOX (hbox_cliplog), loglength_label,
+                           FALSE, TRUE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, loglength_entry);
+
+#if 0
+#ifdef USE_OPENSSL
+       /* SSL */
+       PACK_FRAME (vbox1, frame_ssl, _("Security"));
+
+       vbox_ssl = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox_ssl);
+       gtk_container_add (GTK_CONTAINER (frame_ssl), vbox_ssl);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox_ssl), 8);
+       PACK_CHECK_BUTTON (vbox_ssl, checkbtn_ssl_ask_unknown_valid, 
+                          _("Ask before accepting SSL certificates"));
+       hbox_ssl = gtk_hbox_new (FALSE, 3);
+       gtk_container_add (GTK_CONTAINER (vbox_ssl), hbox_ssl);
+       gtk_widget_show (hbox_ssl);
+#endif
+#endif
+       
+       /* On Exit */
+       PACK_FRAME (vbox1, frame_exit, _("On exit"));
+
+       vbox_exit = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox_exit);
+       gtk_container_add (GTK_CONTAINER (frame_exit), vbox_exit);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox_exit), 8);
+
+       PACK_CHECK_BUTTON (vbox_exit, checkbtn_confonexit,
+                          _("Confirm on exit"));
+
+       hbox1 = gtk_hbox_new (FALSE, 32);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox_exit), hbox1, FALSE, FALSE, 0);
+
+       PACK_CHECK_BUTTON (hbox1, checkbtn_cleanonexit,
+                          _("Empty trash on exit"));
+       PACK_CHECK_BUTTON (hbox1, checkbtn_askonclean,
+                          _("Ask before emptying"));
+       SET_TOGGLE_SENSITIVITY (checkbtn_cleanonexit, checkbtn_askonclean);
+
+       PACK_CHECK_BUTTON (vbox_exit, checkbtn_warnqueued,
+                          _("Warn if there are queued messages"));
+
        other.uri_combo = uri_combo;
        other.uri_entry = uri_entry;
        other.printcmd_entry = printcmd_entry;
 
        other.exteditor_combo = exteditor_combo;
        other.exteditor_entry = exteditor_entry;
+
+       other.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
+       
+       other.checkbtn_cliplog     = checkbtn_cliplog;
+       other.loglength_entry      = loglength_entry;
+
+       other.checkbtn_confonexit  = checkbtn_confonexit;
+       other.checkbtn_cleanonexit = checkbtn_cleanonexit;
+       other.checkbtn_askonclean  = checkbtn_askonclean;
+       other.checkbtn_warnqueued  = checkbtn_warnqueued;
+       
+#if 0
+#ifdef USE_OPENSSL
+       other.checkbtn_ssl_ask_unknown_valid = checkbtn_ssl_ask_unknown_valid;
+#endif
+#endif
 }
 
 static void date_format_ok_btn_clicked(GtkButton *button, GtkWidget **widget)
@@ -2562,6 +3102,7 @@ static void date_format_entry_on_change(GtkEditable *editable,
        text = gtk_editable_get_chars(editable, 0, -1);
        if (text)
                strftime(buffer, sizeof buffer, text, cal_time); 
+       g_free(text);
        gtk_label_set_text(example, buffer);
 }
 
@@ -2621,29 +3162,29 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
        GtkWidget *cancel_btn;
        GtkWidget *datefmt_entry;
 
-       const struct {
+       struct {
                gchar *fmt;
                gchar *txt;
        } time_format[] = {
-               { "%a", _("the full abbreviated weekday name") },
-               { "%A", _("the full weekday name") },
-               { "%b", _("the abbreviated month name") },
-               { "%B", _("the full month name") },
-               { "%c", _("the preferred date and time for the current locale") },
-               { "%C", _("the century number (year/100)") },
-               { "%d", _("the day of the month as a decimal number") },
-               { "%H", _("the hour as a decimal number using a 24-hour clock") },
-               { "%I", _("the hour as a decimal number using a 12-hour clock") },
-               { "%j", _("the day of the year as a decimal number") },
-               { "%m", _("the month as a decimal number") },
-               { "%M", _("the minute as a decimal number") },
-               { "%p", _("either AM or PM") },
-               { "%S", _("the second as a decimal number") },
-               { "%w", _("the day of the week as a decimal number") },
-               { "%x", _("the preferred date for the current locale") },
-               { "%y", _("the last two digits of a year") },
-               { "%Y", _("the year as a decimal number") },
-               { "%Z", _("the time zone or name or abbreviation") }
+               { "%a", NULL },
+               { "%A", NULL },
+               { "%b", NULL },
+               { "%B", NULL },
+               { "%c", NULL },
+               { "%C", NULL },
+               { "%d", NULL },
+               { "%H", NULL },
+               { "%I", NULL },
+               { "%j", NULL },
+               { "%m", NULL },
+               { "%M", NULL },
+               { "%p", NULL },
+               { "%S", NULL },
+               { "%w", NULL },
+               { "%x", NULL },
+               { "%y", NULL },
+               { "%Y", NULL },
+               { "%Z", NULL }
        };
 
        gchar *titles[2];
@@ -2651,6 +3192,26 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
        const gint TIME_FORMAT_ELEMS =
                sizeof time_format / sizeof time_format[0];
 
+       time_format[0].txt  = _("the full abbreviated weekday name");
+       time_format[1].txt  = _("the full weekday name");
+       time_format[2].txt  = _("the abbreviated month name");
+       time_format[3].txt  = _("the full month name");
+       time_format[4].txt  = _("the preferred date and time for the current locale");
+       time_format[5].txt  = _("the century number (year/100)");
+       time_format[6].txt  = _("the day of the month as a decimal number");
+       time_format[7].txt  = _("the hour as a decimal number using a 24-hour clock");
+       time_format[8].txt  = _("the hour as a decimal number using a 12-hour clock");
+       time_format[9].txt  = _("the day of the year as a decimal number");
+       time_format[10].txt = _("the month as a decimal number");
+       time_format[11].txt = _("the minute as a decimal number");
+       time_format[12].txt = _("either AM or PM");
+       time_format[13].txt = _("the second as a decimal number");
+       time_format[14].txt = _("the day of the week as a decimal number");
+       time_format[15].txt = _("the preferred date for the current locale");
+       time_format[16].txt = _("the last two digits of a year");
+       time_format[17].txt = _("the year as a decimal number");
+       time_format[18].txt = _("the time zone or name or abbreviation");
+
        if (datefmt_win) return datefmt_win;
 
        datefmt_win = gtk_window_new(GTK_WINDOW_DIALOG);
@@ -2675,8 +3236,7 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
        datefmt_clist = gtk_clist_new_with_titles(2, titles);
        gtk_widget_show(datefmt_clist);
        gtk_container_add(GTK_CONTAINER(scrolledwindow1), datefmt_clist);
-/*     gtk_clist_set_column_width(GTK_CLIST(datefmt_clist), 0, 80);   */
-
+       /* gtk_clist_set_column_width(GTK_CLIST(datefmt_clist), 0, 80); */
        gtk_clist_set_selection_mode(GTK_CLIST(datefmt_clist),
                                     GTK_SELECTION_BROWSE);
 
@@ -2791,10 +3351,10 @@ static void prefs_quote_colors_dialog_create(void)
        GtkWidget *quotelevel2_label;
        GtkWidget *quotelevel3_label;
        GtkWidget *uri_label;
+       GtkWidget *signature_label;
        GtkWidget *tgt_folder_label;
        GtkWidget *hbbox;
        GtkWidget *ok_btn;
-       //GtkWidget *cancel_btn;
        GtkWidget *recycle_colors_btn;
        GtkWidget *frame_colors;
 
@@ -2810,7 +3370,7 @@ static void prefs_quote_colors_dialog_create(void)
        gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
        PACK_FRAME(vbox, frame_colors, _("Colors"));
 
-       table = gtk_table_new (4, 2, FALSE);
+       table = gtk_table_new (5, 2, FALSE);
        gtk_container_add (GTK_CONTAINER (frame_colors), table);
        gtk_container_set_border_width (GTK_CONTAINER (table), 8);
        gtk_table_set_row_spacings (GTK_TABLE (table), 2);
@@ -2849,6 +3409,12 @@ static void prefs_quote_colors_dialog_create(void)
        gtk_widget_set_usize (color_buttons.tgt_folder_btn, 40, 30);
        gtk_container_set_border_width (GTK_CONTAINER (color_buttons.tgt_folder_btn), 5);
 
+       color_buttons.signature_btn = gtk_button_new_with_label ("");
+       gtk_table_attach (GTK_TABLE (table), color_buttons.signature_btn,
+                         0, 1, 5, 6, 0, 0, 0, 0);
+       gtk_widget_set_usize (color_buttons.signature_btn, 40, 30);
+       gtk_container_set_border_width (GTK_CONTAINER (color_buttons.signature_btn), 5);
+
        quotelevel1_label = gtk_label_new (_("Quoted Text - First Level"));
        gtk_table_attach (GTK_TABLE (table), quotelevel1_label, 1, 2, 0, 1,
                          (GTK_EXPAND | GTK_FILL), 0, 0, 0);
@@ -2879,6 +3445,12 @@ static void prefs_quote_colors_dialog_create(void)
        gtk_label_set_justify (GTK_LABEL (tgt_folder_label), GTK_JUSTIFY_LEFT);
        gtk_misc_set_alignment (GTK_MISC (tgt_folder_label), 0, 0.5);
 
+       signature_label = gtk_label_new (_("Signatures"));
+       gtk_table_attach (GTK_TABLE (table), signature_label, 1, 2, 5, 6,
+                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+       gtk_label_set_justify (GTK_LABEL (signature_label), GTK_JUSTIFY_LEFT);
+       gtk_misc_set_alignment (GTK_MISC (signature_label), 0, 0.5);
+
        PACK_CHECK_BUTTON (vbox, recycle_colors_btn,
                           _("Recycle quote colors"));
 
@@ -2887,10 +3459,7 @@ static void prefs_quote_colors_dialog_create(void)
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
 
        gtk_widget_grab_default(ok_btn);
-       gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
-                          GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
-       gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
-                          GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT(window);
        gtk_signal_connect(GTK_OBJECT(window), "delete_event",
                           GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
        gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
@@ -2907,6 +3476,8 @@ static void prefs_quote_colors_dialog_create(void)
                           GTK_SIGNAL_FUNC(quote_color_set_dialog), "URI");
        gtk_signal_connect(GTK_OBJECT(color_buttons.tgt_folder_btn), "clicked",
                           GTK_SIGNAL_FUNC(quote_color_set_dialog), "TGTFLD");
+       gtk_signal_connect(GTK_OBJECT(color_buttons.signature_btn), "clicked",
+                          GTK_SIGNAL_FUNC(quote_color_set_dialog), "SIGNATURE");
        gtk_signal_connect(GTK_OBJECT(recycle_colors_btn), "toggled",
                           GTK_SIGNAL_FUNC(prefs_recycle_colors_toggled), NULL);
        gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
@@ -2923,6 +3494,8 @@ static void prefs_quote_colors_dialog_create(void)
                            prefs_common.uri_col);
        set_button_bg_color(color_buttons.tgt_folder_btn,
                            prefs_common.tgt_folder_col);
+       set_button_bg_color(color_buttons.signature_btn,
+                           prefs_common.signature_col);
        gtk_toggle_button_set_active((GtkToggleButton *)recycle_colors_btn,
                                     prefs_common.recycle_quote_colors);
 
@@ -2960,6 +3533,14 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data)
        } else if(g_strcasecmp(type, "TGTFLD") == 0) {
                title = _("Pick color for target folder");
                rgbvalue = prefs_common.tgt_folder_col;
+       } else if(g_strcasecmp(type, "SIGNATURE") == 0) {
+               title = _("Pick color for signatures");
+               rgbvalue = prefs_common.signature_col;
+#if USE_ASPELL         
+       } else if(g_strcasecmp(type, "Misspelled word") == 0) {
+               title = _("Pick color for misspelled word");
+               rgbvalue = prefs_common.misspelled_col;
+#endif         
        } else {   /* Should never be called */
                g_warning("Unrecognized datatype '%s' in quote_color_set_dialog\n", type);
                return;
@@ -3027,6 +3608,14 @@ static void quote_colors_set_dialog_ok(GtkWidget *widget, gpointer data)
                prefs_common.tgt_folder_col = rgbvalue;
                set_button_bg_color(color_buttons.tgt_folder_btn, rgbvalue);
                folderview_set_target_folder_color(prefs_common.tgt_folder_col);
+       } else if (g_strcasecmp(type, "SIGNATURE") == 0) {
+               prefs_common.signature_col = rgbvalue;
+               set_button_bg_color(color_buttons.signature_btn, rgbvalue);
+#if USE_ASPELL         
+       } else if (g_strcasecmp(type, "Misspelled word") == 0) {
+               prefs_common.misspelled_col = rgbvalue;
+               set_button_bg_color(spelling.misspelled_btn, rgbvalue);
+#endif         
        } else
                fprintf( stderr, "Unrecognized datatype '%s' in quote_color_set_dialog_ok\n", type );
 
@@ -3077,144 +3666,6 @@ static void prefs_recycle_colors_toggled(GtkWidget *widget)
        prefs_common.recycle_quote_colors = is_active;
 }
 
-void prefs_quote_description(void)
-{
-       if (!quote_desc_win)
-               prefs_quote_description_create();
-
-       manage_window_set_transient(GTK_WINDOW(quote_desc_win));
-       gtk_widget_show(quote_desc_win);
-       gtk_main();
-       gtk_widget_hide(quote_desc_win);
-}
-
-static void prefs_quote_description_create(void)
-{
-       GtkWidget *vbox;
-       GtkWidget *hbox;
-       GtkWidget *vbox2;
-       GtkWidget *label;
-       GtkWidget *hbbox;
-       GtkWidget *ok_btn;
-
-       quote_desc_win = gtk_window_new(GTK_WINDOW_DIALOG);
-       gtk_window_set_title(GTK_WINDOW(quote_desc_win),
-                            _("Description of symbols"));
-       gtk_container_set_border_width(GTK_CONTAINER(quote_desc_win), 8);
-       gtk_window_set_position(GTK_WINDOW(quote_desc_win), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(quote_desc_win), TRUE);
-       gtk_window_set_policy(GTK_WINDOW(quote_desc_win), FALSE, FALSE, FALSE);
-
-       vbox = gtk_vbox_new(FALSE, 8);
-       gtk_container_add(GTK_CONTAINER(quote_desc_win), vbox);
-
-       hbox = gtk_hbox_new(FALSE, 8);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
-
-       vbox2 = gtk_vbox_new(FALSE, 8);
-       gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
-
-#define PACK_LABEL() \
-       gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0); \
-       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); \
-       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-
-       label = gtk_label_new
-               ("%d\n"         /* date */
-                "%f\n"         /* from */
-                "%N\n"         /* full name of sender */
-                "%F\n"         /* first name of sender */
-                "%I\n"         /* initial of sender */
-                "%s\n"         /* subject */
-                "%t\n"         /* to */
-                "%c\n"         /* cc */
-                "%n\n"         /* newsgroups */
-                "%r\n"         /* references */
-                "%i");         /* message id */
-       PACK_LABEL();
-
-       label = gtk_label_new
-               ("?x(expr)");   /* condition */
-       PACK_LABEL();
-
-       label = gtk_label_new
-               ("%M\n"         /* message body */
-                "%Q\n"         /* quoted message body */
-                "%m\n"         /* message body without signature */
-                "%q\n"         /* quoted message body without signature */
-                "%%");         /* literal percent */
-       PACK_LABEL();
-
-       label = gtk_label_new
-               ("\\\\\n"       /* literal backslash */
-                "\\?\n"        /* literal question mark */
-                "\\(\n"        /* literal opening parenthesis */
-                "\\)");        /* literal closing parenthesis */
-       PACK_LABEL();
-
-       vbox2 = gtk_vbox_new(FALSE, 8);
-       gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
-
-       label = gtk_label_new
-               (_("Date\n"
-                  "From\n"
-                  "Full Name of Sender\n"
-                  "First Name of Sender\n"
-                  "Initial of Sender\n"
-                  "Subject\n"
-                  "To\n"
-                  "Cc\n"
-                  "Newsgroups\n"
-                  "References\n"
-                  "Message-ID"));
-       PACK_LABEL();
-
-       label = gtk_label_new
-               (_("If x is set, displays expr"));
-       PACK_LABEL();
-
-       label = gtk_label_new
-               (_("Message body\n"
-                  "Quoted message body\n"
-                  "Message body without signature\n"
-                  "Quoted message body without signature\n"
-                  "Literal %"));
-       PACK_LABEL();
-
-       label = gtk_label_new
-               (_("Literal backslash\n"
-                  "Literal question mark\n"
-                  "Literal opening parenthesis\n"
-                  "Literal closing parenthesis"));
-       PACK_LABEL();
-
-#undef PACK_LABEL
-
-       gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
-                               NULL, NULL, NULL, NULL);
-       gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
-
-       gtk_widget_grab_default(ok_btn);
-       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
-                          GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
-       gtk_signal_connect
-               (GTK_OBJECT(quote_desc_win), "key_press_event",
-                GTK_SIGNAL_FUNC(prefs_quote_description_key_pressed),
-                NULL);
-       gtk_signal_connect(GTK_OBJECT(quote_desc_win), "delete_event",
-                          GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
-
-       gtk_widget_show_all(vbox);
-}
-
-static void prefs_quote_description_key_pressed(GtkWidget *widget,
-                                               GdkEventKey *event,
-                                               gpointer data)
-{
-       if (event && event->keyval == GDK_Escape)
-               gtk_main_quit();
-}
-
 static void prefs_font_select(GtkButton *button, GtkEntry *entry)
 {
        gchar *font_name;
@@ -3284,6 +3735,397 @@ static void prefs_font_selection_ok(GtkButton *button, GtkEntry *entry)
        gtk_widget_hide(font_sel_win);
 }
 
+static void prefs_keybind_select(void)
+{
+       GtkWidget *window;
+       GtkWidget *vbox1;
+       GtkWidget *hbox1;
+       GtkWidget *label;
+       GtkWidget *combo;
+       GtkWidget *confirm_area;
+       GtkWidget *ok_btn;
+       GtkWidget *cancel_btn;
+
+       window = gtk_window_new (GTK_WINDOW_DIALOG);
+       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
+       gtk_window_set_title (GTK_WINDOW (window), _("Key bindings"));
+       gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+       gtk_window_set_modal (GTK_WINDOW (window), TRUE);
+       gtk_window_set_policy (GTK_WINDOW (window), FALSE, FALSE, FALSE);
+       manage_window_set_transient (GTK_WINDOW (window));
+
+       vbox1 = gtk_vbox_new (FALSE, VSPACING);
+       gtk_container_add (GTK_CONTAINER (window), vbox1);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       label = gtk_label_new
+               (_("Select preset:"));
+       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       combo = gtk_combo_new ();
+       gtk_box_pack_start (GTK_BOX (hbox1), combo, TRUE, TRUE, 0);
+       gtkut_combo_set_items (GTK_COMBO (combo),
+                              _("Default"),
+                              "Mew / Wanderlust",
+                              "Mutt",
+                              _("Old Sylpheed"),
+                              NULL);
+       gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (combo)->entry), FALSE);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       label = gtk_label_new
+               (_("You can also modify each menu shortcut by pressing\n"
+                  "any key(s) when placing the mouse pointer on the item."));
+       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       gtkut_button_set_create (&confirm_area, &ok_btn, _("OK"),
+                                &cancel_btn, _("Cancel"), NULL, NULL);
+       gtk_box_pack_end (GTK_BOX (hbox1), confirm_area, FALSE, FALSE, 0);
+       gtk_widget_grab_default (ok_btn);
+
+       MANAGE_WINDOW_SIGNALS_CONNECT(window);
+       gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+                           GTK_SIGNAL_FUNC (prefs_keybind_deleted), NULL);
+       gtk_signal_connect (GTK_OBJECT (window), "key_press_event",
+                           GTK_SIGNAL_FUNC (prefs_keybind_key_pressed), NULL);
+       gtk_signal_connect (GTK_OBJECT (ok_btn), "clicked",
+                           GTK_SIGNAL_FUNC (prefs_keybind_apply_clicked),
+                           NULL);
+       gtk_signal_connect (GTK_OBJECT (cancel_btn), "clicked",
+                           GTK_SIGNAL_FUNC (prefs_keybind_cancel),
+                           NULL);
+
+       gtk_widget_show_all(window);
+
+       keybind.window = window;
+       keybind.combo = combo;
+}
+
+static void prefs_keybind_key_pressed(GtkWidget *widget, GdkEventKey *event,
+                                     gpointer data)
+{
+       if (event && event->keyval == GDK_Escape)
+               prefs_keybind_cancel();
+}
+
+static gint prefs_keybind_deleted(GtkWidget *widget, GdkEventAny *event,
+                                 gpointer data)
+{
+       prefs_keybind_cancel();
+       return TRUE;
+}
+
+static void prefs_keybind_cancel(void)
+{
+       gtk_widget_destroy(keybind.window);
+       keybind.window = NULL;
+       keybind.combo = NULL;
+}
+
+static void prefs_keybind_apply_clicked(GtkWidget *widget)
+{
+       GtkEntry *entry = GTK_ENTRY(GTK_COMBO(keybind.combo)->entry);
+       gchar *text;
+       gchar *rc_str;
+
+       static gchar *default_menurc =
+               "(menu-path \"<Main>/File/Empty trash\" \"\")\n"
+               "(menu-path \"<Main>/File/Save as...\" \"<control>S\")\n"
+               "(menu-path \"<Main>/File/Print...\" \"\")\n"
+               "(menu-path \"<Main>/File/Exit\" \"<control>Q\")\n"
+
+               "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
+               "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
+               "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
+               "(menu-path \"<Main>/Edit/Search folder...\" \"<shift><control>F\")\n"
+
+               "(menu-path \"<Main>/View/Expand Summary View\" \"V\")\n"
+               "(menu-path \"<Main>/View/Expand Message View\" \"<shift>V\")\n"
+               "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
+               "(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
+               "(menu-path \"<Main>/View/Go to/Next message\" \"N\")\n"
+               "(menu-path \"<Main>/View/Go to/Prev unread message\" \"<shift>P\")\n"
+               "(menu-path \"<Main>/View/Go to/Next unread message\" \"<shift>N\")\n"
+               "(menu-path \"<Main>/View/Go to/Other folder...\" \"G\")\n"
+               "(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
+               "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
+               "(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
+               "(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
+
+               "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
+               "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
+               "(menu-path \"<Main>/Message/Compose an email message\" \"<control>M\")\n"
+               "(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
+               "(menu-path \"<Main>/Message/Reply to/all\" \"<shift><control>R\")\n"
+               "(menu-path \"<Main>/Message/Reply to/sender\" \"\")\n"
+               "(menu-path \"<Main>/Message/Reply to/mailing list\" \"<control>L\")\n"
+               "(menu-path \"<Main>/Message/Forward\" \"<control><alt>F\")\n"
+               /* "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n" */
+               "(menu-path \"<Main>/Message/Move...\" \"<control>O\")\n"
+               "(menu-path \"<Main>/Message/Copy...\" \"<shift><control>O\")\n"
+               "(menu-path \"<Main>/Message/Delete\" \"<control>D\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark\" \"<shift>asterisk\")\n"
+               "(menu-path \"<Main>/Message/Mark/Unmark\" \"U\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>exclam\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
+
+               "(menu-path \"<Main>/Tools/Address book\" \"<shift><control>A\")\n"
+               "(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
+               "(menu-path \"<Main>/Tools/Log window\" \"<shift><control>L\")\n"
+
+               "(menu-path \"<Compose>/File/Close\" \"<control>W\")\n"
+               "(menu-path \"<Compose>/Edit/Select all\" \"<control>A\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"\")";
+
+       static gchar *mew_wl_menurc =
+               "(menu-path \"<Main>/File/Empty trash\" \"<shift>D\")\n"
+               "(menu-path \"<Main>/File/Save as...\" \"Y\")\n"
+               "(menu-path \"<Main>/File/Print...\" \"<shift>numbersign\")\n"
+               "(menu-path \"<Main>/File/Exit\" \"<shift>Q\")\n"
+
+               "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
+               "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
+               "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
+               "(menu-path \"<Main>/Edit/Search folder...\" \"<control>S\")\n"
+
+               "(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
+               "(menu-path \"<Main>/View/Expand Message View\" \"\")\n"
+               "(menu-path \"<Main>/View/Thread view\" \"<shift>T\")\n"
+               "(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
+               "(menu-path \"<Main>/View/Go to/Next message\" \"N\")\n"
+               "(menu-path \"<Main>/View/Go to/Prev unread message\" \"<shift>P\")\n"
+               "(menu-path \"<Main>/View/Go to/Next unread message\" \"<shift>N\")\n"
+               "(menu-path \"<Main>/View/Go to/Other folder...\" \"G\")\n"
+               "(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
+               "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
+               "(menu-path \"<Main>/View/Show all headers\" \"<shift>H\")\n"
+               "(menu-path \"<Main>/View/Update\" \"<shift>S\")\n"
+
+               "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
+               "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
+               "(menu-path \"<Main>/Message/Compose an email message\" \"W\")\n"
+               "(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
+               "(menu-path \"<Main>/Message/Reply to/all\" \"<shift>A\")\n"
+               "(menu-path \"<Main>/Message/Reply to/sender\" \"\")\n"
+               "(menu-path \"<Main>/Message/Reply to/mailing list\" \"<control>L\")\n"
+               "(menu-path \"<Main>/Message/Forward\" \"F\")\n"
+               /* "(menu-path \"<Main>/Message/Forward as attachment\" \"<shift>F\")\n" */
+               "(menu-path \"<Main>/Message/Move...\" \"O\")\n"
+               "(menu-path \"<Main>/Message/Copy...\" \"<shift>O\")\n"
+               "(menu-path \"<Main>/Message/Delete\" \"D\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark\" \"<shift>asterisk\")\n"
+               "(menu-path \"<Main>/Message/Mark/Unmark\" \"U\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>exclam\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark as read\" \"<shift>R\")\n"
+
+               "(menu-path \"<Main>/Tools/Address book\" \"<shift><control>A\")\n"
+               "(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
+               "(menu-path \"<Main>/Tools/Log window\" \"<shift><control>L\")\n"
+
+               "(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
+               "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"<alt>B\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"<alt>F\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"<control>A\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"<control>W\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"<alt>D\")";
+
+       static gchar *mutt_menurc =
+               "(menu-path \"<Main>/File/Empty trash\" \"\")\n"
+               "(menu-path \"<Main>/File/Save as...\" \"S\")\n"
+               "(menu-path \"<Main>/File/Print...\" \"P\")\n"
+               "(menu-path \"<Main>/File/Exit\" \"Q\")\n"
+
+               "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
+               "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
+               "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
+               "(menu-path \"<Main>/Edit/Search messages...\" \"slash\")\n"
+
+               "(menu-path \"<Main>/View/Toggle summary view\" \"V\")\n"
+               "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
+               "(menu-path \"<Main>/View/Go to/Prev message\" \"\")\n"
+               "(menu-path \"<Main>/View/Go to/Next message\" \"\")\n"
+               "(menu-path \"<Main>/View/Go to/Prev unread message\" \"\")\n"
+               "(menu-path \"<Main>/View/Go to/Next unread message\" \"\")\n"
+               "(menu-path \"<Main>/View/Go to/Other folder...\" \"C\")\n"
+               "(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
+               "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
+               "(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
+               "(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
+
+               "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
+               "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
+               "(menu-path \"<Main>/Message/Compose new message\" \"M\")\n"
+               "(menu-path \"<Main>/Message/Reply\" \"R\")\n"
+               "(menu-path \"<Main>/Message/Reply to/all\" \"G\")\n"
+               "(menu-path \"<Main>/Message/Reply to/sender\" \"\")\n"
+               "(menu-path \"<Main>/Message/Reply to/mailing list\" \"<control>L\")\n"
+               "(menu-path \"<Main>/Message/Forward\" \"F\")\n"
+               "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n"
+               "(menu-path \"<Main>/Message/Move...\" \"<control>O\")\n"
+               "(menu-path \"<Main>/Message/Copy...\" \"<shift>C\")\n"
+               "(menu-path \"<Main>/Message/Delete\" \"D\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark\" \"<shift>F\")\n"
+               "(menu-path \"<Main>/Message/Mark/Unmark\" \"U\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>N\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
+
+               "(menu-path \"<Main>/Tools/Address book\" \"<shift><control>A\")\n"
+               "(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
+               "(menu-path \"<Main>/Tools/Log window\" \"<shift><control>L\")\n"
+
+               "(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
+               "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"<alt>B\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"<alt>F\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"<control>A\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"<control>W\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"<alt>D\")";
+
+       static gchar *old_sylpheed_menurc =
+               "(menu-path \"<Main>/File/Empty trash\" \"\")\n"
+               "(menu-path \"<Main>/File/Save as...\" \"\")\n"
+               "(menu-path \"<Main>/File/Print...\" \"<alt>P\")\n"
+               "(menu-path \"<Main>/File/Exit\" \"<alt>Q\")\n"
+
+               "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
+               "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
+               "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
+               "(menu-path \"<Main>/Edit/Search folder...\" \"<control>S\")\n"
+
+               "(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
+               "(menu-path \"<Main>/View/Expand Message View\" \"\")\n"
+               "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
+               "(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
+               "(menu-path \"<Main>/View/Go to/Next message\" \"N\")\n"
+               "(menu-path \"<Main>/View/Go to/Prev unread message\" \"<shift>P\")\n"
+               "(menu-path \"<Main>/View/Go to/Next unread message\" \"<shift>N\")\n"
+               "(menu-path \"<Main>/View/Go to/Other folder...\" \"<alt>G\")\n"
+               "(menu-path \"<Main>/View/Open in new window\" \"<shift><control>N\")\n"
+               "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
+               "(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
+               "(menu-path \"<Main>/View/Update\" \"<alt>U\")\n"
+
+               "(menu-path \"<Main>/Message/Get new mail\" \"<alt>I\")\n"
+               "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><alt>I\")\n"
+               "(menu-path \"<Main>/Message/Compose an email message\" \"<alt>N\")\n"
+               "(menu-path \"<Main>/Message/Reply\" \"<alt>R\")\n"
+               "(menu-path \"<Main>/Message/Reply to/all\" \"<shift><alt>R\")\n"
+               "(menu-path \"<Main>/Message/Reply to/sender\" \"<control><alt>R\")\n"
+               "(menu-path \"<Main>/Message/Reply to/mailing list\" \"<control>L\")\n"
+               "(menu-path \"<Main>/Message/Forward\" \"<shift><alt>F\")\n"
+               /* "(menu-path \"<Main>/Message/Forward as attachment\" \"<shift><control>F\")\n" */
+               "(menu-path \"<Main>/Message/Move...\" \"<alt>O\")\n"
+               "(menu-path \"<Main>/Message/Copy...\" \"\")\n"
+               "(menu-path \"<Main>/Message/Delete\" \"<alt>D\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark\" \"<shift>asterisk\")\n"
+               "(menu-path \"<Main>/Message/Mark/Unmark\" \"U\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>exclam\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
+
+               "(menu-path \"<Main>/Tools/Address book\" \"<alt>A\")\n"
+               "(menu-path \"<Main>/Tools/Execute\" \"<alt>X\")\n"
+               "(menu-path \"<Main>/Tools/Log window\" \"<alt>L\")\n"
+
+               "(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
+               "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"<alt>B\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"<alt>F\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"<control>A\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"<control>W\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"<alt>D\")";
+
+       static gchar *empty_menurc =
+               "(menu-path \"<Main>/File/Empty trash\" \"\")\n"
+               "(menu-path \"<Main>/File/Save as...\" \"\")\n"
+               "(menu-path \"<Main>/File/Print...\" \"\")\n"
+               "(menu-path \"<Main>/File/Exit\" \"\")\n"
+
+               "(menu-path \"<Main>/Edit/Copy\" \"\")\n"
+               "(menu-path \"<Main>/Edit/Select all\" \"\")\n"
+               "(menu-path \"<Main>/Edit/Find in current message...\" \"\")\n"
+               "(menu-path \"<Main>/Edit/Search folder...\" \"\")\n"
+
+               "(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
+               "(menu-path \"<Main>/View/Expand Message View\" \"\")\n"
+               "(menu-path \"<Main>/View/Thread view\" \"\")\n"
+               "(menu-path \"<Main>/View/Go to/Prev message\" \"\")\n"
+               "(menu-path \"<Main>/View/Go to/Next message\" \"\")\n"
+               "(menu-path \"<Main>/View/Go to/Prev unread message\" \"\")\n"
+               "(menu-path \"<Main>/View/Go to/Next unread message\" \"\")\n"
+               "(menu-path \"<Main>/View/Go to/Other folder...\" \"\")\n"
+               "(menu-path \"<Main>/View/Open in new window\" \"\")\n"
+               "(menu-path \"<Main>/View/View source\" \"\")\n"
+               "(menu-path \"<Main>/View/Show all headers\" \"\")\n"
+               "(menu-path \"<Main>/View/Update\" \"\")\n"
+
+               "(menu-path \"<Main>/Message/Get new mail\" \"\")\n"
+               "(menu-path \"<Main>/Message/Get from all accounts\" \"\")\n"
+               "(menu-path \"<Main>/Message/Compose an email message\" \"\")\n"
+               "(menu-path \"<Main>/Message/Reply\" \"\")\n"
+               "(menu-path \"<Main>/Message/Reply to/all\" \"\")\n"
+               "(menu-path \"<Main>/Message/Reply to/sender\" \"\")\n"
+               "(menu-path \"<Main>/Message/Reply to/mailing list\" \"\")\n"
+               "(menu-path \"<Main>/Message/Forward\" \"\")\n"
+               /* "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n" */
+               "(menu-path \"<Main>/Message/Move...\" \"\")\n"
+               "(menu-path \"<Main>/Message/Copy...\" \"\")\n"
+               "(menu-path \"<Main>/Message/Delete\" \"\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark\" \"\")\n"
+               "(menu-path \"<Main>/Message/Mark/Unmark\" \"\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"\")\n"
+               "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
+
+               "(menu-path \"<Main>/Tools/Address book\" \"\")\n"
+               "(menu-path \"<Main>/Tools/Execute\" \"\")\n"
+               "(menu-path \"<Main>/Tools/Log window\" \"\")\n"
+
+               "(menu-path \"<Compose>/File/Close\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"\")\n"
+               "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"\")";
+
+       text = gtk_entry_get_text(entry);
+
+       if (!strcmp(text, _("Default")))
+               rc_str = default_menurc;
+       else if (!strcmp(text, "Mew / Wanderlust"))
+               rc_str = mew_wl_menurc;
+       else if (!strcmp(text, "Mutt"))
+               rc_str = mutt_menurc;
+       else if (!strcmp(text, _("Old Sylpheed")))
+               rc_str = old_sylpheed_menurc;
+       else
+               return;
+
+       gtk_item_factory_parse_rc_string(empty_menurc);
+       gtk_item_factory_parse_rc_string(rc_str);
+
+       gtk_widget_destroy(keybind.window);
+       keybind.window = NULL;
+       keybind.combo = NULL;
+}
+
 static void prefs_common_charset_set_data_from_optmenu(PrefParam *pparam)
 {
        GtkWidget *menu;
@@ -3299,30 +4141,20 @@ static void prefs_common_charset_set_data_from_optmenu(PrefParam *pparam)
 
 static void prefs_common_charset_set_optmenu(PrefParam *pparam)
 {
-       GList *cur;
        GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
-       GtkWidget *menu;
-       GtkWidget *menuitem;
-       gchar *charset;
-       gint n = 0;
+       gint index;
 
        g_return_if_fail(optmenu != NULL);
        g_return_if_fail(*((gchar **)pparam->data) != NULL);
 
-       menu = gtk_option_menu_get_menu(optmenu);
-       for (cur = GTK_MENU_SHELL(menu)->children;
-            cur != NULL; cur = cur->next) {
-               menuitem = GTK_WIDGET(cur->data);
-               charset = gtk_object_get_user_data(GTK_OBJECT(menuitem));
-               if (!strcmp(charset, *((gchar **)pparam->data))) {
-                       gtk_option_menu_set_history(optmenu, n);
-                       return;
-               }
-               n++;
+       index = menu_find_option_menu_index(optmenu, *((gchar **)pparam->data),
+                                           (GCompareFunc)strcmp);
+       if (index >= 0)
+               gtk_option_menu_set_history(optmenu, index);
+       else {
+               gtk_option_menu_set_history(optmenu, 0);
+               prefs_common_charset_set_data_from_optmenu(pparam);
        }
-
-       gtk_option_menu_set_history(optmenu, 0);
-       prefs_common_charset_set_data_from_optmenu(pparam);
 }
 
 static void prefs_common_recv_dialog_set_data_from_optmenu(PrefParam *pparam)
@@ -3354,6 +4186,41 @@ static void prefs_common_recv_dialog_set_optmenu(PrefParam *pparam)
                gtk_option_menu_set_history(optmenu, 2);
                break;
        default:
+               break;
+       }
+
+       menu = gtk_option_menu_get_menu(optmenu);
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+}
+
+static void prefs_common_send_dialog_set_data_from_optmenu(PrefParam *pparam)
+{
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+
+       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       *((SendDialogMode *)pparam->data) = GPOINTER_TO_INT
+               (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+}
+
+static void prefs_common_send_dialog_set_optmenu(PrefParam *pparam)
+{
+       SendDialogMode mode = *((SendDialogMode *)pparam->data);
+       GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+
+       switch (mode) {
+       case SEND_DIALOG_ALWAYS:
+               gtk_option_menu_set_history(optmenu, 0);
+               break;
+       case SEND_DIALOG_NEVER:
+               gtk_option_menu_set_history(optmenu, 1);
+               break;
+       default:
+               break;
        }
 
        menu = gtk_option_menu_get_menu(optmenu);
@@ -3379,16 +4246,31 @@ static void prefs_common_ok(void)
 {
        prefs_common_apply();
        gtk_widget_hide(dialog.window);
-       if (quote_desc_win && GTK_WIDGET_VISIBLE(quote_desc_win))
-               gtk_widget_hide(quote_desc_win);
 
        inc_unlock();
 }
 
 static void prefs_common_apply(void)
 {
+       gchar *entry_pixmap_theme_str;
+       gboolean update_pixmap_theme;
+       
+       entry_pixmap_theme_str = gtk_entry_get_text(GTK_ENTRY(interface.entry_pixmap_theme));
+       if (entry_pixmap_theme_str && 
+               (strcmp(prefs_common.pixmap_theme_path, entry_pixmap_theme_str) != 0) )
+               update_pixmap_theme = TRUE;
+       else
+               update_pixmap_theme = FALSE;
+       
        prefs_set_data_from_dialog(param);
-       main_window_reflect_prefs_all();
+       
+       if (update_pixmap_theme)
+       {
+               main_window_reflect_prefs_all_real(TRUE);
+               compose_reflect_prefs_pixmap_theme();
+       } else
+               main_window_reflect_prefs_all_real(FALSE);
+       
        prefs_common_save_config();
 
        inc_autocheck_timer_remove();
@@ -3425,7 +4307,6 @@ static void prefs_nextunreadmsgdialog_set_optmenu(PrefParam *pparam)
        case NEXTUNREADMSGDIALOG_ASSUME_NO:
                gtk_option_menu_set_history(optmenu, 2);
                break;
-       default:
        }
 
        menu = gtk_option_menu_get_menu(optmenu);
@@ -3440,37 +4321,6 @@ static void prefs_common_cancel(void)
 }
 
 
-static struct _ComposePrefs
-{
-       GtkWidget *window;
-
-       GtkWidget *close_btn;
-} composeprefs;
-
-static void compose_prefs_key_pressed(GtkWidget *widget, GdkEventKey *event);
-static gint compose_prefs_delete_event(GtkWidget *widget, GdkEventAny *event);
-static void compose_prefs_close(GtkWidget *widget);
-static void compose_prefs_fmt_create(void);
-
-static void compose_prefs_close(GtkWidget *widget)
-{
-       gtk_widget_hide(composeprefs.window);
-}
-
-static gint compose_prefs_delete_event(GtkWidget *widget, GdkEventAny *event)
-{
-       gtk_widget_hide(composeprefs.window);
-
-       return TRUE;
-}
-
-static void compose_prefs_key_pressed(GtkWidget *widget, GdkEventKey *event)
-{
-       if (event && event->keyval == GDK_Escape) {
-               gtk_widget_hide(composeprefs.window);
-       }
-}
-
 /* static void prefs_recvdialog_set_data_from_optmenu(PrefParam *pparam)
 {
        GtkWidget *menu;