disable error popup on mail receive errors
[claws.git] / src / prefs_common.c
index ee7630e79f8294143621eb49d88144ef2bf710ac..f0d172c58015a00af8dcd7ae8a5b651c2e2688c6 100644 (file)
 #include "main.h"
 #include "prefs.h"
 #include "prefs_common.h"
+#include "prefs_display_header.h"
 #include "mainwindow.h"
 #include "summaryview.h"
 #include "messageview.h"
 #include "manage_window.h"
+#include "inc.h"
 #include "menu.h"
 #include "codeconv.h"
 #include "utils.h"
@@ -66,6 +68,7 @@ static struct Receive {
        GtkObject *spinbtn_autochk_adj;
 
        GtkWidget *checkbtn_chkonstartup;
+       GtkWidget *checkbtn_noerrorpanel;
 
        GtkWidget *spinbtn_maxarticle;
        GtkObject *spinbtn_maxarticle_adj;
@@ -80,6 +83,8 @@ static struct Send {
        GtkWidget *checkbtn_queuemsg;
 
        GtkWidget *optmenu_charset;
+       
+       GtkWidget *checkbtn_returnreceipt;
 } send;
 
 static struct Compose {
@@ -89,21 +94,35 @@ static struct Compose {
        GtkWidget *checkbtn_autosig;
        GtkWidget *entry_sigsep;
 
+       GtkWidget *entry_fw_quotemark;
+       GtkWidget *text_fw_quotefmt;
+
        GtkWidget *spinbtn_linewrap;
        GtkObject *spinbtn_linewrap_adj;
        GtkWidget *checkbtn_wrapquote;
        GtkWidget *checkbtn_wrapatsend;
+
+       GtkWidget * checkbtn_forward_as_attachment;
+       GtkWidget * checkbtn_reply_account_autoselect;
 } compose;
 
 static struct Display {
        GtkWidget *entry_textfont;
        GtkWidget *button_textfont;
 
+       GtkWidget *entry_smallfont;
+       GtkWidget *entry_normalfont;
+       GtkWidget *entry_boldfont;
+
        GtkWidget *chkbtn_folder_unread;
 
        GtkWidget *chkbtn_transhdr;
+
        GtkWidget *chkbtn_swapfrom;
        GtkWidget *chkbtn_hscrollbar;
+       GtkWidget *chkbtn_useaddrbook;
+
+       GtkWidget *entry_datefmt;
 } display;
 
 static struct Message {
@@ -127,7 +146,9 @@ static struct Privacy {
        GtkWidget *checkbtn_default_encrypt;
        GtkWidget *checkbtn_default_sign;
        GtkWidget *checkbtn_auto_check_signatures;
+       GtkWidget *checkbtn_gpg_signature_popup;
        GtkWidget *checkbtn_passphrase_grab;
+       GtkWidget *checkbtn_gpg_warning;
        GtkWidget *optmenu_default_signkey;
 } privacy;
 #endif
@@ -140,6 +161,7 @@ static struct Interface {
        GtkWidget *checkbtn_confonexit;
        GtkWidget *checkbtn_cleanonexit;
        GtkWidget *checkbtn_askonclean;
+       GtkWidget *checkbtn_warnqueued;
        GtkWidget *checkbtn_addaddrbyclick;
 } interface;
 
@@ -206,6 +228,9 @@ 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},
 
        {"max_news_articles", "300", &prefs_common.max_articles, P_INT,
         &receive.spinbtn_maxarticle,
@@ -235,9 +260,14 @@ static PrefParam param[] = {
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"quote_mark", "> ", &prefs_common.quotemark, P_STRING,
         &compose.entry_quotemark, prefs_set_data_from_entry, prefs_set_entry},
-       {"quote_format", "On %d\\n%f wrote:\\n\\n",
+       {"quote_format", "On %d\\n%f wrote:\\n\\n%Q",
         &prefs_common.quotefmt, P_STRING, &compose.text_quotefmt,
         prefs_set_data_from_text, prefs_set_text},
+       {"fw_quote_mark", "> ", &prefs_common.fw_quotemark, P_STRING,
+        &compose.entry_fw_quotemark, prefs_set_data_from_entry, prefs_set_entry},
+       {"fw_quote_format", "----------  Forwarded message ----------\\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%Q",
+        &prefs_common.fw_quotefmt, P_STRING, &compose.text_fw_quotefmt,
+        prefs_set_data_from_text, prefs_set_text},
 
        {"auto_signature", "TRUE", &prefs_common.auto_sig, P_BOOL,
         &compose.checkbtn_autosig,
@@ -255,6 +285,12 @@ static PrefParam param[] = {
         &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},
+       {"reply_account_autoselect", "TRUE", &prefs_common.reply_account_autoselect,
+        P_BOOL, &compose.checkbtn_reply_account_autoselect,
+        prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
         NULL, NULL, NULL},
@@ -266,25 +302,46 @@ static PrefParam param[] = {
         &prefs_common.textfont, P_STRING,
         &display.entry_textfont,
         prefs_set_data_from_entry, prefs_set_entry},
+       {"small_font",   "-*-helvetica-medium-r-normal--10-*-*-*-*-*-*-*",
+        &prefs_common.smallfont,   P_STRING,
+        &display.entry_smallfont,
+        prefs_set_data_from_entry, prefs_set_entry},
+       {"bold_font",    "-*-helvetica-bold-r-normal--12-*-*-*-*-*-*-*",
+        &prefs_common.boldfont,    P_STRING,
+        &display.entry_boldfont,
+        prefs_set_data_from_entry, prefs_set_entry},
+       {"normal_font",  "-*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*",
+        &prefs_common.normalfont,  P_STRING,
+        &display.entry_normalfont, 
+        prefs_set_data_from_entry, prefs_set_entry},
 
        {"display_folder_unread_num", "TRUE",
         &prefs_common.display_folder_unread, P_BOOL,
         &display.chkbtn_folder_unread,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
-       /* Display: Summary View */
        {"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,
         &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},
+       {"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},
 
+       /*
        {"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,
@@ -298,6 +355,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"show_number", "TRUE", &prefs_common.show_number, P_BOOL,
         NULL, NULL, NULL},
+       {"show_score", "TRUE", &prefs_common.show_score, P_BOOL,
+        NULL, NULL, NULL},
        {"show_size", "FALSE", &prefs_common.show_size, P_BOOL,
         NULL, NULL, NULL},
        {"show_date", "TRUE", &prefs_common.show_date, P_BOOL,
@@ -332,6 +391,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"summary_col_number", "40", &prefs_common.summary_col_number, P_INT,
         NULL, NULL, NULL},
+       {"summary_col_score", "40", &prefs_common.summary_col_score,
+        P_INT, NULL, NULL, NULL},
        {"summary_col_size", "48", &prefs_common.summary_col_size, P_INT,
         NULL, NULL, NULL},
        {"summary_col_date", "120", &prefs_common.summary_col_date, P_INT,
@@ -410,6 +471,9 @@ static PrefParam param[] = {
         &message.chkbtn_halfpage,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
+       {"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL,
+        NULL, NULL, NULL},
+
        /* MIME viewer */
        {"mime_image_viewer", "display '%s'",
         &prefs_common.mime_image_viewer, P_STRING, NULL, NULL, NULL},
@@ -428,9 +492,18 @@ static PrefParam param[] = {
         &prefs_common.auto_check_signatures, P_BOOL,
         &privacy.checkbtn_auto_check_signatures,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"gpg_signature_popup", "FALSE",
+        &prefs_common.gpg_signature_popup, P_BOOL,
+        &privacy.checkbtn_gpg_signature_popup,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+#ifndef __MINGW32__
        {"passphrase_grab", "FALSE", &prefs_common.passphrase_grab, P_BOOL,
         &privacy.checkbtn_passphrase_grab,
         prefs_set_data_from_toggle, prefs_set_toggle},
+#endif /* __MINGW32__ */
+       {"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,
@@ -462,12 +535,18 @@ static PrefParam param[] = {
        {"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,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"clean_trash_on_exit", "FALSE", &prefs_common.clean_on_exit, P_BOOL,
         &interface.checkbtn_cleanonexit,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"ask_on_cleaning", "TRUE", &prefs_common.ask_on_clean, P_BOOL,
         &interface.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,
+        prefs_set_data_from_toggle, prefs_set_toggle},
 
        /* Other */
        {"uri_open_command", "netscape -remote 'openURL(%s,raise)'",
@@ -479,6 +558,11 @@ static PrefParam param[] = {
         &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,
+        NULL, NULL, NULL},
+       {"important_score", "1", &prefs_common.important_score, P_INT,
+        NULL, NULL, NULL},
+
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
@@ -505,12 +589,18 @@ static void prefs_quote_description               (void);
 static void prefs_quote_description_create     (void);
 static void prefs_quote_colors_dialog          (void);
 static void prefs_quote_colors_dialog_create   (void);
+static void prefs_quote_colors_key_pressed     (GtkWidget      *widget,
+                                                GdkEventKey    *event,
+                                                gpointer        data);
 static void quote_color_set_dialog             (GtkWidget      *widget,
                                                 gpointer        data);
 static void quote_colors_set_dialog_ok         (GtkWidget      *widget,
                                                 gpointer        data);
 static void quote_colors_set_dialog_cancel     (GtkWidget      *widget,
                                                 gpointer        data);
+static void quote_colors_set_dialog_key_pressed        (GtkWidget      *widget,
+                                                GdkEventKey    *event,
+                                                gpointer        data);
 static void set_button_bg_color                        (GtkWidget      *widget,
                                                 gint            color);
 static void prefs_enable_message_color_toggled (void);
@@ -530,17 +620,24 @@ static void display_item_key_pressed      (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         gboolean       *cancelled);
 
-static void prefs_font_select                  (GtkButton      *button);
+static void prefs_font_select  (GtkButton *button, GtkEntry *entry);
 static void prefs_font_selection_key_pressed   (GtkWidget      *widget,
                                                 GdkEventKey    *event,
                                                 gpointer        data);
-static void prefs_font_selection_ok            (GtkButton      *button);
+static void prefs_font_selection_ok            (GtkButton      *button, GtkEntry *entry);
 
+static gint prefs_common_deleted       (GtkWidget      *widget,
+                                        GdkEventAny    *event,
+                                        gpointer        data);
 static void prefs_common_key_pressed   (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         gpointer        data);
-static void prefs_common_ok            (GtkButton      *button);
-static void prefs_common_apply         (GtkButton      *button);
+static void prefs_common_ok            (void);
+static void prefs_common_apply         (void);
+static void prefs_common_cancel                (void);
+
+static void compose_prefs_fmt_open(void);
+static void compose_prefs_fmt_create(void);
 
 void prefs_common_read_config(void)
 {
@@ -554,6 +651,11 @@ void prefs_common_save_config(void)
 
 void prefs_common_open(void)
 {
+       if (prefs_rc_is_readonly(COMMON_RC))
+               return;
+
+       inc_autocheck_timer_remove();
+
        if (!dialog.window) {
                prefs_common_create();
        }
@@ -577,7 +679,7 @@ static void prefs_common_create(void)
        gtk_window_set_title (GTK_WINDOW(dialog.window),
                              _("Common Preferences"));
        gtk_signal_connect (GTK_OBJECT(dialog.window), "delete_event",
-                           GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete), NULL);
+                           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",
@@ -589,7 +691,7 @@ static void prefs_common_create(void)
        gtk_signal_connect (GTK_OBJECT(dialog.apply_btn), "clicked",
                            GTK_SIGNAL_FUNC(prefs_common_apply), NULL);
        gtk_signal_connect_object (GTK_OBJECT(dialog.cancel_btn), "clicked",
-                                  GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
+                                  GTK_SIGNAL_FUNC(prefs_common_cancel),
                                   GTK_OBJECT(dialog.window));
 
        /* create all widgets on notebook */
@@ -612,6 +714,8 @@ static void prefs_common_create(void)
        prefs_other_create();
        SET_NOTEBOOK_LABEL(dialog.notebook, _("Other"),     page++);
 
+       compose_prefs_fmt_create();
+
        gtk_widget_show_all(dialog.window);
 }
 
@@ -639,6 +743,7 @@ static void prefs_receive_create(void)
        GtkWidget *spinbtn_autochk;
        GtkWidget *label_autochk2;
        GtkWidget *checkbtn_chkonstartup;
+       GtkWidget *checkbtn_noerrorpanel;
 
        GtkWidget *frame_news;
        GtkWidget *label_maxarticle;
@@ -716,8 +821,6 @@ static void prefs_receive_create(void)
        gtk_widget_show (hbox_autochk);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox_autochk, FALSE, FALSE, 0);
 
-       gtk_widget_set_sensitive(hbox_autochk, FALSE);
-
        PACK_CHECK_BUTTON (hbox_autochk, checkbtn_autochk,
                           _("Auto-check new mail"));
 
@@ -744,6 +847,9 @@ 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_FRAME(vbox1, frame_news, _("News"));
 
        hbox = gtk_hbox_new (FALSE, 8);
@@ -782,6 +888,7 @@ static void prefs_receive_create(void)
        receive.spinbtn_autochk_adj = spinbtn_autochk_adj;
 
        receive.checkbtn_chkonstartup = checkbtn_chkonstartup;
+       receive.checkbtn_noerrorpanel = checkbtn_noerrorpanel;
 
        receive.spinbtn_maxarticle     = spinbtn_maxarticle;
        receive.spinbtn_maxarticle_adj = spinbtn_maxarticle_adj;
@@ -804,6 +911,7 @@ static void prefs_send_create(void)
        GtkWidget *optmenu;
        GtkWidget *optmenu_menu;
        GtkWidget *menuitem;
+       GtkWidget *checkbtn_returnreceipt;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -844,9 +952,11 @@ 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 message to outbox"));
+                          _("Save sent messages to outbox"));
        PACK_CHECK_BUTTON (vbox2, checkbtn_queuemsg,
-                          _("Queue message that failed to send"));
+                          _("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);
@@ -907,6 +1017,7 @@ static void prefs_send_create(void)
 
        send.checkbtn_savemsg  = checkbtn_savemsg;
        send.checkbtn_queuemsg = checkbtn_queuemsg;
+       send.checkbtn_returnreceipt = checkbtn_returnreceipt;
 
        send.optmenu_charset = optmenu;
 }
@@ -914,6 +1025,8 @@ static void prefs_send_create(void)
 static void prefs_compose_create(void)
 {
        GtkWidget *vbox1;
+
+       /*
        GtkWidget *frame_quote;
        GtkWidget *vbox_quote;
        GtkWidget *checkbtn_quote;
@@ -925,6 +1038,11 @@ static void prefs_compose_create(void)
        GtkWidget *btn_quotedesc;
        GtkWidget *scrolledwin_quotefmt;
        GtkWidget *text_quotefmt;
+*/
+
+       GtkWidget *hbox1;
+       GtkWidget *hbox2;
+       GtkWidget *btn_quotefmt;
 
        GtkWidget *frame_sig;
        GtkWidget *vbox_sig;
@@ -941,11 +1059,15 @@ static void prefs_compose_create(void)
        GtkWidget *checkbtn_wrapquote;
        GtkWidget *checkbtn_wrapatsend;
 
+       GtkWidget *checkbtn_forward_as_attachment;
+       GtkWidget *checkbtn_reply_account_autoselect;
+
        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_quote, _("Quotation"));
 
        vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
@@ -978,11 +1100,11 @@ static void prefs_compose_create(void)
        gtk_box_pack_start (GTK_BOX (hbox2), label_quotefmt, FALSE, FALSE, 0);
 
        btn_quotedesc =
-               gtk_button_new_with_label (_(" Description of symbols "));
+               gtk_button_new_with_label (_(" Quote format "));
        gtk_widget_show (btn_quotedesc);
        gtk_box_pack_end (GTK_BOX (hbox2), btn_quotedesc, FALSE, FALSE, 0);
        gtk_signal_connect(GTK_OBJECT(btn_quotedesc), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_quote_description), NULL);
+                          GTK_SIGNAL_FUNC(compose_prefs_fmt_open), &cancelled);
 
        scrolledwin_quotefmt = gtk_scrolled_window_new (NULL, NULL);
        gtk_widget_show (scrolledwin_quotefmt);
@@ -996,6 +1118,17 @@ static void prefs_compose_create(void)
        gtk_container_add(GTK_CONTAINER(scrolledwin_quotefmt), text_quotefmt);
        gtk_text_set_editable (GTK_TEXT (text_quotefmt), TRUE);
        gtk_widget_set_usize(text_quotefmt, -1, 60);
+       */
+
+       hbox1 = gtk_hbox_new (FALSE, 32);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       btn_quotefmt = gtk_button_new_with_label (_(" Quote format "));
+       gtk_widget_show (btn_quotefmt);
+       gtk_box_pack_start (GTK_BOX (hbox1), btn_quotefmt, FALSE, FALSE, 0);
+       gtk_signal_connect(GTK_OBJECT(btn_quotefmt), "clicked",
+                          GTK_SIGNAL_FUNC(compose_prefs_fmt_open), NULL);
 
        PACK_FRAME(vbox1, frame_sig, _("Signature"));
 
@@ -1053,9 +1186,17 @@ static void prefs_compose_create(void)
        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_reply_account_autoselect,
+                          _("Automatically select account for mail replys"));
+
+       /*
        compose.checkbtn_quote   = checkbtn_quote;
        compose.entry_quotemark  = entry_quotemark;
        compose.text_quotefmt    = text_quotefmt;
+       */
        compose.checkbtn_autosig = checkbtn_autosig;
        compose.entry_sigsep     = entry_sigsep;
 
@@ -1063,6 +1204,279 @@ static void prefs_compose_create(void)
        compose.spinbtn_linewrap_adj = spinbtn_linewrap_adj;
        compose.checkbtn_wrapquote   = checkbtn_wrapquote;
        compose.checkbtn_wrapatsend  = checkbtn_wrapatsend;
+
+       compose.checkbtn_forward_as_attachment =
+               checkbtn_forward_as_attachment;
+       compose.checkbtn_reply_account_autoselect =
+               checkbtn_reply_account_autoselect;
+}
+
+static void date_format_ok_btn_clicked(GtkButton *button, GtkWidget **widget)
+{
+       gchar     *text;
+       GtkWidget *datefmt_sample = NULL;
+
+       g_return_if_fail(widget != NULL);
+       g_return_if_fail(*widget != NULL);
+       g_return_if_fail(display.entry_datefmt != NULL);
+
+       datefmt_sample = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(*widget), "datefmt_sample");
+       g_return_if_fail(datefmt_sample != NULL);
+
+       text = gtk_editable_get_chars(GTK_EDITABLE(datefmt_sample), 0, -1);
+       g_free(prefs_common.date_format);
+       prefs_common.date_format = text;
+       gtk_entry_set_text(GTK_ENTRY(display.entry_datefmt), text);
+
+       gtk_widget_destroy(*widget);
+       *widget = NULL;
+}
+
+static void date_format_cancel_btn_clicked(GtkButton *button,
+                                          GtkWidget **widget)
+{
+       g_return_if_fail(widget != NULL);
+       g_return_if_fail(*widget != NULL);
+
+       gtk_widget_destroy(*widget);
+       *widget = NULL;
+}
+
+static gboolean date_format_on_delete(GtkWidget *dialogwidget, gpointer d1, GtkWidget **widget)
+{
+       g_return_val_if_fail(widget != NULL, FALSE);
+       g_return_val_if_fail(*widget != NULL, FALSE);
+       *widget = NULL;
+       return FALSE;
+}
+
+static void date_format_entry_on_change(GtkEditable *editable, GtkLabel *example)
+{
+       time_t cur_time;
+       struct tm *cal_time;
+       char buffer[100];
+       char *text;
+       cur_time = time(NULL);
+       cal_time = localtime(&cur_time);
+       buffer[0] = 0;
+       text = gtk_editable_get_chars(editable, 0, -1);
+       if (text) {
+               strftime(buffer, sizeof buffer, text, cal_time); 
+       }
+       gtk_label_set_text(example, buffer);
+}
+
+static void date_format_select_row(GtkWidget *date_format_list, gint row,
+                                       gint column, GdkEventButton *event,
+                                       GtkWidget *date_format)
+{
+       gint      curs_pos;
+       gchar     *format;
+       gchar     *old_format;
+       gchar     *new_format;
+       GtkWidget *datefmt_sample = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(date_format), "datefmt_sample");
+
+       g_return_if_fail(date_format_list != NULL);
+       g_return_if_fail(date_format != NULL);
+       g_return_if_fail(datefmt_sample != NULL);
+
+       /* only on double click */
+       if (event->type != GDK_2BUTTON_PRESS)
+               return;
+
+       /* get format from clist */
+       gtk_clist_get_text(GTK_CLIST(date_format_list), row, 0, &format);
+
+       curs_pos = gtk_editable_get_position(GTK_EDITABLE(datefmt_sample));
+       old_format = gtk_entry_get_text(GTK_ENTRY(datefmt_sample));
+
+       /* insert the format into the text entry */
+       new_format = g_malloc(strlen(old_format) + 3);
+
+       strncpy(new_format, old_format, curs_pos);
+       new_format[curs_pos] = '\0';
+       strcat(new_format, format);
+       strcat(new_format, &old_format[curs_pos]);
+
+       gtk_entry_set_text(GTK_ENTRY(datefmt_sample), new_format);
+       gtk_editable_set_position(GTK_EDITABLE(datefmt_sample), curs_pos + 2);
+
+       g_free(new_format);
+}
+
+static GtkWidget *create_date_format(GtkButton *button, void *data)
+{
+       static GtkWidget *date_format = NULL;
+       GtkWidget      *vbox1;
+       GtkWidget      *scrolledwindow1;
+       GtkWidget      *date_format_list;
+       GtkWidget      *label3;
+       GtkWidget      *label4;
+       GtkWidget      *table2;
+       GtkWidget      *vbox2;
+       GtkWidget      *vbox3;
+       GtkWidget      *hbox2;
+       GtkWidget      *label5;
+       GtkWidget      *hbox1;
+       GtkWidget      *label6;
+       GtkWidget      *label7;
+       GtkWidget      *confirm_area;
+       GtkWidget      *ok_btn;
+       GtkWidget      *cancel_btn;
+       GtkWidget          *datefmt_sample = NULL;
+
+       const 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") }
+       };
+       int tmp;
+       const int TIME_FORMAT_ELEMS = sizeof time_format / sizeof time_format[0];
+
+       if (date_format) return date_format;
+
+       date_format = gtk_window_new(GTK_WINDOW_DIALOG);
+       gtk_window_set_title(GTK_WINDOW(date_format), _("Date format"));
+       gtk_window_set_position(GTK_WINDOW(date_format), GTK_WIN_POS_CENTER);
+       gtk_window_set_default_size(GTK_WINDOW(date_format), 440, 280);
+
+       vbox1 = gtk_vbox_new(FALSE, 10);
+       gtk_widget_show(vbox1);
+       gtk_container_add(GTK_CONTAINER(date_format), vbox1);
+
+       scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow1),
+                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_widget_show(scrolledwindow1);
+       gtk_box_pack_start(GTK_BOX(vbox1), scrolledwindow1, TRUE, TRUE, 0);
+
+       date_format_list = gtk_clist_new(2);
+       gtk_widget_show(date_format_list);
+       gtk_container_add(GTK_CONTAINER(scrolledwindow1), date_format_list);
+       gtk_clist_set_column_width(GTK_CLIST(date_format_list), 0, 80);
+       gtk_clist_set_column_width(GTK_CLIST(date_format_list), 1, 80);
+       gtk_clist_column_titles_show(GTK_CLIST(date_format_list));
+
+       label3 = gtk_label_new(_("Date Format"));
+       gtk_widget_show(label3);
+       gtk_clist_set_column_widget(GTK_CLIST(date_format_list), 0, label3);
+
+       label4 = gtk_label_new(_("Date Format Description"));
+       gtk_widget_show(label4);
+       gtk_clist_set_column_widget(GTK_CLIST(date_format_list), 1, label4);
+
+       for (tmp = 0; tmp < TIME_FORMAT_ELEMS; tmp++) {
+               gchar *text[3];
+               /* phoney casting necessary because of gtk... */
+               text[0] = (gchar *) time_format[tmp].fmt;
+               text[1] = (gchar *) time_format[tmp].txt;
+               text[2] = NULL;
+               gtk_clist_append(GTK_CLIST(date_format_list), text);
+       }
+
+       table2 = gtk_table_new(1, 1, TRUE);
+       gtk_widget_show(table2);
+       gtk_box_pack_start(GTK_BOX(vbox1), table2, FALSE, TRUE, 0);
+
+       vbox2 = gtk_vbox_new(FALSE, 0);
+       gtk_widget_show(vbox2);
+       gtk_table_attach(GTK_TABLE(table2), vbox2, 0, 1, 0, 1,
+                        (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                        (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+
+       vbox3 = gtk_vbox_new(TRUE, 4);
+       gtk_widget_show(vbox3);
+       gtk_box_pack_end(GTK_BOX(vbox2), vbox3, FALSE, FALSE, 10);
+
+       hbox2 = gtk_hbox_new(FALSE, 0);
+       gtk_widget_show(hbox2);
+       gtk_box_pack_start(GTK_BOX(vbox3), hbox2, TRUE, TRUE, 0);
+
+       label5 = gtk_label_new(_("Date format"));
+       gtk_widget_show(label5);
+       gtk_box_pack_start(GTK_BOX(hbox2), label5, FALSE, FALSE, 0);
+       gtk_misc_set_padding(GTK_MISC(label5), 8, 0);
+
+       datefmt_sample = gtk_entry_new_with_max_length(300);
+       gtk_widget_show(datefmt_sample);
+       gtk_box_pack_start(GTK_BOX(hbox2), datefmt_sample, TRUE, TRUE, 40);
+       
+       /* we need the "sample" entry box; add it as data so callbacks can
+        * get the entry box */
+       gtk_object_set_data(GTK_OBJECT(date_format), "datefmt_sample", datefmt_sample);
+
+       hbox1 = gtk_hbox_new(FALSE, 0);
+       gtk_widget_show(hbox1);
+       gtk_box_pack_start(GTK_BOX(vbox3), hbox1, TRUE, TRUE, 0);
+
+       label6 = gtk_label_new(_("Example"));
+       gtk_widget_show(label6);
+       gtk_box_pack_start(GTK_BOX(hbox1), label6, FALSE, TRUE, 0);
+       gtk_misc_set_padding(GTK_MISC(label6), 8, 0);
+
+       label7 = gtk_label_new("");
+       gtk_widget_show(label7);
+       gtk_box_pack_start(GTK_BOX(hbox1), label7, TRUE, TRUE, 60);
+       gtk_label_set_justify(GTK_LABEL(label7), GTK_JUSTIFY_LEFT);
+
+       gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
+                               &cancel_btn, _("Cancel"), NULL, NULL);
+       gtk_widget_grab_default(ok_btn);
+
+       gtk_widget_show(confirm_area);
+
+       gtk_box_pack_start(GTK_BOX(vbox1), confirm_area, FALSE, FALSE, 0);
+
+       /* set the current format */
+       gtk_entry_set_text(GTK_ENTRY(datefmt_sample), prefs_common.date_format);
+       date_format_entry_on_change(GTK_EDITABLE(datefmt_sample),
+                                   GTK_LABEL(label7));
+
+       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
+                          GTK_SIGNAL_FUNC(date_format_ok_btn_clicked),
+                          &date_format);
+                                 
+       gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
+                          GTK_SIGNAL_FUNC(date_format_cancel_btn_clicked),
+                          &date_format);
+
+       gtk_signal_connect(GTK_OBJECT(date_format), "delete_event",
+                          GTK_SIGNAL_FUNC(date_format_on_delete),
+                          &date_format);
+
+       gtk_signal_connect(GTK_OBJECT(datefmt_sample), "changed",
+                          GTK_SIGNAL_FUNC(date_format_entry_on_change),
+                          label7);
+                                 
+       gtk_window_set_position(GTK_WINDOW(date_format), GTK_WIN_POS_CENTER);
+       gtk_window_set_modal(GTK_WINDOW(date_format), TRUE);
+
+       gtk_widget_show(date_format);                                   
+
+       gtk_signal_connect(GTK_OBJECT(date_format_list), "select_row",
+                          GTK_SIGNAL_FUNC(date_format_select_row),
+                          date_format);
+
+       return date_format;
 }
 
 static void prefs_display_create(void)
@@ -1079,7 +1493,13 @@ static void prefs_display_create(void)
        GtkWidget *vbox2;
        GtkWidget *chkbtn_swapfrom;
        GtkWidget *chkbtn_hscrollbar;
+       GtkWidget *chkbtn_useaddrbook;
        GtkWidget *hbox1;
+       GtkWidget *label_datefmt;
+       GtkWidget *label_datefmt_btn;
+       GtkWidget *tmplabel, *tmpentry, *tmpbutton;
+       GtkWidget *entry_datefmt;
+       GtkTooltips *tooltips_datefmt;
        GtkWidget *button_dispitem;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
@@ -1111,7 +1531,61 @@ static void prefs_display_create(void)
        gtk_table_attach (GTK_TABLE (table1), button_textfont, 2, 3, 0, 1,
                          0, 0, 0, 0);
        gtk_signal_connect (GTK_OBJECT (button_textfont), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_font_select), NULL);
