move signature settings to Account Prefs
[claws.git] / src / prefs_common.c
index 83dff01bc19e74e7c2ef57b3e12fc092bb4b4f36..e59327cc09c20cfae7972764e2d617338f1c2580 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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"
@@ -56,8 +56,8 @@
 #include "stock_pixmap.h"
 #include "quote_fmt.h"
 
-#if USE_PSPELL
-#include "gtkspell.h"
+#if USE_ASPELL
+#include "gtkaspell.h"
 #endif
 
 PrefsCommon prefs_common;
@@ -99,12 +99,10 @@ static struct Send {
        GtkWidget *checkbtn_queuemsg;
 
        GtkWidget *optmenu_charset;
+       GtkWidget *optmenu_encoding_method;
 } p_send;
 
 static struct Compose {
-       GtkWidget *checkbtn_autosig;
-       GtkWidget *entry_sigsep;
-
        GtkWidget *entry_fw_quotemark;
        GtkWidget *text_fw_quotefmt;
 
@@ -121,19 +119,23 @@ static struct Compose {
        GtkWidget *checkbtn_forward_account_autosel;
        GtkWidget *checkbtn_reedit_account_autosel;
        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 *checkbtn_reply_with_quote;
+       
+       GtkWidget *checkbtn_autosave;
+       GtkWidget *entry_autosave_length;
 } compose;
 
        /* spelling */
-#if USE_PSPELL
+#if USE_ASPELL
 static struct Spelling {
-       GtkWidget *checkbtn_enable_pspell;
-       GtkWidget *entry_pspell_path;
-       GtkWidget *btn_pspell_path;
+       GtkWidget *checkbtn_enable_aspell;
+       GtkWidget *entry_aspell_path;
+       GtkWidget *btn_aspell_path;
        GtkWidget *optmenu_dictionary;
        GtkWidget *optmenu_sugmode;
        GtkWidget *misspelled_btn;
@@ -161,7 +163,6 @@ static struct Display {
        GtkWidget *entry_boldfont;
 
        GtkWidget *chkbtn_folder_unread;
-       GtkWidget *chkbtn_display_img;
        GtkWidget *entry_ng_abbrev_len;
        GtkWidget *spinbtn_ng_abbrev_len;
        GtkObject *spinbtn_ng_abbrev_len_adj;
@@ -169,10 +170,8 @@ static struct Display {
        GtkWidget *chkbtn_transhdr;
 
        GtkWidget *chkbtn_swapfrom;
-       GtkWidget *chkbtn_hscrollbar;
        GtkWidget *chkbtn_useaddrbook;
-       GtkWidget *chkbtn_expand_thread;
-       GtkWidget *chkbtn_bold_unread;
+       GtkWidget *chkbtn_threadsubj;
        GtkWidget *entry_datefmt;
 } display;
 
@@ -190,6 +189,9 @@ 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
@@ -208,11 +210,13 @@ 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_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;
@@ -224,12 +228,18 @@ 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;
 
@@ -239,6 +249,7 @@ static struct MessageColorButtons {
        GtkWidget *quote_level3_btn;
        GtkWidget *uri_btn;
        GtkWidget *tgt_folder_btn;
+       GtkWidget *signature_btn;
 } color_buttons;
 
 static struct KeybindDialog {
@@ -251,16 +262,22 @@ static guint font_sel_conn_id;
 static GtkWidget *quote_color_win;
 static GtkWidget *color_dialog;
 
-static void prefs_common_charset_set_data_from_optmenu(PrefParam *pparam);
-static void prefs_common_charset_set_optmenu         (PrefParam *pparam);
+static void prefs_common_charset_set_data_from_optmenu    (PrefParam *pparam);
+static void prefs_common_charset_set_optmenu              (PrefParam *pparam);
+static void prefs_common_encoding_set_data_from_optmenu    (PrefParam *pparam);
+static void prefs_common_encoding_set_optmenu             (PrefParam *pparam);
+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_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
+#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);
@@ -287,7 +304,7 @@ static PrefParam param[] = {
        {"inc_local", "TRUE", &prefs_common.inc_local, P_BOOL,
         &receive.checkbtn_local,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"filter_on_inc_local", "FALSE", &prefs_common.filter_on_inc, P_BOOL,
+       {"filter_on_inc_local", "TRUE", &prefs_common.filter_on_inc, P_BOOL,
         &receive.checkbtn_filter_on_inc,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"spool_path", DEFAULT_SPOOL_PATH, &prefs_common.spool_path, P_STRING,
@@ -338,14 +355,12 @@ static PrefParam param[] = {
         &p_send.optmenu_charset,
         prefs_common_charset_set_data_from_optmenu,
         prefs_common_charset_set_optmenu},
+       {"encoding_method", "0", &prefs_common.encoding_method, P_ENUM,
+        &p_send.optmenu_encoding_method,
+        prefs_common_encoding_set_data_from_optmenu,
+        prefs_common_encoding_set_optmenu},
 
        /* Compose */
-       {"auto_signature", "TRUE", &prefs_common.auto_sig, P_BOOL,
-        &compose.checkbtn_autosig,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-       {"signature_separator", "-- ", &prefs_common.sig_sep, P_STRING,
-        &compose.entry_sigsep, prefs_set_data_from_entry, prefs_set_entry},
-
        {"auto_ext_editor", "FALSE", &prefs_common.auto_exteditor, P_BOOL,
         &compose.checkbtn_autoextedit,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -379,17 +394,23 @@ static PrefParam param[] = {
         {"smart_wrapping", "TRUE", &prefs_common.smart_wrapping,
         P_BOOL, &compose.checkbtn_smart_wrapping,
         prefs_set_data_from_toggle, prefs_set_toggle},
-#if USE_PSPELL
-       {"enable_pspell", "TRUE", &prefs_common.enable_pspell,
-        P_BOOL, &spelling.checkbtn_enable_pspell,
+        {"autosave", "FALSE", &prefs_common.autosave,
+        P_BOOL, &compose.checkbtn_autosave,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+        {"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", PSPELL_PATH, &prefs_common.pspell_path, 
-        P_STRING, &spelling.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, &spelling.optmenu_dictionary, 
         prefs_dictionary_set_data_from_optmenu, prefs_dictionary_set_optmenu },
-       {"pspell_sugmode",  "1", &prefs_common.pspell_sugmode,
+       {"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,
@@ -418,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},
 
@@ -465,11 +490,6 @@ static PrefParam param[] = {
         &prefs_common.display_folder_unread, P_BOOL,
         &display.chkbtn_folder_unread,
         prefs_set_data_from_toggle, prefs_set_toggle},
-
-       {"display_img", "TRUE",
-        &prefs_common.display_img, P_BOOL,
-        &display.chkbtn_display_img,
-        prefs_set_data_from_toggle, prefs_set_toggle},
        {"newsgroup_abbrev_len", "16",
         &prefs_common.ng_abbrev_len, P_INT,
         &display.spinbtn_ng_abbrev_len,
@@ -483,21 +503,20 @@ static PrefParam param[] = {
        {"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},
+       {"thread_by_subject", "TRUE", &prefs_common.thread_by_subject, P_BOOL,
+        &display.chkbtn_threadsubj,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"date_format", "%y/%m/%d(%a) %H:%M", &prefs_common.date_format,
         P_STRING, &display.entry_datefmt,
         prefs_set_data_from_entry, prefs_set_entry},
-       {"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},
@@ -505,6 +524,8 @@ static PrefParam param[] = {
         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,
@@ -513,7 +534,7 @@ static PrefParam param[] = {
        {"summary_col_show_mark", "TRUE",
         &prefs_common.summary_col_visible[S_COL_MARK], P_BOOL, NULL, NULL, NULL},
        {"summary_col_show_unread", "TRUE",
-        &prefs_common.summary_col_visible[S_COL_UNREAD], P_BOOL, NULL, NULL, NULL},
+        &prefs_common.summary_col_visible[S_COL_STATUS], P_BOOL, NULL, NULL, NULL},
        {"summary_col_show_mime", "TRUE",
         &prefs_common.summary_col_visible[S_COL_MIME], P_BOOL, NULL, NULL, NULL},
        {"summary_col_show_subject", "TRUE",
@@ -534,7 +555,7 @@ static PrefParam param[] = {
        {"summary_col_pos_mark", "0",
          &prefs_common.summary_col_pos[S_COL_MARK], P_INT, NULL, NULL, NULL},
        {"summary_col_pos_unread", "1",
-         &prefs_common.summary_col_pos[S_COL_UNREAD], P_INT, NULL, NULL, NULL},
+         &prefs_common.summary_col_pos[S_COL_STATUS], P_INT, NULL, NULL, NULL},
        {"summary_col_pos_mime", "2",
          &prefs_common.summary_col_pos[S_COL_MIME], P_INT, NULL, NULL, NULL},
        {"summary_col_pos_subject", "3",
@@ -555,7 +576,7 @@ static PrefParam param[] = {
        {"summary_col_size_mark", "10",
         &prefs_common.summary_col_size[S_COL_MARK], P_INT, NULL, NULL, NULL},
        {"summary_col_size_unread", "13",
-        &prefs_common.summary_col_size[S_COL_UNREAD], P_INT, NULL, NULL, NULL},
+        &prefs_common.summary_col_size[S_COL_STATUS], P_INT, NULL, NULL, NULL},
        {"summary_col_size_mime", "10",
         &prefs_common.summary_col_size[S_COL_MIME], P_INT, NULL, NULL, NULL},
        {"summary_col_size_subject", "200",
@@ -632,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},
@@ -664,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},
 
@@ -717,6 +745,10 @@ static PrefParam param[] = {
        {"open_unread_on_enter", "FALSE", &prefs_common.open_unread_on_enter,
         P_BOOL, &interface.checkbtn_openunread,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"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},
@@ -727,23 +759,27 @@ 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},
 
-       {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
-        P_BOOL, &interface.checkbtn_addaddrbyclick,
-        prefs_set_data_from_toggle, prefs_set_toggle},
        {"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", "netscape -remote 'openURL(%s,raise)'",
+       {"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,
@@ -752,6 +788,10 @@ static PrefParam param[] = {
         &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, &other.checkbtn_addaddrbyclick,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
        {"confirm_on_exit", "TRUE", &prefs_common.confirm_on_exit, P_BOOL,
         &other.checkbtn_confonexit,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -764,10 +804,19 @@ static PrefParam param[] = {
        {"warn_queued_on_exit", "TRUE", &prefs_common.warn_queued_on_exit,
         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},
 
-       {"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},
@@ -790,8 +839,10 @@ static PrefParam param[] = {
 static void prefs_common_create                (void);
 static void prefs_receive_create       (void);
 static void prefs_send_create          (void);
-static void prefs_compose_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);
 static void prefs_message_create       (void);
@@ -868,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;
 }
 
@@ -950,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),
@@ -976,7 +1026,7 @@ 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_PSPELL
+#if USE_ASPELL
        prefs_spelling_create();
        SET_NOTEBOOK_LABEL(dialog.notebook, _("Spell Checker"),   page++);
 #endif 
@@ -1165,7 +1215,7 @@ static void prefs_receive_create(void)
        gtk_box_pack_start (GTK_BOX (vbox2), hbox_newmail_notify, FALSE, 
                            FALSE, 0);
 
-       label_newmail_notify_cmd = gtk_label_new (_("Command  to execute:\n"
+       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), 
@@ -1247,10 +1297,13 @@ static void prefs_send_create(void)
        GtkWidget *checkbtn_savemsg;
        GtkWidget *checkbtn_queuemsg;
        GtkWidget *label_outcharset;
-       GtkWidget *optmenu;
+       GtkWidget *optmenu_charset;
        GtkWidget *optmenu_menu;
        GtkWidget *menuitem;
        GtkWidget *label_charset_desc;
+       GtkWidget *optmenu_encoding;
+       GtkWidget *label_encoding;
+       GtkWidget *label_encoding_desc;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -1291,7 +1344,7 @@ 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 Sent"));
+                          _("Save sent messages to Sent folder"));
        PACK_CHECK_BUTTON (vbox2, checkbtn_queuemsg,
                           _("Queue messages that fail to send"));
 
@@ -1303,20 +1356,20 @@ static void prefs_send_create(void)
        gtk_widget_show (label_outcharset);
        gtk_box_pack_start (GTK_BOX (hbox1), label_outcharset, FALSE, FALSE, 0);
 
-       optmenu = gtk_option_menu_new ();
-       gtk_widget_show (optmenu);
-       gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
+       optmenu_charset = gtk_option_menu_new ();
+       gtk_widget_show (optmenu_charset);
+       gtk_box_pack_start (GTK_BOX (hbox1), optmenu_charset, FALSE, FALSE, 0);
 
        optmenu_menu = gtk_menu_new ();
 
-#define SET_MENUITEM(str, charset) \
+#define SET_MENUITEM(str, data) \
 { \
-       MENUITEM_ADD(optmenu_menu, menuitem, str, charset); \
+       MENUITEM_ADD(optmenu_menu, menuitem, str, data); \
 }
 
        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);
@@ -1326,11 +1379,11 @@ static void prefs_send_create(void)
        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
+#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
+#if HAVE_ICONV
        SET_MENUITEM(_("Cyrillic (Windows-1251)"),       CS_WINDOWS_1251);
        SET_MENUITEM(_("Cyrillic (KOI8-U)"),             CS_KOI8_U);
 #endif
@@ -1349,7 +1402,8 @@ static void prefs_send_create(void)
        SET_MENUITEM(_("Thai (TIS-620)"),                CS_TIS_620);
        SET_MENUITEM(_("Thai (Windows-874)"),            CS_WINDOWS_874);
 
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
+       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_charset),
+                                 optmenu_menu);
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
@@ -1361,7 +1415,43 @@ static void prefs_send_create(void)
        gtk_widget_show (label_charset_desc);
        gtk_box_pack_start (GTK_BOX (hbox1), label_charset_desc,
                            FALSE, FALSE, 0);
-       gtk_label_set_justify(GTK_LABEL (label_charset_desc), GTK_JUSTIFY_LEFT);
+       gtk_label_set_justify (GTK_LABEL (label_charset_desc),
+                              GTK_JUSTIFY_LEFT);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       label_encoding = gtk_label_new (_("Transfer encoding"));
+       gtk_widget_show (label_encoding);
+       gtk_box_pack_start (GTK_BOX (hbox1), label_encoding, FALSE, FALSE, 0);
+
+       optmenu_encoding = gtk_option_menu_new ();
+       gtk_widget_show (optmenu_encoding);
+       gtk_box_pack_start (GTK_BOX (hbox1), optmenu_encoding, FALSE, FALSE, 0);
+
+       optmenu_menu = gtk_menu_new ();
+
+       SET_MENUITEM(_("Automatic"),     CTE_AUTO);
+       SET_MENUITEM("base64",           CTE_BASE64);
+       SET_MENUITEM("quoted-printable", CTE_QUOTED_PRINTABLE);
+       SET_MENUITEM("8bit",             CTE_8BIT);
+
+       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_encoding),
+                                 optmenu_menu);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       label_encoding_desc = gtk_label_new
+               (_("Specify Content-Transfer-Encoding used when\n"
+                  "message body contains non-ASCII characters."));
+       gtk_widget_show (label_encoding_desc);
+       gtk_box_pack_start (GTK_BOX (hbox1), label_encoding_desc,
+                           FALSE, FALSE, 0);
+       gtk_label_set_justify (GTK_LABEL (label_encoding_desc),
+                              GTK_JUSTIFY_LEFT);
 
        p_send.checkbtn_extsend = checkbtn_extsend;
        p_send.entry_extsend    = entry_extsend;
@@ -1370,7 +1460,8 @@ static void prefs_send_create(void)
        p_send.checkbtn_savemsg  = checkbtn_savemsg;
        p_send.checkbtn_queuemsg = checkbtn_queuemsg;
 
-       p_send.optmenu_charset = optmenu;
+       p_send.optmenu_charset = optmenu_charset;
+       p_send.optmenu_encoding_method = optmenu_encoding;
 }
 
 static void prefs_common_recv_dialog_newmail_notify_toggle_cb(GtkWidget *w, gpointer data)
@@ -1384,7 +1475,7 @@ static void prefs_common_recv_dialog_newmail_notify_toggle_cb(GtkWidget *w, gpoi
        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;
@@ -1395,7 +1486,7 @@ static void prefs_dictionary_set_data_from_optmenu(PrefParam *param)
        g_return_if_fail(param->widget);
        g_return_if_fail(*(param->widget));
 
-       dict_fullname = 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)
@@ -1442,7 +1533,7 @@ static void prefs_speller_sugmode_set_data_from_optmenu(PrefParam *param)
        g_return_if_fail(param->widget);
        g_return_if_fail(*(param->widget));
 
-       sugmode = gtkpspell_get_sugmode_from_option_menu
+       sugmode = gtkaspell_get_sugmode_from_option_menu
                (GTK_OPTION_MENU(*(param->widget)));
        *((gint *) param->data) = sugmode;
 }
@@ -1456,11 +1547,11 @@ static void prefs_speller_sugmode_set_optmenu(PrefParam *pparam)
        g_return_if_fail(pparam->data != NULL);
 
        sugmode = *(gint *) pparam->data;
-       gtkpspell_sugmode_option_menu_set(optmenu, sugmode);
+       gtkaspell_sugmode_option_menu_set(optmenu, sugmode);
 }
        
        
-static void prefs_spelling_checkbtn_enable_pspell_toggle_cb
+static void prefs_spelling_checkbtn_enable_aspell_toggle_cb
        (GtkWidget *widget,
         gpointer data)
 {
@@ -1468,40 +1559,40 @@ static void prefs_spelling_checkbtn_enable_pspell_toggle_cb
 
        toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 
-       gtk_widget_set_sensitive(spelling.entry_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_pspell_path,     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_spelling_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,
+               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);
+               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(spelling.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(
                                        spelling.optmenu_dictionary), 0);
@@ -1510,7 +1601,7 @@ static void prefs_spelling_btn_pspell_path_clicked_cb(GtkWidget *widget,
                        g_free(prefs_common.dictionary);
 
                prefs_common.dictionary = 
-                       gtkpspell_get_dictionary_menu_active_item(
+                       gtkaspell_get_dictionary_menu_active_item(
                                gtk_option_menu_get_menu(
                                        GTK_OPTION_MENU(
                                                spelling.optmenu_dictionary)));
@@ -1524,11 +1615,11 @@ static void prefs_spelling_create()
        GtkWidget *vbox1;
        GtkWidget *frame_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_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;
@@ -1552,11 +1643,11 @@ static void prefs_spelling_create()
        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)"));
+       PACK_CHECK_BUTTON(vbox_spell, checkbtn_enable_aspell, 
+                         _("Enable spell checker"));
 
-       gtk_signal_connect(GTK_OBJECT(checkbtn_enable_pspell), "toggled",
-                          GTK_SIGNAL_FUNC(prefs_spelling_checkbtn_enable_pspell_toggle_cb),
+       gtk_signal_connect(GTK_OBJECT(checkbtn_enable_aspell), "toggled",
+                          GTK_SIGNAL_FUNC(prefs_spelling_checkbtn_enable_aspell_toggle_cb),
                           NULL);
 
        /* Check while typing */
@@ -1566,7 +1657,9 @@ static void prefs_spelling_create()
        PACK_CHECK_BUTTON(vbox_spell, checkbtn_use_alternate, 
                          _("Enable alternate dictionary"));
 
-       help_label = gtk_label_new(_("Enabling alternate dictionary makes switching\nwith the last used dictionary faster."));
+       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);
        
@@ -1577,31 +1670,31 @@ static void prefs_spelling_create()
 
        gtk_box_pack_start(GTK_BOX(vbox_spell), spell_table, TRUE, TRUE, 0);
 
-       label_pspell_path = gtk_label_new (_("Dictionaries path:"));
-       gtk_misc_set_alignment(GTK_MISC(label_pspell_path), 1.0, 0.5);
-       gtk_widget_show(label_pspell_path);
-       gtk_table_attach (GTK_TABLE (spell_table), label_pspell_path, 0, 1, 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_pspell_path = gtk_hbox_new (FALSE, 8);
-       gtk_table_attach (GTK_TABLE (spell_table), hbox_pspell_path, 1, 2, 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_pspell_path);
+       gtk_widget_show(hbox_aspell_path);
 
-       entry_pspell_path = gtk_entry_new();
-       gtk_widget_show(entry_pspell_path);
-       gtk_box_pack_start(GTK_BOX(hbox_pspell_path), entry_pspell_path, TRUE,
+       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_pspell_path, prefs_common.enable_pspell);
+       gtk_widget_set_sensitive(entry_aspell_path, prefs_common.enable_aspell);
 
-       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);
+       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_pspell_path), "clicked", 
-                          GTK_SIGNAL_FUNC(prefs_spelling_btn_pspell_path_clicked_cb),
+       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:"));
@@ -1613,11 +1706,11 @@ static void prefs_spelling_create()
        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));
+                                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_pspell);
+       gtk_widget_set_sensitive(optmenu_dictionary, prefs_common.enable_aspell);
 
        /* Suggestion mode */
        sugmode_label = gtk_label_new(_("Default suggestion mode"));
@@ -1629,10 +1722,10 @@ static void prefs_spelling_create()
        sugmode_optmenu = gtk_option_menu_new();
        gtk_widget_show(sugmode_optmenu);
        gtk_option_menu_set_menu(GTK_OPTION_MENU(sugmode_optmenu),
-                           gtkpspell_sugmode_option_menu_new(prefs_common.pspell_sugmode));
+                           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_pspell);
+       gtk_widget_set_sensitive(sugmode_optmenu, prefs_common.enable_aspell);
 
        /* Color */
        color_label = gtk_label_new(_("Misspelled word color:"));
@@ -1650,15 +1743,15 @@ static void prefs_spelling_create()
        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_pspell);
+       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_pspell = checkbtn_enable_pspell;
-       spelling.entry_pspell_path      = entry_pspell_path;
-       spelling.btn_pspell_path        = btn_pspell_path;
+       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;
@@ -1674,12 +1767,6 @@ static void prefs_compose_create(void)
        GtkWidget *vbox2;
        GtkWidget *hbox1;
 
-       GtkWidget *frame_sig;
-       GtkWidget *vbox_sig;
-       GtkWidget *checkbtn_autosig;
-       GtkWidget *label_sigsep;
-       GtkWidget *entry_sigsep;
-
        GtkWidget *checkbtn_autoextedit;
 
        GtkWidget *frame_autosel;
@@ -1705,40 +1792,24 @@ static void prefs_compose_create(void)
        GtkWidget *checkbtn_autowrap;
        GtkWidget *checkbtn_wrapatsend;
 
+       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;
 
+       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);
 
-       PACK_FRAME(vbox1, frame_sig, _("Signature"));
-
-       vbox_sig = gtk_vbox_new (FALSE, VSPACING_NARROW);
-       gtk_widget_show (vbox_sig);
-       gtk_container_add (GTK_CONTAINER (frame_sig), vbox_sig);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox_sig), 8);
-
-       PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig,
-                          _("Insert signature automatically"));
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox_sig), hbox1, TRUE, TRUE, 0);
-       label_sigsep = gtk_label_new (_("Signature separator"));
-       gtk_widget_show (label_sigsep);
-       gtk_box_pack_start (GTK_BOX (hbox1), label_sigsep, FALSE, FALSE, 0);
-
-       entry_sigsep = gtk_entry_new ();
-       gtk_widget_show (entry_sigsep);
-       gtk_box_pack_start (GTK_BOX (hbox1), entry_sigsep, FALSE, FALSE, 0);
-
-       gtk_widget_set_usize (entry_sigsep, 64, -1);
-
         /* Account autoselection */
        PACK_FRAME(vbox1, frame_autosel, _("Automatic account selection"));
 
@@ -1758,6 +1829,9 @@ 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"));
 
@@ -1774,6 +1848,23 @@ static void prefs_compose_create(void)
        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);
@@ -1838,8 +1929,6 @@ static void prefs_compose_create(void)
        compose.entry_quotemark  = entry_quotemark;
        compose.text_quotefmt    = text_quotefmt;
        */
-       compose.checkbtn_autosig = checkbtn_autosig;
-       compose.entry_sigsep     = entry_sigsep;
 
        compose.checkbtn_autoextedit = checkbtn_autoextedit;
 
@@ -1850,12 +1939,15 @@ static void prefs_compose_create(void)
        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.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 =
@@ -1864,7 +1956,7 @@ static void prefs_compose_create(void)
                checkbtn_smart_wrapping;
        compose.checkbtn_block_cursor   =
                checkbtn_block_cursor;
-
+       compose.checkbtn_default_reply_list = checkbtn_default_reply_list;
 }
 
 static void prefs_quote_create(void)
@@ -1989,7 +2081,7 @@ static void prefs_quote_create(void)
 
        /* quote chars */
 
-       PACK_FRAME (vbox1, frame_quote, _("Quoting characters"));
+       PACK_FRAME (vbox1, frame_quote, _("Quotation characters"));
 
        vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
        gtk_widget_show (vbox_quote);
@@ -2031,7 +2123,6 @@ static void prefs_display_create(void)
        GtkWidget *label_textfont;
        GtkWidget *entry_textfont;
        GtkWidget *button_textfont;
-       GtkWidget *chkbtn_display_img;
        GtkWidget *chkbtn_transhdr;
        GtkWidget *chkbtn_folder_unread;
        GtkWidget *hbox1;
@@ -2041,10 +2132,8 @@ static void prefs_display_create(void)
        GtkWidget *frame_summary;
        GtkWidget *vbox2;
        GtkWidget *chkbtn_swapfrom;
-       GtkWidget *chkbtn_hscrollbar;
        GtkWidget *chkbtn_useaddrbook;
-       GtkWidget *chkbtn_expand_thread;
-       GtkWidget *chkbtn_bold_unread;
+       GtkWidget *chkbtn_threadsubj;
        GtkWidget *vbox3;
        GtkWidget *label_datefmt;
        GtkWidget *button_datefmt;
@@ -2154,9 +2243,6 @@ static void prefs_display_create(void)
        PACK_CHECK_BUTTON (vbox2, chkbtn_folder_unread,
                           _("Display unread number next to folder name"));
 
-       PACK_CHECK_BUTTON (vbox2, chkbtn_display_img,
-                          _("Automatically display images"));
-
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
 
        hbox1 = gtk_hbox_new (FALSE, 8);
@@ -2164,7 +2250,7 @@ static void prefs_display_create(void)
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
 
        label_ng_abbrev = gtk_label_new
-               (_("Abbreviate newsgroups longer than"));
+               (_("Abbreviate newsgroup names longer than"));
        gtk_widget_show (label_ng_abbrev);
        gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
 
@@ -2194,17 +2280,13 @@ 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"));
+               (vbox2, chkbtn_threadsubj,
+                _("Thread using subject in addition to standard headers"));
 
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
 
@@ -2234,7 +2316,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",
@@ -2244,17 +2326,14 @@ static void prefs_display_create(void)
        display.entry_textfont  = entry_textfont;
        display.button_textfont = button_textfont;
 
-       display.chkbtn_display_img   = chkbtn_display_img;
        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.chkbtn_threadsubj    = chkbtn_threadsubj;
        display.entry_datefmt        = entry_datefmt;
 }
 
@@ -2285,14 +2364,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"));
@@ -2308,13 +2394,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"));
 
@@ -2405,6 +2491,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;
@@ -2417,6 +2513,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
@@ -2534,25 +2633,24 @@ static void prefs_interface_create(void)
        /* 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 *frame_addr;
-       GtkWidget *vbox_addr;
-       GtkWidget *checkbtn_addaddrbyclick;
+       GtkWidget *checkbtn_close_recv_dialog;
 
        GtkWidget *button_keybind;
 
-       GtkWidget *hbox2;
        GtkWidget *optmenu_nextunreadmsgdialog;
-       GtkWidget *optmenu_nextunreadmsgdialog_menu;
-       GtkWidget *nextunreadmsgdialog_menuitem;
 
        GtkWidget *frame_pixmap_theme;
        GtkWidget *vbox_pixmap_theme;
@@ -2577,12 +2675,16 @@ static void prefs_interface_create(void)
 
        PACK_CHECK_BUTTON
                (vbox2, checkbtn_show_msg_with_cursor,
-                _("Open message when cursor keys are pressed on summary"));
+                _("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"));
@@ -2606,23 +2708,70 @@ 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);
+       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 (vbox2, checkbtn_no_recv_err_panel,
-                          _("No popup error dialog on receive error"));
+       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);
 
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+       /* Next Unread Message Dialog */
+       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);
+
+
+       optmenu_nextunreadmsgdialog = gtk_option_menu_new ();
+       gtk_widget_show (optmenu_nextunreadmsgdialog);
+       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), 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);
+
+       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_senddialog), menu);
 
        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 (hbox1), label, FALSE, FALSE, 0);
