sync with sylpheed 0.6.5cvs20
[claws.git] / src / prefs_common.c
index 7d23504007ac9fdf18aca58aae00947181550bdd..63df94483d418762fa3c278b19b0a93cd42479b4 100644 (file)
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <errno.h>
 
 #include "intl.h"
 #include "main.h"
 #include "prefs.h"
 #include "prefs_common.h"
 #include "prefs_display_header.h"
+#include "prefs_summary_column.h"
 #include "mainwindow.h"
 #include "summaryview.h"
 #include "messageview.h"
@@ -96,9 +98,6 @@ static struct Send {
 } send;
 
 static struct Compose {
-       GtkWidget *checkbtn_quote;
-       GtkWidget *entry_quotemark;
-       GtkWidget *text_quotefmt;
        GtkWidget *checkbtn_autosig;
        GtkWidget *entry_sigsep;
 
@@ -106,6 +105,7 @@ static struct Compose {
        GtkWidget *text_fw_quotefmt;
 
        GtkWidget *checkbtn_autoextedit;
+
        GtkWidget *checkbtn_reply_account_autosel;
        GtkWidget *checkbtn_forward_account_autosel;
        GtkWidget *checkbtn_reedit_account_autosel;
@@ -115,8 +115,11 @@ static struct Compose {
        GtkWidget *checkbtn_wrapquote;
        GtkWidget *checkbtn_wrapatsend;
 
-       GtkWidget * checkbtn_forward_as_attachment;
-       GtkWidget * checkbtn_smart_wrapping;
+       GtkWidget *checkbtn_quote;
+       GtkWidget *checkbtn_forward_as_attachment;
+       GtkWidget *checkbtn_smart_wrapping;
+       GtkWidget *checkbtn_block_cursor;
+       GtkWidget *checkbtn_reply_with_quote;
 
        /* spelling */
 #if USE_PSPELL
@@ -128,6 +131,14 @@ static struct Compose {
 
 } compose;
 
+static struct Quote {
+       GtkWidget *entry_quotemark;
+       GtkWidget *text_quotefmt;
+
+       GtkWidget *entry_fw_quotemark;
+       GtkWidget *text_fw_quotefmt;
+} quote;
+
 static struct Display {
        GtkWidget *entry_textfont;
        GtkWidget *button_textfont;
@@ -168,6 +179,7 @@ static struct Message {
 #if USE_GPGME
 static struct Privacy {
        GtkWidget *checkbtn_default_encrypt;
+        GtkWidget *checkbtn_ascii_armored;
        GtkWidget *checkbtn_default_sign;
        GtkWidget *checkbtn_auto_check_signatures;
        GtkWidget *checkbtn_gpg_signature_popup;
@@ -188,6 +200,7 @@ static struct Interface {
        GtkWidget *checkbtn_warnqueued;
        GtkWidget *checkbtn_addaddrbyclick;
        GtkWidget *optmenu_recvdialog;
+       GtkWidget *optmenu_nextunreadmsgdialog;
 } interface;
 
 static struct Other {
@@ -218,9 +231,13 @@ static void prefs_common_charset_set_optmenu             (PrefParam *pparam);
 static void prefs_common_default_signkey_set_data_from_optmenu
                                                        (PrefParam *pparam);
 static void prefs_common_default_signkey_set_optmenu   (PrefParam *pparam);
+static void prefs_common_ascii_armored_warning(GtkWidget* widget, 
+                                              gpointer unused);
 #endif
 static void prefs_common_recv_dialog_set_data_from_optmenu(PrefParam *pparam);
 static void prefs_common_recv_dialog_set_optmenu(PrefParam *pparam);
+static void prefs_nextunreadmsgdialog_set_data_from_optmenu(PrefParam *pparam);
+static void prefs_nextunreadmsgdialog_set_optmenu(PrefParam *pparam);
 
 #if USE_PSPELL
 static void prefs_dictionary_set_data_from_optmenu(PrefParam *param);
@@ -293,21 +310,6 @@ static PrefParam param[] = {
         prefs_common_charset_set_optmenu},
 
        /* Compose */
-       {"reply_with_quote", "TRUE", &prefs_common.reply_with_quote, P_BOOL,
-        &compose.checkbtn_quote,
-        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%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,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -317,18 +319,6 @@ static PrefParam param[] = {
        {"auto_ext_editor", "FALSE", &prefs_common.auto_exteditor, P_BOOL,
         &compose.checkbtn_autoextedit,
         prefs_set_data_from_toggle, prefs_set_toggle},
-        {"reply_account_autoselect", "TRUE",
-        &prefs_common.reply_account_autosel, P_BOOL,
-        &compose.checkbtn_reply_account_autosel,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-       {"forward_account_autoselect", "TRUE",
-        &prefs_common.forward_account_autosel, P_BOOL,
-        &compose.checkbtn_forward_account_autosel,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-       {"reedit_account_autoselect", "TRUE",
-        &prefs_common.reedit_account_autosel, P_BOOL,
-        &compose.checkbtn_reedit_account_autosel,
-        prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"linewrap_length", "74", &prefs_common.linewrap_len, P_INT,
         &compose.spinbtn_linewrap,
@@ -346,6 +336,9 @@ static PrefParam param[] = {
         {"smart_wrapping", "TRUE", &prefs_common.smart_wrapping,
         P_BOOL, &compose.checkbtn_smart_wrapping,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"block_cursor", "FALSE", &prefs_common.block_cursor,
+        P_BOOL, &compose.checkbtn_block_cursor,
+        prefs_set_data_from_toggle, prefs_set_toggle},
 #if USE_PSPELL
        {"enable_pspell", "TRUE", &prefs_common.enable_pspell,
         P_BOOL, &compose.checkbtn_enable_pspell,
@@ -357,9 +350,43 @@ static PrefParam param[] = {
         P_STRING, &compose.optmenu_dictionary, 
         prefs_dictionary_set_data_from_optmenu, prefs_dictionary_set_optmenu },
 #endif
+       {"reply_with_quote", "TRUE", &prefs_common.reply_with_quote, P_BOOL,
+        &compose.checkbtn_reply_with_quote, prefs_set_data_from_toggle, prefs_set_toggle},
+
+       /* Account autoselection */
+       {"reply_account_autoselect", "TRUE",
+        &prefs_common.reply_account_autosel, P_BOOL,
+        &compose.checkbtn_reply_account_autosel,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"forward_account_autoselect", "TRUE",
+        &prefs_common.forward_account_autosel, P_BOOL,
+        &compose.checkbtn_forward_account_autosel,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"reedit_account_autoselect", "TRUE",
+        &prefs_common.reedit_account_autosel, P_BOOL,
+        &compose.checkbtn_reedit_account_autosel,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
        {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
         NULL, NULL, NULL},
 
+       /* Quote */
+       {"reply_quote_mark", "> ", &prefs_common.quotemark, P_STRING,
+        &quote.entry_quotemark, prefs_set_data_from_entry, prefs_set_entry},
+       {"reply_quote_format", "On %d\\n%f wrote:\\n\\n%Q",
+        &prefs_common.quotefmt, P_STRING, &quote.text_quotefmt,
+        prefs_set_data_from_text, prefs_set_text},
+
+       {"forward_quote_mark", "> ", &prefs_common.fw_quotemark, P_STRING,
+        &quote.entry_fw_quotemark,
+        prefs_set_data_from_entry, prefs_set_entry},
+       {"forward_quote_format",
+        "\\n\\nBegin forwarded message:\\n\\n"
+        "?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t\\n}?c{Cc: %c\\n}"
+        "?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M",
+        &prefs_common.fw_quotefmt, P_STRING, &quote.text_fw_quotefmt,
+        prefs_set_data_from_text, prefs_set_text},
+
        /* Display */
        {"widget_font", NULL, &prefs_common.widgetfont, P_STRING,
         NULL, NULL, NULL},
@@ -418,24 +445,68 @@ static PrefParam param[] = {
        {"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
         NULL, NULL, NULL},
 
-       {"show_mark", "TRUE", &prefs_common.show_mark, P_BOOL,
-        NULL, NULL, NULL},
-       {"show_unread", "TRUE", &prefs_common.show_unread, P_BOOL,
-        NULL, NULL, NULL},
-       {"show_mime", "TRUE", &prefs_common.show_mime, P_BOOL,
-        NULL, NULL, NULL},
-       {"show_number", "FALSE", &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,
-        NULL, NULL, NULL},
-       {"show_from", "TRUE", &prefs_common.show_from, P_BOOL,
-        NULL, NULL, NULL},
-       {"show_subject", "TRUE", &prefs_common.show_subject, P_BOOL,
-        NULL, NULL, NULL},
+       {"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},
+       {"summary_col_show_mime", "TRUE",
+        &prefs_common.summary_col_visible[S_COL_MIME], P_BOOL, NULL, NULL, NULL},
+       {"summary_col_show_subject", "TRUE",
+        &prefs_common.summary_col_visible[S_COL_SUBJECT], P_BOOL, NULL, NULL, NULL},
+       {"summary_col_show_from", "TRUE",
+        &prefs_common.summary_col_visible[S_COL_FROM], P_BOOL, NULL, NULL, NULL},
+       {"summary_col_show_date", "TRUE",
+        &prefs_common.summary_col_visible[S_COL_DATE], P_BOOL, NULL, NULL, NULL},
+       {"summary_col_show_size", "TRUE",
+        &prefs_common.summary_col_visible[S_COL_SIZE], P_BOOL, NULL, NULL, NULL},
+       {"summary_col_show_number", "FALSE",
+        &prefs_common.summary_col_visible[S_COL_NUMBER], P_BOOL, NULL, NULL, NULL},
+       {"summary_col_show_score", "FALSE",
+        &prefs_common.summary_col_visible[S_COL_SCORE], P_BOOL, NULL, NULL, NULL},
+       {"summary_col_show_locked", "FALSE",
+        &prefs_common.summary_col_visible[S_COL_LOCKED], P_BOOL, NULL, NULL, NULL},
+
+       {"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},
+       {"summary_col_pos_mime", "2",
+         &prefs_common.summary_col_pos[S_COL_MIME], P_INT, NULL, NULL, NULL},
+       {"summary_col_pos_subject", "3",
+         &prefs_common.summary_col_pos[S_COL_SUBJECT], P_INT, NULL, NULL, NULL},
+       {"summary_col_pos_from", "4",
+         &prefs_common.summary_col_pos[S_COL_FROM], P_INT, NULL, NULL, NULL},
+       {"summary_col_pos_date", "5",
+         &prefs_common.summary_col_pos[S_COL_DATE], P_INT, NULL, NULL, NULL},
+       {"summary_col_pos_size", "6",
+         &prefs_common.summary_col_pos[S_COL_SIZE], P_INT, NULL, NULL, NULL},
+       {"summary_col_pos_number", "7",
+         &prefs_common.summary_col_pos[S_COL_NUMBER], P_INT, NULL, NULL, NULL},
+       {"summary_col_pos_score", "8",
+        &prefs_common.summary_col_pos[S_COL_SCORE], P_INT, NULL, NULL, NULL},
+       {"summary_col_pos_locked", "9",
+        &prefs_common.summary_col_pos[S_COL_LOCKED], P_INT, NULL, NULL, NULL},
+
+       {"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},
+       {"summary_col_size_mime", "10",
+        &prefs_common.summary_col_size[S_COL_MIME], P_INT, NULL, NULL, NULL},
+       {"summary_col_size_subject", "200",
+        &prefs_common.summary_col_size[S_COL_SUBJECT], P_INT, NULL, NULL, NULL},
+       {"summary_col_size_from", "120",
+        &prefs_common.summary_col_size[S_COL_FROM], P_INT, NULL, NULL, NULL},
+       {"summary_col_size_date", "118",
+        &prefs_common.summary_col_size[S_COL_DATE], P_INT, NULL, NULL, NULL},
+       {"summary_col_size_size", "45",
+        &prefs_common.summary_col_size[S_COL_SIZE], P_INT, NULL, NULL, NULL},
+       {"summary_col_size_number", "40",
+        &prefs_common.summary_col_size[S_COL_NUMBER], P_INT, NULL, NULL, NULL},
+       {"summary_col_size_score", "40",
+        &prefs_common.summary_col_size[S_COL_SCORE], P_INT, NULL, NULL, NULL},
+       {"summary_col_size_locked", "13",
+        &prefs_common.summary_col_size[S_COL_LOCKED], P_INT, NULL, NULL, NULL},
 
        /* Widget size */
        {"folderview_width", "179", &prefs_common.folderview_width, P_INT,
@@ -450,28 +521,12 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"folder_col_total", "32", &prefs_common.folder_col_total, P_INT,
         NULL, NULL, NULL},
+
        {"summaryview_width", "600", &prefs_common.summaryview_width, P_INT,
         NULL, NULL, NULL},
        {"summaryview_height", "173", &prefs_common.summaryview_height, P_INT,
         NULL, NULL, NULL},
-       {"summary_col_mark", "10", &prefs_common.summary_col_mark, P_INT,
-        NULL, NULL, NULL},
-       {"summary_col_unread", "13", &prefs_common.summary_col_unread, P_INT,
-        NULL, NULL, NULL},
-       {"summary_col_mime", "10", &prefs_common.summary_col_mime, P_INT,
-        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,
-        NULL, NULL, NULL},
-       {"summary_col_from", "140", &prefs_common.summary_col_from, P_INT,
-        NULL, NULL, NULL},
-       {"summary_col_subject", "200", &prefs_common.summary_col_subject,
-        P_INT, NULL, NULL, NULL},
+
        {"mainview_x", "64", &prefs_common.mainview_x, P_INT,
         NULL, NULL, NULL},
        {"mainview_y", "64", &prefs_common.mainview_y, P_INT,
@@ -552,12 +607,17 @@ static PrefParam param[] = {
         &prefs_common.mime_image_viewer, P_STRING, NULL, NULL, NULL},
        {"mime_audio_player", "play '%s'",
         &prefs_common.mime_audio_player, P_STRING, NULL, NULL, NULL},
+       {"mime_open_command", "gedit '%s'",
+        &prefs_common.mime_open_cmd, P_STRING, NULL, NULL, NULL},
 
 #if USE_GPGME
        /* Privacy */
        {"default_encrypt", "FALSE", &prefs_common.default_encrypt, P_BOOL,
         &privacy.checkbtn_default_encrypt,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"ascii_armored", "FALSE", &prefs_common.ascii_armored, P_BOOL,
+        &privacy.checkbtn_ascii_armored,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"default_sign", "FALSE", &prefs_common.default_sign, P_BOOL,
         &privacy.checkbtn_default_sign,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -605,6 +665,10 @@ static PrefParam param[] = {
         &interface.optmenu_recvdialog,
         prefs_common_recv_dialog_set_data_from_optmenu,
         prefs_common_recv_dialog_set_optmenu},
+       {"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,
@@ -648,6 +712,7 @@ static void prefs_common_create             (void);
 static void prefs_receive_create       (void);
 static void prefs_send_create          (void);
 static void prefs_compose_create       (void);
+static void prefs_quote_create         (void);
 static void prefs_display_create       (void);
 static void prefs_message_create       (void);
 #if USE_GPGME
@@ -676,8 +741,11 @@ static void date_format_select_row         (GtkWidget      *date_format_list,
 static GtkWidget *date_format_create           (GtkButton      *button,
                                                 void           *data);
 
-static void prefs_quote_description            (void);
 static void prefs_quote_description_create     (void);
+static void prefs_quote_description_key_pressed        (GtkWidget      *widget,
+                                                GdkEventKey    *event,
+                                                gpointer        data);
+
 static void prefs_quote_colors_dialog          (void);
 static void prefs_quote_colors_dialog_create   (void);
 static void prefs_quote_colors_key_pressed     (GtkWidget      *widget,
@@ -697,20 +765,6 @@ static void set_button_bg_color                    (GtkWidget      *widget,
 static void prefs_enable_message_color_toggled (void);
 static void prefs_recycle_colors_toggled       (GtkWidget      *widget);
 
-/* functions for setting items of SummaryView */
-static void prefs_summary_display_item_dialog_create
-                                       (gboolean       *cancelled);
-static void display_item_ok            (GtkWidget      *widget,
-                                        gboolean       *cancelled);
-static void display_item_cancel                (GtkWidget      *widget,
-                                        gboolean       *cancelled);
-static gint display_item_delete_event  (GtkWidget      *widget,
-                                        GdkEventAny    *event,
-                                        gboolean       *cancelled);
-static void display_item_key_pressed   (GtkWidget      *widget,
-                                        GdkEventKey    *event,
-                                        gboolean       *cancelled);
-
 static void prefs_font_select  (GtkButton *button, GtkEntry *entry);
 
 static void prefs_font_selection_key_pressed   (GtkWidget      *widget,
@@ -728,17 +782,63 @@ 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_init() {
+       prefs_common.fltlist = NULL;
+       prefs_common.disphdr_list = NULL;
+}
 
 void prefs_common_read_config(void)
 {
+       FILE *fp;
+       gchar *path;
+       gchar buf[PREFSBUFSIZE];
+
        prefs_read_config(param, "Common", COMMON_RC);
+
+       path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMAND_HISTORY,
+                          NULL);
+       if ((fp = fopen(path, "r")) == NULL) {
+               if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
+               g_free(path);
+               return;
+       }
+       g_free(path);
+       while (fgets(buf, sizeof(buf), fp) != NULL) {
+               g_strstrip(buf);
+               if (buf[0] == '\0') continue;
+               prefs_common.mime_open_cmd_history =
+                       add_history(prefs_common.mime_open_cmd_history, buf);
+       }
+       fclose(fp);
+
+       prefs_common.mime_open_cmd_history =
+               g_list_reverse(prefs_common.mime_open_cmd_history);
 }
 
 void prefs_common_save_config(void)
 {
+       GList *cur;
+       FILE *fp;
+       gchar *path;
+
        prefs_save_config(param, "Common", COMMON_RC);
+
+       path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMAND_HISTORY,
+                          NULL);
+       if ((fp = fopen(path, "w")) == NULL) {
+               FILE_OP_ERROR(path, "fopen");
+               g_free(path);
+               return;
+       }
+
+       for (cur = prefs_common.mime_open_cmd_history;
+            cur != NULL; cur = cur->next) {
+               fputs((gchar *)cur->data, fp);
+               fputc('\n', fp);
+       }
+
+       fclose(fp);
+       g_free(path);
 }
 
 void prefs_common_open(void)
@@ -793,6 +893,8 @@ static void prefs_common_create(void)
        SET_NOTEBOOK_LABEL(dialog.notebook, _("Send"),      page++);
        prefs_compose_create();
        SET_NOTEBOOK_LABEL(dialog.notebook, _("Compose"),   page++);
+       prefs_quote_create();
+       SET_NOTEBOOK_LABEL(dialog.notebook, _("Quote"),   page++);
        prefs_display_create();
        SET_NOTEBOOK_LABEL(dialog.notebook, _("Display"),   page++);
        prefs_message_create();
@@ -806,8 +908,6 @@ 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);
 }
 
@@ -865,18 +965,20 @@ static void prefs_receive_create(void)
        gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
        SET_TOGGLE_SENSITIVITY (checkbtn_incext, hbox);
 
-       label_incext = gtk_label_new (_("Program path"));
+       label_incext = gtk_label_new (_("Command"));
        gtk_widget_show (label_incext);
        gtk_box_pack_start (GTK_BOX (hbox), label_incext, FALSE, FALSE, 0);
 
        entry_incext = gtk_entry_new ();
        gtk_widget_show (entry_incext);
        gtk_box_pack_start (GTK_BOX (hbox), entry_incext, TRUE, TRUE, 0);
+
 #if 0
        button_incext = gtk_button_new_with_label ("... ");
        gtk_widget_show (button_incext);
        gtk_box_pack_start (GTK_BOX (hbox), button_incext, FALSE, FALSE, 0);
 #endif
+
        PACK_FRAME(vbox1, frame_spool, _("Local spool"));
 
        vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
@@ -918,7 +1020,7 @@ static void prefs_receive_create(void)
        PACK_CHECK_BUTTON (hbox_autochk, checkbtn_autochk,
                           _("Auto-check new mail"));
 
-       label_autochk1 = gtk_label_new (_("each"));
+       label_autochk1 = gtk_label_new (_("every"));
        gtk_widget_show (label_autochk1);
        gtk_box_pack_start (GTK_BOX (hbox_autochk), label_autochk1, FALSE, FALSE, 0);
 
@@ -946,7 +1048,6 @@ static void prefs_receive_create(void)
        PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc,
                           _("Update all local folders after incorporation"));
 
-
        PACK_FRAME(vbox1, frame_news, _("News"));
 
        hbox = gtk_hbox_new (FALSE, 8);
@@ -955,7 +1056,7 @@ static void prefs_receive_create(void)
        gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
 
        label_maxarticle = gtk_label_new
-               (_("Maximum article number to download\n"
+               (_("Maximum number of articles to download\n"
                   "(unlimited if 0 is specified)"));
        gtk_widget_show (label_maxarticle);
        gtk_box_pack_start (GTK_BOX (hbox), label_maxarticle, FALSE, FALSE, 0);
@@ -1011,6 +1112,7 @@ static void prefs_send_create(void)
        GtkWidget *optmenu_menu;
        GtkWidget *menuitem;
        GtkWidget *checkbtn_returnreceipt;
+       GtkWidget *label_charset_desc;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -1032,7 +1134,7 @@ static void prefs_send_create(void)
        gtk_box_pack_start (GTK_BOX (vbox_extsend), hbox1, FALSE, FALSE, 0);
        SET_TOGGLE_SENSITIVITY(checkbtn_extsend, hbox1);
 
-       label_extsend = gtk_label_new (_("Program path"));
+       label_extsend = gtk_label_new (_("Command"));
        gtk_widget_show (label_extsend);
        gtk_box_pack_start (GTK_BOX (hbox1), label_extsend, FALSE, FALSE, 0);
 
@@ -1067,7 +1169,7 @@ static void prefs_send_create(void)
 
        optmenu = gtk_option_menu_new ();
        gtk_widget_show (optmenu);
-       gtk_box_pack_start(GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
 
        optmenu_menu = gtk_menu_new ();
 
@@ -1107,9 +1209,23 @@ static void prefs_send_create(void)
        SET_MENUITEM(_("Chinese (ISO-2022-CN)"),         CS_ISO_2022_CN);
 #endif /* 0 */
        SET_MENUITEM(_("Korean (EUC-KR)"),               CS_EUC_KR);
+       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);
 
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       label_charset_desc = gtk_label_new
+               (_("If `Automatic' is selected, the optimal encoding\n"
+                  "for the current locale will be used."));
+       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);
+
        send.checkbtn_extsend = checkbtn_extsend;
        send.entry_extsend    = entry_extsend;
        /* send.button_extsend   = button_extsend; */
@@ -1222,21 +1338,6 @@ static void prefs_compose_create(void)
        GtkWidget *vbox1;
         GtkWidget *vbox2;
         GtkWidget *vbox3;
-
-       /*
-       GtkWidget *frame_quote;
-       GtkWidget *vbox_quote;
-       GtkWidget *checkbtn_quote;
-       GtkWidget *hbox1;
-       GtkWidget *label_quotemark;
-       GtkWidget *entry_quotemark;
-       GtkWidget *hbox2;
-       GtkWidget *label_quotefmt;
-       GtkWidget *btn_quotedesc;
-       GtkWidget *scrolledwin_quotefmt;
-       GtkWidget *text_quotefmt;
-*/
-
        GtkWidget *hbox1;
        GtkWidget *hbox2;
        GtkWidget *btn_quotefmt;
@@ -1247,6 +1348,10 @@ static void prefs_compose_create(void)
        GtkWidget *label_sigsep;
        GtkWidget *entry_sigsep;
 
+       GtkWidget *frame_editor;
+       GtkWidget *hbox_editor;
+       GtkWidget *checkbtn_autoextedit;
+
        GtkWidget *frame_autosel;
         GtkWidget *hbox_autosel;
         GtkWidget *vbox_autosel;
@@ -1254,8 +1359,6 @@ static void prefs_compose_create(void)
        GtkWidget *checkbtn_forward_account_autosel;
        GtkWidget *checkbtn_reedit_account_autosel;
 
-       GtkWidget *checkbtn_autoextedit;
-
         GtkWidget *vbox_linewrap;
 
        GtkWidget *hbox3;
@@ -1267,8 +1370,11 @@ static void prefs_compose_create(void)
        GtkWidget *checkbtn_wrapquote;
        GtkWidget *checkbtn_wrapatsend;
 
+       GtkWidget *frame_reply;
+       GtkWidget *checkbtn_quote;
        GtkWidget *checkbtn_forward_as_attachment;
        GtkWidget *checkbtn_smart_wrapping;
+       GtkWidget *checkbtn_block_cursor;
 
 #if USE_PSPELL
        GtkWidget *frame_spell;
@@ -1288,75 +1394,20 @@ static void prefs_compose_create(void)
        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);
-       gtk_widget_show (vbox_quote);
-       gtk_container_add (GTK_CONTAINER (frame_quote), vbox_quote);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
 
        hbox1 = gtk_hbox_new (FALSE, 32);
        gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
 
        hbox2 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox2);
        gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
 
-       label_quotemark = gtk_label_new (_("Quotation mark"));
-       gtk_widget_show (label_quotemark);
-       gtk_box_pack_start (GTK_BOX (hbox2), label_quotemark, FALSE, FALSE, 0);
-
-       entry_quotemark = gtk_entry_new ();
-       gtk_widget_show (entry_quotemark);
-       gtk_box_pack_start (GTK_BOX (hbox2), entry_quotemark, FALSE, FALSE, 0);
-       gtk_widget_set_usize (entry_quotemark, 64, -1);
-
-       PACK_CHECK_BUTTON (hbox1, checkbtn_quote,
-                          _("Quote message when replying"));
-
-       hbox2 = gtk_hbox_new (FALSE, 0);
-       gtk_widget_show (hbox2);
-       gtk_box_pack_start (GTK_BOX (vbox_quote), hbox2, TRUE, TRUE, 0);
-
-       label_quotefmt = gtk_label_new (_("Quotation format:"));
-       gtk_widget_show (label_quotefmt);
-       gtk_box_pack_start (GTK_BOX (hbox2), label_quotefmt, FALSE, FALSE, 0);
-
-       btn_quotedesc =
-               gtk_button_new_with_label (_(" Description of symbols "));
-
-       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);
-
-
-       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, -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"));
 
        vbox_sig = gtk_vbox_new (FALSE, VSPACING_NARROW);
@@ -1380,7 +1431,7 @@ static void prefs_compose_create(void)
 
        gtk_widget_set_usize (entry_sigsep, 64, -1);
 
-        /* Automatic (Smart) Account Selection */
+        /* Account autoselection */
        PACK_FRAME(vbox1, frame_autosel, _("Automatic Account Selection"));
 
        hbox_autosel = gtk_hbox_new (FALSE, VSPACING_NARROW);
@@ -1445,6 +1496,9 @@ static void prefs_compose_create(void)
 
        PACK_CHECK_BUTTON (vbox1, checkbtn_smart_wrapping,
                           _("Smart wrapping (EXPERIMENTAL)"));
+       
+       PACK_CHECK_BUTTON (vbox1, checkbtn_block_cursor,
+                         _("Block cursor"));
 
 #if USE_PSPELL
        /* spell checker defaults */                       
@@ -1509,9 +1563,10 @@ static void prefs_compose_create(void)
        compose.entry_sigsep     = entry_sigsep;
 
        compose.checkbtn_autoextedit = checkbtn_autoextedit;
-        compose.checkbtn_reply_account_autosel = checkbtn_reply_account_autosel;
+
+        compose.checkbtn_reply_account_autosel   = checkbtn_reply_account_autosel;
        compose.checkbtn_forward_account_autosel = checkbtn_forward_account_autosel;
-       compose.checkbtn_reedit_account_autosel = checkbtn_reedit_account_autosel;
+       compose.checkbtn_reedit_account_autosel  = checkbtn_reedit_account_autosel;
 
        compose.spinbtn_linewrap     = spinbtn_linewrap;
        compose.spinbtn_linewrap_adj = spinbtn_linewrap_adj;
@@ -1522,6 +1577,8 @@ static void prefs_compose_create(void)
                checkbtn_forward_as_attachment;
        compose.checkbtn_smart_wrapping = 
                checkbtn_smart_wrapping;
+       compose.checkbtn_block_cursor   =
+               checkbtn_block_cursor;
 
 #if USE_PSPELL
        compose.checkbtn_enable_pspell = checkbtn_enable_pspell;
@@ -1531,6 +1588,130 @@ static void prefs_compose_create(void)
 #endif
 }
 
+static void prefs_quote_create(void)
+{
+       GtkWidget *vbox1;
+       GtkWidget *frame_quote;
+       GtkWidget *vbox_quote;
+       GtkWidget *hbox1;
+       GtkWidget *hbox2;
+       GtkWidget *label_quotemark;
+       GtkWidget *entry_quotemark;
+       GtkWidget *scrolledwin_quotefmt;
+       GtkWidget *text_quotefmt;
+
+       GtkWidget *entry_fw_quotemark;
+       GtkWidget *text_fw_quotefmt;
+
+       GtkWidget *btn_quotedesc;
+
+       GtkWidget *checkbtn_reply_with_quote;
+
+       vbox1 = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox1);
+       gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+
+       /* reply */
+
+       PACK_CHECK_BUTTON (vbox1, checkbtn_reply_with_quote, _("Reply will quote by default"));
+
+       PACK_FRAME (vbox1, frame_quote, _("Reply format"));
+
+       vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       gtk_widget_show (vbox_quote);
+       gtk_container_add (GTK_CONTAINER (frame_quote), vbox_quote);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
+
+       hbox1 = gtk_hbox_new (FALSE, 32);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
+
+       hbox2 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox2);
+       gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
+
+       label_quotemark = gtk_label_new (_("Quotation mark"));
+       gtk_widget_show (label_quotemark);
+       gtk_box_pack_start (GTK_BOX (hbox2), label_quotemark, FALSE, FALSE, 0);
+
+       entry_quotemark = gtk_entry_new ();
+       gtk_widget_show (entry_quotemark);
+       gtk_box_pack_start (GTK_BOX (hbox2), entry_quotemark, FALSE, FALSE, 0);
+       gtk_widget_set_usize (entry_quotemark, 64, -1);
+
+       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, -1, 60);
+
+       /* forward */
+
+       PACK_FRAME (vbox1, frame_quote, _("Forward format"));
+
+       vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       gtk_widget_show (vbox_quote);
+       gtk_container_add (GTK_CONTAINER (frame_quote), vbox_quote);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
+
+       hbox1 = gtk_hbox_new (FALSE, 32);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
+
+       hbox2 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox2);
+       gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
+
+       label_quotemark = gtk_label_new (_("Quotation mark"));
+       gtk_widget_show (label_quotemark);
+       gtk_box_pack_start (GTK_BOX (hbox2), label_quotemark, FALSE, FALSE, 0);
+
+       entry_fw_quotemark = gtk_entry_new ();
+       gtk_widget_show (entry_fw_quotemark);
+       gtk_box_pack_start (GTK_BOX (hbox2), entry_fw_quotemark,
+                           FALSE, FALSE, 0);
+       gtk_widget_set_usize (entry_fw_quotemark, 64, -1);
+
+       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, -1, 60);
+
+       hbox1 = gtk_hbox_new (FALSE, 32);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox1), 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);
+
+       compose.checkbtn_reply_with_quote= checkbtn_reply_with_quote;
+       quote.entry_quotemark    = entry_quotemark;
+       quote.text_quotefmt      = text_quotefmt;
+       quote.entry_fw_quotemark = entry_fw_quotemark;
+       quote.text_fw_quotefmt   = text_fw_quotefmt;
+}
+
 static void prefs_display_create(void)
 {
        GtkWidget *vbox1;
@@ -1713,7 +1894,7 @@ static void prefs_display_create(void)
        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",
-                           GTK_SIGNAL_FUNC (prefs_summary_display_item_set),
+                           GTK_SIGNAL_FUNC (prefs_summary_column_open),
                            NULL);
 
        display.entry_textfont  = entry_textfont;
@@ -1898,6 +2079,7 @@ static void prefs_privacy_create(void)
        GtkWidget *vbox2;
        GtkWidget *hbox1;
        GtkWidget *checkbtn_default_encrypt;
+        GtkWidget *checkbtn_ascii_armored;
        GtkWidget *checkbtn_default_sign;
        GtkWidget *checkbtn_auto_check_signatures;
        GtkWidget *checkbtn_gpg_signature_popup;
@@ -1920,6 +2102,11 @@ static void prefs_privacy_create(void)
        PACK_CHECK_BUTTON (vbox2, checkbtn_default_encrypt,
                           _("Encrypt message by default"));
 
+       PACK_CHECK_BUTTON (vbox2, checkbtn_ascii_armored,
+                          _("Plain ASCII armored"));
+       gtk_signal_connect(GTK_OBJECT(checkbtn_ascii_armored), "toggled",
+                               prefs_common_ascii_armored_warning, (gpointer)0);
+
        PACK_CHECK_BUTTON (vbox2, checkbtn_default_sign,
                           _("Sign message by default"));
 
@@ -1958,6 +2145,7 @@ static void prefs_privacy_create(void)
        gtk_widget_set_sensitive(optmenu, FALSE);
 
        privacy.checkbtn_default_encrypt = checkbtn_default_encrypt;
+        privacy.checkbtn_ascii_armored   = checkbtn_ascii_armored;
        privacy.checkbtn_default_sign    = checkbtn_default_sign;
        privacy.checkbtn_auto_check_signatures
                                         = checkbtn_auto_check_signatures;
@@ -2013,6 +2201,18 @@ static void prefs_common_default_signkey_set_optmenu(PrefParam *pparam)
        prefs_common_charset_set_data_from_optmenu(pparam);
 #endif
 }
+
+static void prefs_common_ascii_armored_warning(GtkWidget* widget,
+                                              gpointer unused)
+{
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))
+               && gtk_notebook_get_current_page(GTK_NOTEBOOK(dialog.notebook))) {
+               alertpanel_message(_("Warning - Privacy/Plain ASCII armored"),
+                       _("Its not recommend to use the old style plain ASCII\n"
+                       "armored mode for encypted messages. It doesn't comply\n"
+                       "with the RFC 3156 - MIME security with OpenPGP."));
+       }
+}
 #endif /* USE_GPGME */
 
 static void prefs_interface_create(void)
@@ -2041,6 +2241,11 @@ static void prefs_interface_create(void)
        GtkWidget *checkbtn_askonclean;
        GtkWidget *checkbtn_warnqueued;
 
+       GtkWidget *hbox2;
+       GtkWidget *optmenu_nextunreadmsgdialog;
+       GtkWidget *optmenu_nextunreadmsgdialog_menu;
+       GtkWidget *nextunreadmsgdialog_menuitem;
+
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
@@ -2077,8 +2282,9 @@ static void prefs_interface_create(void)
        gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
 
        label = gtk_label_new
-               (_("(Messages will be just marked till execution\n"
+               (_("(Messages will be marked until execution\n"
                   " if this is turned off)"));
+       gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 8);
        gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
@@ -2116,6 +2322,32 @@ static void prefs_interface_create(void)
                (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);
@@ -2162,15 +2394,16 @@ static void prefs_interface_create(void)
                           _("Warn if there are queued messages"));
 
        /* interface.checkbtn_emacs          = checkbtn_emacs; */
-       interface.checkbtn_openunread     = checkbtn_openunread;
-       interface.checkbtn_openinbox      = checkbtn_openinbox;
-       interface.checkbtn_immedexec      = checkbtn_immedexec;
-       interface.optmenu_recvdialog      = optmenu_recvdialog;
-       interface.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
-       interface.checkbtn_confonexit     = checkbtn_confonexit;
-       interface.checkbtn_cleanonexit    = checkbtn_cleanonexit;
-       interface.checkbtn_askonclean     = checkbtn_askonclean;
-       interface.checkbtn_warnqueued     = checkbtn_warnqueued;
+       interface.checkbtn_openunread         = checkbtn_openunread;
+       interface.checkbtn_openinbox          = checkbtn_openinbox;
+       interface.checkbtn_immedexec          = checkbtn_immedexec;
+       interface.optmenu_recvdialog          = optmenu_recvdialog;
+       interface.checkbtn_addaddrbyclick     = checkbtn_addaddrbyclick;
+       interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
+       interface.checkbtn_confonexit         = checkbtn_confonexit;
+       interface.checkbtn_cleanonexit        = checkbtn_cleanonexit;
+       interface.checkbtn_askonclean         = checkbtn_askonclean;
+       interface.checkbtn_warnqueued         = checkbtn_warnqueued;
 }
 
 static void prefs_other_create(void)
@@ -2850,11 +3083,12 @@ static void prefs_recycle_colors_toggled(GtkWidget *widget)
        prefs_common.recycle_quote_colors = is_active;
 }
 
-static void prefs_quote_description(void)
+void prefs_quote_description(void)
 {
        if (!quote_desc_win)
                prefs_quote_description_create();
 
+       manage_window_set_transient(GTK_WINDOW(quote_desc_win));
        gtk_widget_show(quote_desc_win);
        gtk_main();
        gtk_widget_hide(quote_desc_win);
@@ -2864,8 +3098,9 @@ static void prefs_quote_description_create(void)
 {
        GtkWidget *vbox;
        GtkWidget *hbox;
-       GtkWidget *hbbox;
+       GtkWidget *vbox2;
        GtkWidget *label;
+       GtkWidget *hbbox;
        GtkWidget *ok_btn;
 
        quote_desc_win = gtk_window_new(GTK_WINDOW_DIALOG);
@@ -2874,43 +3109,60 @@ static void prefs_quote_description_create(void)
        gtk_container_set_border_width(GTK_CONTAINER(quote_desc_win), 8);
        gtk_window_set_position(GTK_WINDOW(quote_desc_win), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(quote_desc_win), TRUE);
-       gtk_window_set_policy(GTK_WINDOW(quote_desc_win), FALSE, TRUE, FALSE);
+       gtk_window_set_policy(GTK_WINDOW(quote_desc_win), FALSE, FALSE, FALSE);
 
        vbox = gtk_vbox_new(FALSE, 8);
        gtk_container_add(GTK_CONTAINER(quote_desc_win), vbox);
 
-       hbox = gtk_hbox_new(FALSE, 4);
+       hbox = gtk_hbox_new(FALSE, 8);
        gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
 
+       vbox2 = gtk_vbox_new(FALSE, 8);
+       gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
+
+#define PACK_LABEL() \
+       gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0); \
+       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); \
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+
        label = gtk_label_new
-               ("SYMBOL\n\n"
-                 "%d\n"                /* date */
+               ("%d\n"         /* date */
                 "%f\n"         /* from */
-                "%N\n"         /* full name */
-                "%F\n"         /* first name */
-                "%I\n"         /* sender's initial */
-                "%s\n"         /* subject line */
+                "%N\n"         /* full name of sender */
+                "%F\n"         /* first name of sender */
+                "%I\n"         /* initial of sender */
+                "%s\n"         /* subject */
                 "%t\n"         /* to */
                 "%c\n"         /* cc */
                 "%n\n"         /* newsgroups */
-                "%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);
+                "%i");         /* message id */
+       PACK_LABEL();
+
+       label = gtk_label_new
+               ("?x{expr}");   /* condition */
+       PACK_LABEL();
 
        label = gtk_label_new
-               (_("DESCRIPTION\n\n"
-                   "Date\n"
+               ("%M\n"         /* message body */
+                "%Q\n"         /* quoted message body */
+                "%m\n"         /* message body without signature */
+                "%q\n"         /* quoted message body without signature */
+                "%%");         /* literal percent */
+       PACK_LABEL();
+
+       label = gtk_label_new
+               ("\\\\\n"       /* literal backslash */
+                "\\?\n"        /* literal question mark */
+                "\\{\n"        /* literal opening curly brace */
+                "\\}");        /* literal closing curly brace */
+       PACK_LABEL();
+
+       vbox2 = gtk_vbox_new(FALSE, 8);
+       gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
+
+       label = gtk_label_new
+               (_("Date\n"
                   "From\n"
                   "Full Name of Sender\n"
                   "First Name of Sender\n"
@@ -2919,20 +3171,30 @@ static void prefs_quote_description_create(void)
                   "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"
+                  "Message-ID"));
+       PACK_LABEL();
+
+       label = gtk_label_new
+               (_("If x is set, displays expr"));
+       PACK_LABEL();
+
+       label = gtk_label_new
+               (_("Message body\n"
                   "Quoted message body\n"
                   "Message body without signature\n"
                   "Quoted message body without signature\n"
-                  "%"));
+                  "Literal %"));
+       PACK_LABEL();
+
+       label = gtk_label_new
+               (_("Literal backslash\n"
+                  "Literal question mark\n"
+                  "Literal opening curly brace\n"
+                  "Literal closing curly brace"));
+       PACK_LABEL();
 
-       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+#undef PACK_LABEL
 
        gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
                                NULL, NULL, NULL, NULL);
@@ -2940,164 +3202,23 @@ static void prefs_quote_description_create(void)
 
        gtk_widget_grab_default(ok_btn);
        gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
-                                 GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
-
+                          GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+       gtk_signal_connect
+               (GTK_OBJECT(quote_desc_win), "key_press_event",
+                GTK_SIGNAL_FUNC(prefs_quote_description_key_pressed),
+                NULL);
        gtk_signal_connect(GTK_OBJECT(quote_desc_win), "delete_event",
-                                         GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
-
-       gtk_widget_show_all(vbox);
-}
-
-/* functions for setting items of SummaryView */
-
-static struct _SummaryDisplayItem
-{
-       GtkWidget *window;
-
-       GtkWidget *chkbtn[N_SUMMARY_COLS];
-
-       GtkWidget *ok_btn;
-       GtkWidget *cancel_btn;
-} summarydispitem;
-
-#define SET_ACTIVE(column, var) \
-       gtk_toggle_button_set_active \
-               (GTK_TOGGLE_BUTTON(summarydispitem.chkbtn[column]), \
-                prefs_common.var)
-#define GET_ACTIVE(column, var) \
-       prefs_common.var = gtk_toggle_button_get_active \
-               (GTK_TOGGLE_BUTTON(summarydispitem.chkbtn[column]))
-
-void prefs_summary_display_item_set(void)
-{
-       static gboolean cancelled;
-
-       if (!summarydispitem.window)
-               prefs_summary_display_item_dialog_create(&cancelled);
-       gtk_widget_grab_focus(summarydispitem.ok_btn);
-       gtk_widget_show(summarydispitem.window);
-       manage_window_set_transient(GTK_WINDOW(summarydispitem.window));
-
-       SET_ACTIVE(S_COL_MARK, show_mark);
-       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);
-       SET_ACTIVE(S_COL_SUBJECT, show_subject);
-
-       gtk_main();
-       gtk_widget_hide(summarydispitem.window);
-
-       if (cancelled != TRUE) {
-               GET_ACTIVE(S_COL_MARK, show_mark);
-               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);
-               GET_ACTIVE(S_COL_SUBJECT, show_subject);
-
-               main_window_reflect_prefs_all();
-       }
-}
-
-#define SET_CHECK_BUTTON(column, label) \
-{ \
-       summarydispitem.chkbtn[column] = \
-               gtk_check_button_new_with_label(label); \
-       gtk_box_pack_start(GTK_BOX(chkbtn_vbox), \
-                          summarydispitem.chkbtn[column], \
-                          FALSE, FALSE, 0); \
-}
-
-static void prefs_summary_display_item_dialog_create(gboolean *cancelled)
-{
-       GtkWidget *window;
-       GtkWidget *vbox;
-       GtkWidget *chkbtn_vbox;
-       GtkWidget *hbbox;
-       GtkWidget *ok_btn;
-       GtkWidget *cancel_btn;
-
-       window = gtk_window_new(GTK_WINDOW_DIALOG);
-       gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-       gtk_window_set_title(GTK_WINDOW(window), _("Set display item"));
-       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(display_item_delete_event),
-                          cancelled);
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(display_item_key_pressed),
-                          cancelled);
-
-       vbox = gtk_vbox_new(FALSE, 8);
-       gtk_container_add(GTK_CONTAINER(window), vbox);
-
-       chkbtn_vbox = gtk_vbox_new(FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), chkbtn_vbox, FALSE, FALSE, 0);
-
-       SET_CHECK_BUTTON(S_COL_MARK, _("Mark"));
-       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"));
-       SET_CHECK_BUTTON(S_COL_SUBJECT, _("Subject"));
-
-       gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
-                               &cancel_btn, _("Cancel"), NULL, NULL);
-       gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
-       gtk_widget_grab_default(ok_btn);
-
-       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
-                          GTK_SIGNAL_FUNC(display_item_ok), cancelled);
-       gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
-                          GTK_SIGNAL_FUNC(display_item_cancel), cancelled);
+                          GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
 
        gtk_widget_show_all(vbox);