+                           GTK_SIGNAL_FUNC (prefs_font_select), entry_textfont);
+
+       tmplabel = gtk_label_new (_("Small"));
+       gtk_widget_show (tmplabel);
+       gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 1, 2,
+                         GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+
+       tmpentry = gtk_entry_new ();
+       gtk_widget_show (tmpentry);
+       gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 1, 2,
+                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+
+       tmpbutton = gtk_button_new_with_label ("... ");
+       gtk_widget_show (tmpbutton);
+       gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 1, 2,
+                         0, 0, 0, 0);
+       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
+                           GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
+       display.entry_smallfont = tmpentry;                       
+
+       tmplabel = gtk_label_new (_("Normal"));
+       gtk_widget_show (tmplabel);
+       gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 2, 3,
+                         GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+
+       tmpentry = gtk_entry_new ();
+       gtk_widget_show (tmpentry);
+       gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 2, 3,
+                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+
+       tmpbutton = gtk_button_new_with_label ("... ");
+       gtk_widget_show (tmpbutton);
+       gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 2, 3,
+                         0, 0, 0, 0);
+       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
+                               GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
+       display.entry_normalfont = tmpentry;                      
+
+       tmplabel = gtk_label_new (_("Bold"));
+       gtk_widget_show (tmplabel);
+       gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 3, 4,
+                         GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+
+       tmpentry = gtk_entry_new ();
+       gtk_widget_show (tmpentry);
+       gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 3, 4,
+                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+
+       tmpbutton = gtk_button_new_with_label ("... ");
+       gtk_widget_show (tmpbutton);
+       gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 3, 4,
+                         0, 0, 0, 0);
+       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
+                               GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
+       display.entry_boldfont = tmpentry;                        
 
        vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
        gtk_widget_show (vbox2);