+       gtk_table_attach (GTK_TABLE (dialogs_table), label, 0, 1, 2, 3,
+                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
        optmenu_recvdialog = gtk_option_menu_new ();
        gtk_widget_show (optmenu_recvdialog);
-       gtk_box_pack_start (GTK_BOX (hbox1), optmenu_recvdialog,
-                           FALSE, FALSE, 0);
+       gtk_table_attach (GTK_TABLE (dialogs_table), optmenu_recvdialog, 1, 2, 2, 3,
+                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
        menu = gtk_menu_new ();
        MENUITEM_ADD (menu, menuitem, _("Always"), RECV_DIALOG_ALWAYS);
@@ -2632,63 +2781,12 @@ static void prefs_interface_create(void)
 
        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_CHECK_BUTTON
-               (vbox_addr, checkbtn_addaddrbyclick,
-                _("Add address to destination when double-clicked"));
-
-       /* 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_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_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog),
-                                 optmenu_nextunreadmsgdialog_menu);
-
-
-       /* Receive Dialog */
-/*     hbox = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
-
-       label = gtk_label_new (_("Show receive Dialog"));
-       gtk_widget_show (label);
-       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 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 ();
+       PACK_CHECK_BUTTON (vbox_dialogs, checkbtn_no_recv_err_panel,
+                          _("Don't popup error dialog on receive error"));
 
-       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);
+       PACK_CHECK_BUTTON (vbox_dialogs, checkbtn_close_recv_dialog,
+                          _("Close receive dialog when finished"));
 
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (recvdialog_optmenu), recvdialog_optmenu_menu);     */
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
@@ -2700,7 +2798,7 @@ static void prefs_interface_create(void)
        gtk_signal_connect (GTK_OBJECT (button_keybind), "clicked",
                            GTK_SIGNAL_FUNC (prefs_keybind_select), NULL);
 
-       PACK_FRAME(vbox1, frame_pixmap_theme, _("Pixmap theme"));
+       PACK_FRAME(vbox1, frame_pixmap_theme, _("Icon theme"));
        
        vbox_pixmap_theme = gtk_vbox_new(FALSE, 0);
        gtk_widget_show(vbox_pixmap_theme);
@@ -2721,11 +2819,14 @@ static void prefs_interface_create(void)
        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.optmenu_senddialog          = optmenu_senddialog;
        interface.checkbtn_no_recv_err_panel  = checkbtn_no_recv_err_panel;
-       interface.checkbtn_addaddrbyclick     = checkbtn_addaddrbyclick;
+       interface.checkbtn_close_recv_dialog  = checkbtn_close_recv_dialog;
        interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
        interface.combo_pixmap_theme          = combo_pixmap_theme;
        interface.entry_pixmap_theme          = entry_pixmap_theme;
@@ -2749,6 +2850,10 @@ static void prefs_other_create(void)
        GtkWidget *exteditor_combo;
        GtkWidget *exteditor_entry;
 
+       GtkWidget *frame_addr;
+       GtkWidget *vbox_addr;
+       GtkWidget *checkbtn_addaddrbyclick;
+       
        GtkWidget *frame_cliplog;
        GtkWidget *vbox_cliplog;
        GtkWidget *hbox_cliplog;
@@ -2762,7 +2867,14 @@ static void prefs_other_create(void)
        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);
@@ -2789,11 +2901,13 @@ static void prefs_other_create(void)
        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),