-
-       summarydispitem.window = window;
-       summarydispitem.ok_btn = ok_btn;
-       summarydispitem.cancel_btn = cancel_btn;
 }
 
-static void display_item_ok(GtkWidget *widget, gboolean *cancelled)
-{
-       *cancelled = FALSE;
-       gtk_main_quit();
-}
-
-static void display_item_cancel(GtkWidget *widget, gboolean *cancelled)
-{
-       *cancelled = TRUE;
-       gtk_main_quit();
-}
-
-static gint display_item_delete_event(GtkWidget *widget, GdkEventAny *event,
-                                     gboolean *cancelled)
-{
-       *cancelled = TRUE;
-       gtk_main_quit();
-
-       return TRUE;
-}
-
-static void display_item_key_pressed(GtkWidget *widget, GdkEventKey *event,
-                                    gboolean *cancelled)
+static void prefs_quote_description_key_pressed(GtkWidget *widget,
+                                               GdkEventKey *event,
+                                               gpointer data)
 {
-       if (event && event->keyval == GDK_Escape) {
-               *cancelled = TRUE;
+       if (event && event->keyval == GDK_Escape)
                gtk_main_quit();
-       }
 }
 
 static void prefs_font_select(GtkButton *button, GtkEntry *entry)
@@ -3280,6 +3401,44 @@ static void prefs_common_apply(void)
        inc_autocheck_timer_set();
 }
 
+static void prefs_nextunreadmsgdialog_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));
+       *((NextUnreadMsgDialogShow *)pparam->data) = GPOINTER_TO_INT
+               (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+}
+
+static void prefs_nextunreadmsgdialog_set_optmenu(PrefParam *pparam)
+{
+       NextUnreadMsgDialogShow dialog_show;
+       GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+
+       dialog_show = *((NextUnreadMsgDialogShow *)pparam->data);
+
+       switch (dialog_show) {
+       case NEXTUNREADMSGDIALOG_ALWAYS:
+               gtk_option_menu_set_history(optmenu, 0);
+               break;
+       case NEXTUNREADMSGDIALOG_ASSUME_YES:
+               gtk_option_menu_set_history(optmenu, 1);
+               break;
+       case NEXTUNREADMSGDIALOG_ASSUME_NO:
+               gtk_option_menu_set_history(optmenu, 2);
+               break;
+       default:
+       }
+
+       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_cancel(void)
 {
        gtk_widget_hide(dialog.window);
@@ -3299,156 +3458,6 @@ 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);