@@ -1136,6 +1610,9 @@ static void prefs_display_create(void)
        PACK_CHECK_BUTTON
                (vbox2, chkbtn_swapfrom,
                 _("Display recipient on `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"));
 
@@ -1143,6 +1620,24 @@ static void prefs_display_create(void)
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
 
+       label_datefmt = gtk_label_new (_("Date format"));
+       gtk_widget_show (label_datefmt);
+       gtk_box_pack_start (GTK_BOX (hbox1), label_datefmt, FALSE, FALSE, 0);
+
+       entry_datefmt = gtk_entry_new ();
+       gtk_widget_show (entry_datefmt);
+       gtk_box_pack_start (GTK_BOX (hbox1), entry_datefmt, TRUE, TRUE, 0);
+       
+       label_datefmt_btn = gtk_button_new_with_label(_("Customize"));
+       gtk_widget_show(label_datefmt_btn);
+       gtk_box_pack_start(GTK_BOX (hbox1), label_datefmt_btn, FALSE, FALSE, 0);
+       gtk_signal_connect(GTK_OBJECT(label_datefmt_btn), "clicked",
+                          GTK_SIGNAL_FUNC(create_date_format), NULL);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
+
        button_dispitem = gtk_button_new_with_label
                (_(" Set display item of summary... "));
        gtk_widget_show (button_dispitem);