+                              DEFAULT_BROWSER_CMD,
+                              "galeon --new-tab '%s'",
                               "galeon '%s'",
                               "mozilla -remote 'openurl(%s,new-window)'",
-                              "netscape -remote 'openURL(%s,raise)'",
+                              "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'",
@@ -2833,6 +2947,17 @@ 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"));
 
@@ -2855,8 +2980,28 @@ static void prefs_other_create(void)
        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"));
 
@@ -2888,6 +3033,8 @@ static void prefs_other_create(void)
        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;
 
@@ -2895,6 +3042,12 @@ static void prefs_other_create(void)
        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)
@@ -3209,6 +3362,7 @@ 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;
@@ -3227,7 +3381,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);
@@ -3266,6 +3420,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);
@@ -3296,6 +3456,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"));
 
@@ -3321,6 +3487,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",
@@ -3337,6 +3505,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);
 
@@ -3374,7 +3544,10 @@ 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;
-#if USE_PSPELL         
+       } 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;
@@ -3446,7 +3619,10 @@ 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);
-#if USE_PSPELL         
+       } 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);
@@ -3597,9 +3773,7 @@ static void prefs_keybind_select(void)
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 
        label = gtk_label_new
-               (_("Select the preset of key bindings.\n"
-                  "You can also modify each menu's shortcuts by pressing\n"
-                  "any key(s) when placing the mouse pointer on the item."));
+               (_("Select preset:"));
        gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
        gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