@@ -1155,10 +1650,12 @@ static void prefs_display_create(void)
        display.button_textfont = button_textfont;
 
        display.chkbtn_folder_unread = chkbtn_folder_unread;
-
        display.chkbtn_transhdr   = chkbtn_transhdr;
-       display.chkbtn_swapfrom   = chkbtn_swapfrom;
-       display.chkbtn_hscrollbar = chkbtn_hscrollbar;
+
+       display.chkbtn_swapfrom    = chkbtn_swapfrom;
+       display.chkbtn_hscrollbar  = chkbtn_hscrollbar;
+       display.chkbtn_useaddrbook = chkbtn_useaddrbook;
+       display.entry_datefmt      = entry_datefmt;
 }
 
 static void prefs_message_create(void)
@@ -1171,6 +1668,7 @@ static void prefs_message_create(void)
        GtkWidget *chkbtn_mbalnum;
        GtkWidget *chkbtn_disphdrpane;
        GtkWidget *chkbtn_disphdr;
+       GtkWidget *button_edit_disphdr;
        GtkWidget *hbox_linespc;
        GtkWidget *label_linespc;
        GtkObject *spinbtn_linespc_adj;
@@ -1218,9 +1716,24 @@ static void prefs_message_create(void)
                 _("Display 2-byte alphabet and numeric with 1-byte character"));
        PACK_CHECK_BUTTON(vbox2, chkbtn_disphdrpane,
                          _("Display header pane above message view"));
-       PACK_CHECK_BUTTON(vbox2, chkbtn_disphdr,
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
+
+       PACK_CHECK_BUTTON(hbox1, chkbtn_disphdr,
                          _("Display short headers on message view"));
 
+       button_edit_disphdr = gtk_button_new_with_label (_(" Edit... "));
+       gtk_widget_show (button_edit_disphdr);
+       gtk_box_pack_end (GTK_BOX (hbox1), button_edit_disphdr,
+                         FALSE, TRUE, 0);
+       gtk_signal_connect (GTK_OBJECT (button_edit_disphdr), "clicked",
+                           GTK_SIGNAL_FUNC (prefs_display_header_open),
+                           NULL);
+
+       SET_TOGGLE_SENSITIVITY(chkbtn_disphdr, button_edit_disphdr);
+
        hbox1 = gtk_hbox_new (FALSE, 32);
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
@@ -1312,7 +1825,9 @@ static void prefs_privacy_create(void)
        GtkWidget *checkbtn_default_encrypt;
        GtkWidget *checkbtn_default_sign;
        GtkWidget *checkbtn_auto_check_signatures;
+       GtkWidget *checkbtn_gpg_signature_popup;
        GtkWidget *checkbtn_passphrase_grab;
+       GtkWidget *checkbtn_gpg_warning;
        GtkWidget *label;
        GtkWidget *menuitem;
        GtkWidget *optmenu;
@@ -1336,8 +1851,17 @@ static void prefs_privacy_create(void)
        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_gpg_warning,
+                _("Display warning on startup if GnuPG doesn't work"));
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
@@ -1362,7 +1886,10 @@ static void prefs_privacy_create(void)
        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;
 }
 
@@ -1431,6 +1958,7 @@ static void prefs_interface_create(void)
        GtkWidget *checkbtn_confonexit;
        GtkWidget *checkbtn_cleanonexit;
        GtkWidget *checkbtn_askonclean;
+       GtkWidget *checkbtn_warnqueued;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -1497,6 +2025,9 @@ static void prefs_interface_create(void)
                           _("Ask before emptying"));
        SET_TOGGLE_SENSITIVITY (checkbtn_cleanonexit, checkbtn_askonclean);
 
+       PACK_CHECK_BUTTON (vbox_exit, checkbtn_warnqueued,
+                          _("Warn if there are queued messages"));
+
        interface.checkbtn_emacs          = checkbtn_emacs;
        interface.checkbtn_openunread     = checkbtn_openunread;
        interface.checkbtn_openinbox      = checkbtn_openinbox;
@@ -1505,6 +2036,7 @@ static void prefs_interface_create(void)
        interface.checkbtn_confonexit     = checkbtn_confonexit;
        interface.checkbtn_cleanonexit    = checkbtn_cleanonexit;
        interface.checkbtn_askonclean     = checkbtn_askonclean;
+       interface.checkbtn_warnqueued     = checkbtn_warnqueued;
 }
 
 static void prefs_other_create(void)
@@ -1548,6 +2080,7 @@ static void prefs_other_create(void)
        gtk_box_pack_start (GTK_BOX (hbox1), uri_combo, TRUE, TRUE, 0);
        gtkut_combo_set_items (GTK_COMBO (uri_combo),
                               "netscape -remote 'openURL(%s,raise)'",
+                              "netscape '%s'",
                               "gnome-moz-remote --raise --newwin '%s'",
                               "kterm -e w3m '%s'",
                               "kterm -e lynx '%s'",
@@ -1609,11 +2142,13 @@ void prefs_quote_colors_dialog(void)
        if (!quote_color_win)
                prefs_quote_colors_dialog_create();
        gtk_widget_show(quote_color_win);
+       manage_window_set_transient(GTK_WINDOW(quote_color_win));
 
        gtk_main();
        gtk_widget_hide(quote_color_win);
 
        textview_update_message_colors();
+       main_window_reflect_prefs_all();
 }
 
 static void prefs_quote_colors_dialog_create(void)