@@ -3619,6 +3793,15 @@ static void prefs_keybind_select(void)
        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);
@@ -3690,15 +3873,16 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(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 header\" \"<control>H\")\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 sender\" \"\")\n"
-               "(menu-path \"<Main>/Message/Reply to all\" \"<shift><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"
@@ -3711,7 +3895,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 
                "(menu-path \"<Main>/Tools/Address book\" \"<shift><control>A\")\n"
                "(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
-               "(menu-path \"<Main>/Tools/Log window\" \"<control>L\")\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"
@@ -3742,15 +3926,16 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(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 header\" \"<shift>H\")\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 sender\" \"\")\n"
-               "(menu-path \"<Main>/Message/Reply to all\" \"<shift>A\")\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"
@@ -3763,7 +3948,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 
                "(menu-path \"<Main>/Tools/Address book\" \"<shift><control>A\")\n"
                "(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
-               "(menu-path \"<Main>/Tools/Log window\" \"<control>L\")\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"
@@ -3793,15 +3978,16 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(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 header\" \"<control>H\")\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/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"
@@ -3814,7 +4000,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 
                "(menu-path \"<Main>/Tools/Address book\" \"<shift><control>A\")\n"
                "(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
-               "(menu-path \"<Main>/Tools/Log window\" \"<control>L\")\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"
@@ -3845,15 +4031,16 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(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 header\" \"<control>H\")\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 sender\" \"<control><alt>R\")\n"
-               "(menu-path \"<Main>/Message/Reply to all\" \"<shift><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"
@@ -3897,15 +4084,16 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(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 header\" \"\")\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 sender\" \"\")\n"
-               "(menu-path \"<Main>/Message/Reply to all\" \"\")\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"
@@ -3964,30 +4152,50 @@ 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_encoding_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));
+       *((TransferEncodingMethod *)pparam->data) = GPOINTER_TO_INT
+               (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+}
+
+static void prefs_common_encoding_set_optmenu(PrefParam *pparam)
+{
+       TransferEncodingMethod method =
+               *((TransferEncodingMethod *)pparam->data);
+       GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
+       gint index;
+
+       g_return_if_fail(optmenu != NULL);
+
+       index = menu_find_option_menu_index(optmenu, GINT_TO_POINTER(method),
+                                           NULL);
+       if (index >= 0)
+               gtk_option_menu_set_history(optmenu, index);
+       else {
+               gtk_option_menu_set_history(optmenu, 0);
+               prefs_common_encoding_set_data_from_optmenu(pparam);
+       }
 }
 
 static void prefs_common_recv_dialog_set_data_from_optmenu(PrefParam *pparam)
@@ -4007,17 +4215,47 @@ static void prefs_common_recv_dialog_set_optmenu(PrefParam *pparam)
        GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
        GtkWidget *menu;
        GtkWidget *menuitem;
+       gint index;
+
+       index = menu_find_option_menu_index(optmenu, GINT_TO_POINTER(mode),
+                                           NULL);
+       if (index >= 0)
+               gtk_option_menu_set_history(optmenu, index);
+       else {
+               gtk_option_menu_set_history(optmenu, 0);
+               prefs_common_recv_dialog_set_data_from_optmenu(pparam);
+       }
+
+       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 RECV_DIALOG_ALWAYS:
+       case SEND_DIALOG_ALWAYS:
                gtk_option_menu_set_history(optmenu, 0);
                break;
-       case RECV_DIALOG_ACTIVE:
+       case SEND_DIALOG_NEVER:
                gtk_option_menu_set_history(optmenu, 1);
                break;
-       case RECV_DIALOG_NEVER:
-               gtk_option_menu_set_history(optmenu, 2);
-               break;
        default:
                break;
        }