@@ -1636,7 +2171,7 @@ static void prefs_quote_colors_dialog_create(void)
        gtk_window_set_title(GTK_WINDOW(window), _("Set message colors"));
        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, TRUE, FALSE);
+       gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
 
        vbox = gtk_vbox_new (FALSE, VSPACING);
        gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -1649,57 +2184,53 @@ static void prefs_quote_colors_dialog_create(void)
        gtk_table_set_row_spacings (GTK_TABLE (table), 2);
        gtk_table_set_col_spacings (GTK_TABLE (table), 4);
 
-/*     gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); */
-
        color_buttons.quote_level1_btn = gtk_button_new();
-       gtk_table_attach(GTK_TABLE (table), color_buttons.quote_level1_btn, 0, 1, 0, 1,
-                                       (GtkAttachOptions) (0),
-                                       (GtkAttachOptions) (0), 0, 0);
+       gtk_table_attach (GTK_TABLE (table), color_buttons.quote_level1_btn,
+                         0, 1, 0, 1, 0, 0, 0, 0);
        gtk_widget_set_usize (color_buttons.quote_level1_btn, 40, 30);
-       gtk_container_set_border_width (GTK_CONTAINER (color_buttons.quote_level1_btn), 5);
+       gtk_container_set_border_width
+               (GTK_CONTAINER (color_buttons.quote_level1_btn), 5);
 
        color_buttons.quote_level2_btn = gtk_button_new();
-       gtk_table_attach(GTK_TABLE (table), color_buttons.quote_level2_btn, 0, 1, 1, 2,
-                                       (GtkAttachOptions) (0),
-                                       (GtkAttachOptions) (0), 0, 0);
+       gtk_table_attach (GTK_TABLE (table), color_buttons.quote_level2_btn,
+                         0, 1, 1, 2, 0, 0, 0, 0);
        gtk_widget_set_usize (color_buttons.quote_level2_btn, 40, 30);
        gtk_container_set_border_width (GTK_CONTAINER (color_buttons.quote_level2_btn), 5);
 
        color_buttons.quote_level3_btn = gtk_button_new_with_label ("");
-       gtk_table_attach(GTK_TABLE (table), color_buttons.quote_level3_btn, 0, 1, 2, 3,
-                                       (GtkAttachOptions) (0),
-                                       (GtkAttachOptions) (0), 0, 0);
+       gtk_table_attach (GTK_TABLE (table), color_buttons.quote_level3_btn,
+                         0, 1, 2, 3, 0, 0, 0, 0);
        gtk_widget_set_usize (color_buttons.quote_level3_btn, 40, 30);
-       gtk_container_set_border_width (GTK_CONTAINER (color_buttons.quote_level3_btn), 5);
+       gtk_container_set_border_width
+               (GTK_CONTAINER (color_buttons.quote_level3_btn), 5);
 
        color_buttons.uri_btn = gtk_button_new_with_label ("");
-       gtk_table_attach(GTK_TABLE (table), color_buttons.uri_btn, 0, 1, 3, 4,
-                                       (GtkAttachOptions) (0),
-                                       (GtkAttachOptions) (0), 0, 0);
+       gtk_table_attach (GTK_TABLE (table), color_buttons.uri_btn,
+                         0, 1, 3, 4, 0, 0, 0, 0);
        gtk_widget_set_usize (color_buttons.uri_btn, 40, 30);
        gtk_container_set_border_width (GTK_CONTAINER (color_buttons.uri_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);
+       gtk_table_attach (GTK_TABLE (table), quotelevel1_label, 1, 2, 0, 1,
+                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
        gtk_label_set_justify (GTK_LABEL (quotelevel1_label), GTK_JUSTIFY_LEFT);
        gtk_misc_set_alignment (GTK_MISC (quotelevel1_label), 0, 0.5);
 
        quotelevel2_label = gtk_label_new (_("Quoted Text - Second Level"));
-       gtk_table_attach(GTK_TABLE (table), quotelevel2_label, 1, 2, 1, 2,
-                                       (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+       gtk_table_attach (GTK_TABLE (table), quotelevel2_label, 1, 2, 1, 2,
+                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
        gtk_label_set_justify (GTK_LABEL (quotelevel2_label), GTK_JUSTIFY_LEFT);
        gtk_misc_set_alignment (GTK_MISC (quotelevel2_label), 0, 0.5);
 
        quotelevel3_label = gtk_label_new (_("Quoted Text - Third Level"));
-       gtk_table_attach(GTK_TABLE (table), quotelevel3_label, 1, 2, 2, 3,
-                                       (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+       gtk_table_attach (GTK_TABLE (table), quotelevel3_label, 1, 2, 2, 3,
+                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
        gtk_label_set_justify (GTK_LABEL (quotelevel3_label), GTK_JUSTIFY_LEFT);
        gtk_misc_set_alignment (GTK_MISC (quotelevel3_label), 0, 0.5);
 
        uri_label = gtk_label_new (_("URI link"));
-       gtk_table_attach(GTK_TABLE (table), uri_label, 1, 2, 3, 4,
-                                       (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+       gtk_table_attach (GTK_TABLE (table), uri_label, 1, 2, 3, 4,
+                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
        gtk_label_set_justify (GTK_LABEL (uri_label), GTK_JUSTIFY_LEFT);
        gtk_misc_set_alignment (GTK_MISC (uri_label), 0, 0.5);
 
@@ -1711,10 +2242,15 @@ 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(ok_btn), "clicked",
-                                       GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+       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);
        gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                                       GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+                          GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
+                          GTK_SIGNAL_FUNC(prefs_quote_colors_key_pressed),
+                          NULL);
 
        gtk_signal_connect(GTK_OBJECT(color_buttons.quote_level1_btn), "clicked",
                           GTK_SIGNAL_FUNC(quote_color_set_dialog), "LEVEL1");
@@ -1726,6 +2262,8 @@ static void prefs_quote_colors_dialog_create(void)
                           GTK_SIGNAL_FUNC(quote_color_set_dialog), "URI");
        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",
+                          GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
 
        /* show message button colors and recycle options */
        set_button_bg_color(color_buttons.quote_level1_btn,
@@ -1743,6 +2281,13 @@ static void prefs_quote_colors_dialog_create(void)
        quote_color_win = window;
 }
 
+static void prefs_quote_colors_key_pressed(GtkWidget *widget,
+                                          GdkEventKey *event, gpointer data)
+{
+       if (event && event->keyval == GDK_Escape)
+               gtk_main_quit();
+}
+
 static void quote_color_set_dialog(GtkWidget *widget, gpointer data)
 {
        gchar *type = (gchar *)data;
@@ -1764,7 +2309,7 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data)
                title = _("Pick color for URI");
                rgbvalue = prefs_common.uri_col;
        } else {   /* Should never be called */
-               fprintf(stderr, "Unrecognized datatype '%s' in quote_color_set_dialog\n", type);
+               g_warning("Unrecognized datatype '%s' in quote_color_set_dialog\n", type);
                return;
        }
 
@@ -1772,19 +2317,23 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data)
        gtk_window_set_position(GTK_WINDOW(color_dialog), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(color_dialog), TRUE);
        gtk_window_set_policy(GTK_WINDOW(color_dialog), FALSE, FALSE, FALSE);
+       manage_window_set_transient(GTK_WINDOW(color_dialog));
 
-       gtk_signal_connect(GTK_OBJECT(((GtkColorSelectionDialog *)color_dialog)->ok_button),
+       gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button),
                           "clicked", GTK_SIGNAL_FUNC(quote_colors_set_dialog_ok), data);
-       gtk_signal_connect(GTK_OBJECT(((GtkColorSelectionDialog *)color_dialog)->cancel_button),
+       gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->cancel_button),
                           "clicked", GTK_SIGNAL_FUNC(quote_colors_set_dialog_cancel), data);
+       gtk_signal_connect(GTK_OBJECT(color_dialog), "key_press_event",
+                          GTK_SIGNAL_FUNC(quote_colors_set_dialog_key_pressed),
+                          data);
 
        /* preselect the previous color in the color selection dialog */
        color[0] = (gdouble) ((rgbvalue & 0xff0000) >> 16) / 255.0;
        color[1] = (gdouble) ((rgbvalue & 0x00ff00) >>  8) / 255.0;
        color[2] = (gdouble)  (rgbvalue & 0x0000ff)        / 255.0;
-       dialog = (GtkColorSelectionDialog *)color_dialog;
+       dialog = GTK_COLOR_SELECTION_DIALOG(color_dialog);
        gtk_color_selection_set_color
-               ((GtkColorSelection *)dialog->colorsel, color);
+               (GTK_COLOR_SELECTION(dialog->colorsel), color);
 
        gtk_widget_show(color_dialog);
 }
@@ -1825,12 +2374,19 @@ static void quote_colors_set_dialog_ok(GtkWidget *widget, gpointer data)
        } else
                fprintf( stderr, "Unrecognized datatype '%s' in quote_color_set_dialog_ok\n", type );
 
-       gtk_widget_hide(color_dialog);
+       gtk_widget_destroy(color_dialog);
 }
 
 static void quote_colors_set_dialog_cancel(GtkWidget *widget, gpointer data)
 {
-       gtk_widget_hide(color_dialog);
+       gtk_widget_destroy(color_dialog);
+}
+
+static void quote_colors_set_dialog_key_pressed(GtkWidget *widget,
+                                               GdkEventKey *event,
+                                               gpointer data)
+{
+       gtk_widget_destroy(color_dialog);
 }
 
 static void set_button_bg_color(GtkWidget *widget, gint rgbvalue)
@@ -1898,28 +2454,52 @@ static void prefs_quote_description_create(void)
        gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
 
        label = gtk_label_new
-               ("%d:\n"
-                "%f:\n"
-                "%n:\n"
-                "%N:\n"
-                "%I:\n"
-                "%s:\n"
-                "%t:\n"
-                "%i:\n"
-                "%%:");
+               ("SYMBOL\n\n"
+                 "%d\n"                /* date */
+                "%f\n"         /* from */
+                "%N\n"         /* full name */
+                "%F\n"         /* first name */
+                "%I\n"         /* sender's initial */
+                "%s\n"         /* subject line */
+                "%t\n"         /* to */
+                "%c\n"         /* cc */
+                "%n\n"         /* newsgroups */
+                "%i\n"         /* message id */
+                "%r\n"         /* references */
+                "\n"
+                "%x\n"
+                "?x(expr)\n"
+                "\n"
+                "%M\n"
+                "%Q\n"
+                "%m\n"
+                "%q\n"
+                "%%");
 
        gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
 
        label = gtk_label_new
-               (_("Date\n"
+               (_("DESCRIPTION\n\n"
+                   "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"
                   "Message-ID\n"
+                  "References\n"
+                  "\n"
+                  "Display the information\n"
+                  "If the information x is set, displays expr\n"
+                  "\n"
+                  "Message body\n"
+                  "Quoted message body\n"
+                  "Message body without signature\n"
+                  "Quoted message body without signature\n"
                   "%"));
 
        gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
@@ -1973,6 +2553,7 @@ void prefs_summary_display_item_set(void)
        SET_ACTIVE(S_COL_UNREAD, show_unread);
        SET_ACTIVE(S_COL_MIME, show_mime);
        SET_ACTIVE(S_COL_NUMBER, show_number);
+       SET_ACTIVE(S_COL_SCORE, show_score);
        SET_ACTIVE(S_COL_SIZE, show_size);
        SET_ACTIVE(S_COL_DATE, show_date);
        SET_ACTIVE(S_COL_FROM, show_from);
@@ -1986,6 +2567,7 @@ void prefs_summary_display_item_set(void)
                GET_ACTIVE(S_COL_UNREAD, show_unread);
                GET_ACTIVE(S_COL_MIME, show_mime);
                GET_ACTIVE(S_COL_NUMBER, show_number);
+               GET_ACTIVE(S_COL_SCORE, show_score);
                GET_ACTIVE(S_COL_SIZE, show_size);
                GET_ACTIVE(S_COL_DATE, show_date);
                GET_ACTIVE(S_COL_FROM, show_from);
@@ -2036,6 +2618,7 @@ static void prefs_summary_display_item_dialog_create(gboolean *cancelled)
        SET_CHECK_BUTTON(S_COL_UNREAD, _("Unread"));
        SET_CHECK_BUTTON(S_COL_MIME, _("MIME"));
        SET_CHECK_BUTTON(S_COL_NUMBER, _("Number"));
+       SET_CHECK_BUTTON(S_COL_SCORE, _("Score"));
        SET_CHECK_BUTTON(S_COL_SIZE, _("Size"));
        SET_CHECK_BUTTON(S_COL_DATE, _("Date"));
        SET_CHECK_BUTTON(S_COL_FROM, _("From"));
@@ -2088,8 +2671,12 @@ static void display_item_key_pressed(GtkWidget *widget, GdkEventKey *event,
        }
 }
 
-static void prefs_font_select(GtkButton *button)
+static void prefs_font_select(GtkButton *button, GtkEntry *entry)
 {
+       gchar *font_name;
+       
+       g_return_if_fail(entry != NULL);
+       
        if (!font_sel_win) {
                font_sel_win = gtk_font_selection_dialog_new
                        (_("Font selection"));
@@ -2106,7 +2693,7 @@ static void prefs_font_select(GtkButton *button)
                        (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button),
                         "clicked",
                         GTK_SIGNAL_FUNC(prefs_font_selection_ok),
-                        NULL);
+                        entry);
                gtk_signal_connect_object
                        (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->cancel_button),
                         "clicked",
@@ -2114,6 +2701,9 @@ static void prefs_font_select(GtkButton *button)
                         GTK_OBJECT(font_sel_win));
        }
 
+       font_name = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+       gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(font_sel_win), font_name);
+       g_free(font_name);
        manage_window_set_transient(GTK_WINDOW(font_sel_win));
        gtk_window_set_modal(GTK_WINDOW(font_sel_win), TRUE);
        gtk_widget_grab_focus
@@ -2129,7 +2719,7 @@ static void prefs_font_selection_key_pressed(GtkWidget *widget,
                gtk_widget_hide(font_sel_win);
 }
 
-static void prefs_font_selection_ok(GtkButton *button)
+static void prefs_font_selection_ok(GtkButton *button, GtkEntry *entry)
 {
        gchar *fontname;
 
@@ -2137,7 +2727,7 @@ static void prefs_font_selection_ok(GtkButton *button)
                (GTK_FONT_SELECTION_DIALOG(font_sel_win));
 
        if (fontname) {
-               gtk_entry_set_text(GTK_ENTRY(display.entry_textfont), fontname);
+               gtk_entry_set_text(entry, fontname);
                g_free(fontname);
        }
 
@@ -2185,24 +2775,221 @@ static void prefs_common_charset_set_optmenu(PrefParam *pparam)
        prefs_common_charset_set_data_from_optmenu(pparam);
 }
 
+static gint prefs_common_deleted(GtkWidget *widget, GdkEventAny *event,
+                                gpointer data)
+{
+       prefs_common_cancel();
+       return TRUE;
+}
+
 static void prefs_common_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                     gpointer data)
 {
        if (event && event->keyval == GDK_Escape)
-               gtk_widget_hide(dialog.window);
+               prefs_common_cancel();
 }
 
-static void prefs_common_ok(GtkButton *button)
+static void prefs_common_ok(void)
 {
-       prefs_common_apply(button);
+       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_autocheck_timer_set();
 }
 
-static void prefs_common_apply(GtkButton *button)
+static void prefs_common_apply(void)
 {
        prefs_set_data_from_dialog(param);
        main_window_reflect_prefs_all();
        prefs_common_save_config();
 }
+
+static void prefs_common_cancel(void)
+{
+       gtk_widget_hide(dialog.window);
+       inc_autocheck_timer_set();
+}
+
+
+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_fmt_open(void)
+{
+       if (composeprefs.window == NULL)
+               compose_prefs_fmt_create();
+       gtk_widget_show(composeprefs.window);
+}
+
+
+static void compose_prefs_fmt_create(void)
+{
+       GtkWidget *window;
+       GtkWidget *close_btn;
+
+       GtkWidget *frame_quote;
+       GtkWidget *vbox_quote;
+       GtkWidget *hbox1;
+       GtkWidget *checkbtn_quote;
+       GtkWidget *label_quotemark;
+       GtkWidget *entry_quotemark;
+       GtkWidget *scrolledwin_quotefmt;
+       GtkWidget *text_quotefmt;
+       GtkWidget *label_quotefmt;
+       GtkWidget *btn_quotedesc;
+
+       GtkWidget *label_fw_quotemark;
+       GtkWidget *entry_fw_quotemark;
+       GtkWidget *label_fw_quotefmt;
+       GtkWidget *text_fw_quotefmt;
+
+       window = gtk_window_new(GTK_WINDOW_DIALOG);
+       gtk_container_set_border_width(GTK_CONTAINER(window), 8);
+       gtk_window_set_title(GTK_WINDOW(window), _("Compose Preferences"));
+       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);
+       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
+                          GTK_SIGNAL_FUNC(compose_prefs_delete_event),
+                          NULL);
+       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
+                          GTK_SIGNAL_FUNC(compose_prefs_key_pressed),
+                          NULL);
+
+       vbox_quote = gtk_vbox_new(FALSE, 8);
+       gtk_container_add(GTK_CONTAINER(window), vbox_quote);
+
+       PACK_CHECK_BUTTON (vbox_quote, checkbtn_quote,
+                          _("Quote message when replying"));
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, TRUE, TRUE, 0);
+
+       label_quotemark = gtk_label_new (_("Quotation mark"));
+       gtk_widget_show (label_quotemark);
+       gtk_box_pack_start (GTK_BOX (hbox1), label_quotemark, FALSE, FALSE, 0);
+
+       entry_quotemark = gtk_entry_new ();
+       gtk_widget_show (entry_quotemark);
+       gtk_box_pack_start (GTK_BOX (hbox1), entry_quotemark, FALSE, FALSE, 0);
+       gtk_widget_set_usize (entry_quotemark, 64, -1);
+
+       hbox1 = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, TRUE, TRUE, 0);
+
+       label_quotefmt = gtk_label_new (_("Quotation format:"));
+       gtk_widget_show (label_quotefmt);
+       gtk_box_pack_start (GTK_BOX (hbox1), label_quotefmt, FALSE, FALSE, 0);
+
+       scrolledwin_quotefmt = gtk_scrolled_window_new (NULL, NULL);
+       gtk_widget_show (scrolledwin_quotefmt);
+       gtk_box_pack_start (GTK_BOX (vbox_quote), scrolledwin_quotefmt, TRUE, TRUE, 0);
+       gtk_scrolled_window_set_policy
+               (GTK_SCROLLED_WINDOW (scrolledwin_quotefmt),
+                GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+
+       text_quotefmt = gtk_text_new (NULL, NULL);
+       gtk_widget_show (text_quotefmt);
+       gtk_container_add(GTK_CONTAINER(scrolledwin_quotefmt), text_quotefmt);
+       gtk_text_set_editable (GTK_TEXT (text_quotefmt), TRUE);
+       gtk_widget_set_usize(text_quotefmt, 400, 60);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, TRUE, TRUE, 0);
+
+       label_fw_quotemark = gtk_label_new (_("Forward quotation mark"));
+       gtk_widget_show (label_fw_quotemark);
+       gtk_box_pack_start (GTK_BOX (hbox1), label_fw_quotemark, FALSE, FALSE, 0);
+
+       entry_fw_quotemark = gtk_entry_new ();
+       gtk_widget_show (entry_fw_quotemark);
+       gtk_box_pack_start (GTK_BOX (hbox1), entry_fw_quotemark, FALSE, FALSE, 0);
+       gtk_widget_set_usize (entry_fw_quotemark, 64, -1);
+
+       hbox1 = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, TRUE, TRUE, 0);
+
+       label_fw_quotefmt = gtk_label_new (_("Forward format:"));
+       gtk_widget_show (label_fw_quotefmt);
+       gtk_box_pack_start (GTK_BOX (hbox1), label_fw_quotefmt, FALSE, FALSE, 0);
+
+       scrolledwin_quotefmt = gtk_scrolled_window_new (NULL, NULL);
+       gtk_widget_show (scrolledwin_quotefmt);
+       gtk_box_pack_start (GTK_BOX (vbox_quote), scrolledwin_quotefmt, TRUE, TRUE, 0);
+       gtk_scrolled_window_set_policy
+               (GTK_SCROLLED_WINDOW (scrolledwin_quotefmt),
+                GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+
+       text_fw_quotefmt = gtk_text_new (NULL, NULL);
+       gtk_widget_show (text_fw_quotefmt);
+       gtk_container_add(GTK_CONTAINER(scrolledwin_quotefmt), text_fw_quotefmt);
+       gtk_text_set_editable (GTK_TEXT (text_fw_quotefmt), TRUE);
+       gtk_widget_set_usize(text_fw_quotefmt, 400, 60);
+
+       hbox1 = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
+
+       btn_quotedesc =
+               gtk_button_new_with_label (_(" Description of symbols "));
+       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);
+
+
+       gtkut_button_set_create(&hbox1, &close_btn, _("Close"),
+                               NULL, NULL, NULL, NULL);
+       gtk_box_pack_end(GTK_BOX(vbox_quote), hbox1, FALSE, FALSE, 0);
+       gtk_widget_grab_default(close_btn);
+
+       gtk_signal_connect(GTK_OBJECT(close_btn), "clicked",
+                          GTK_SIGNAL_FUNC(compose_prefs_close), NULL);
+
+       gtk_widget_show_all(vbox_quote);
+
+       composeprefs.window = window;
+       composeprefs.close_btn = close_btn;
+
+       compose.checkbtn_quote = checkbtn_quote;
+       compose.entry_quotemark = entry_quotemark;
+       compose.text_quotefmt = text_quotefmt;
+       compose.entry_fw_quotemark = entry_fw_quotemark;
+       compose.text_fw_quotefmt = text_fw_quotefmt;
+}
+
+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);
+       }
+}