rework Display/Summaries
[claws.git] / src / prefs_summaries.c
index 924b19ab8c95956daaea2dca53b6355fef681a05..8aabaaa07d2495d0e2dd7fe9faf25caa6c7d4382 100644 (file)
@@ -1,10 +1,10 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2006 Colin Leroy <colin@colino.net> & The Sylpheed-Claws Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2018 Colin Leroy and The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#ifdef G_OS_WIN32
+#  include <w32lib.h>
+#endif
+
 #include "prefs_common.h"
 #include "prefs_gtk.h"
+#include "prefs_summary_open.h"
 #include "prefs_summary_column.h"
 #include "prefs_folder_column.h"
 
 #include "gtk/menu.h"
 #include "gtk/gtkutils.h"
 #include "gtk/prefswindow.h"
+#include "gtk/combobox.h"
 
 #include "manage_window.h"
 
@@ -48,20 +54,34 @@ typedef struct _SummariesPage
 
        GtkWidget *window;
 
-       GtkWidget *chkbtn_transhdr;
-       GtkWidget *chkbtn_folder_unread;
+       GtkWidget *optmenu_folder_unread;
        GtkWidget *spinbtn_ng_abbrev_len;
-       GtkWidget *chkbtn_useaddrbook;
-       GtkWidget *chkbtn_threadsubj;
+       GtkWidget *checkbtn_useaddrbook;
+       GtkWidget *checkbtn_show_tooltips;
+       GtkWidget *checkbtn_threadsubj;
        GtkWidget *button_datefmt;
        GtkWidget *entry_datefmt;
 
+       GtkWidget *checkbtn_reopen_last_folder;
        GtkWidget *checkbtn_always_show_msg;
+       GtkWidget *checkbtn_show_on_folder_open;
+       GtkWidget *checkbtn_show_on_search_results;
+       GtkWidget *checkbtn_show_on_prevnext;
+       GtkWidget *checkbtn_show_on_deletemove;
+       GtkWidget *checkbtn_show_on_directional;
        GtkWidget *checkbtn_mark_as_read_on_newwin;
+       GtkWidget *spinbtn_mark_as_read_delay;
        GtkWidget *checkbtn_immedexec;
        GtkWidget *checkbtn_ask_mark_all_read;
-       GtkWidget *optmenu_select_on_entry;
-       GtkWidget *optmenu_nextunreadmsgdialog;
+       GtkWidget *checkbtn_ask_override_colorlabel;
+       GtkWidget *optmenu_sort_key;
+       GtkWidget *optmenu_sort_type;
+       GtkWidget *optmenu_nextunreadmsgdialog;
+       GtkWidget *checkbtn_folder_default_thread;
+       GtkWidget *checkbtn_folder_default_thread_collapsed;
+       GtkWidget *checkbtn_folder_default_hide_read_threads;
+       GtkWidget *checkbtn_folder_default_hide_read_msgs;
+       GtkWidget *checkbtn_folder_default_hide_del_msgs;
 
 } SummariesPage;
 
@@ -87,6 +107,10 @@ static void date_format_select_row          (GtkTreeView *list_view,
                                                 GtkTreePath *path,
                                                 GtkTreeViewColumn *column,
                                                 GtkWidget *date_format);
+static void mark_as_read_toggled               (GtkToggleButton *button,
+                                                GtkWidget *spinbtn);
+static void always_show_msg_toggled            (GtkToggleButton *button,
+                                                gpointer user_data);
 
 static GtkWidget *date_format_create(GtkButton *button, void *data)
 {
@@ -138,7 +162,7 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
        GtkTreeViewColumn *column;
        GtkTreeSelection *selection;
 
-       time_format[0].txt  = _("the full abbreviated weekday name");
+       time_format[0].txt  = _("the abbreviated weekday name");
        time_format[1].txt  = _("the full weekday name");
        time_format[2].txt  = _("the abbreviated month name");
        time_format[3].txt  = _("the full month name");
@@ -175,7 +199,7 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
                                   -1);
        }
 
-       datefmt_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       datefmt_win = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_summaries");
        gtk_container_set_border_width(GTK_CONTAINER(datefmt_win), 8);
        gtk_window_set_title(GTK_WINDOW(datefmt_win), _("Date format"));
        gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER);
@@ -211,7 +235,7 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
                         NULL);
        gtk_tree_view_append_column(GTK_TREE_VIEW(datefmt_list_view), column);
        
-       /* gtk_clist_set_column_width(GTK_CLIST(datefmt_clist), 0, 80); */
+       /* gtk_cmclist_set_column_width(GTK_CMCLIST(datefmt_clist), 0, 80); */
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(datefmt_list_view));
        gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
 
@@ -285,509 +309,110 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
                         G_CALLBACK(date_format_entry_on_change),
                         label3);
 
-       gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(datefmt_win), TRUE);
-
        gtk_widget_show(datefmt_win);
        manage_window_set_transient(GTK_WINDOW(datefmt_win));
+       gtk_window_set_modal(GTK_WINDOW(datefmt_win), TRUE);
 
        gtk_widget_grab_focus(ok_btn);
 
        return datefmt_win;
 }
 
-static struct KeybindDialog {
-       GtkWidget *window;
-       GtkWidget *combo;
-} keybind;
-
-static void prefs_keybind_select               (void);
-static gint prefs_keybind_deleted              (GtkWidget      *widget,
-                                                GdkEventAny    *event,
-                                                gpointer        data);
-static gboolean prefs_keybind_key_pressed      (GtkWidget      *widget,
-                                                GdkEventKey    *event,
-                                                gpointer        data);
-static void prefs_keybind_cancel               (void);
-static void prefs_keybind_apply_clicked                (GtkWidget      *widget);
-
-
-static void prefs_keybind_select(void)
-{
-       GtkWidget *window;
-       GtkWidget *vbox1;
-       GtkWidget *hbox1;
-       GtkWidget *label;
-       GtkWidget *combo;
-       GtkWidget *confirm_area;
-       GtkWidget *ok_btn;
-       GtkWidget *cancel_btn;
-
-       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-       gtk_window_set_title (GTK_WINDOW (window), _("Select key bindings"));
-       gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal (GTK_WINDOW (window), TRUE);
-       gtk_window_set_resizable(GTK_WINDOW (window), FALSE);
-       manage_window_set_transient (GTK_WINDOW (window));
-
-       vbox1 = gtk_vbox_new (FALSE, VSPACING);
-       gtk_container_add (GTK_CONTAINER (window), vbox1);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
-
-       label = gtk_label_new
-               (_("Select preset:"));
-       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
-       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-
-       combo = gtk_combo_new ();
-       gtk_box_pack_start (GTK_BOX (hbox1), combo, TRUE, TRUE, 0);
-       gtkut_combo_set_items (GTK_COMBO (combo),
-                              _("Default"),
-                              "Mew / Wanderlust",
-                              "Mutt",
-                              _("Old Sylpheed"),
-                              NULL);
-       gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO (combo)->entry), FALSE);
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
-
-       label = gtk_label_new
-               (_("You can also modify each menu shortcut by pressing\n"
-                  "any key(s) when focusing the mouse pointer on the item."));
-       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
-       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-       gtkut_widget_set_small_font_size (label);
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
-
-       gtkut_stock_button_set_create (&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
-                                      &ok_btn, GTK_STOCK_OK,
-                                      NULL, NULL);
-       gtk_box_pack_end (GTK_BOX (hbox1), confirm_area, FALSE, FALSE, 0);
-       gtk_widget_grab_focus (ok_btn);
-
-       MANAGE_WINDOW_SIGNALS_CONNECT(window);
-       g_signal_connect (G_OBJECT (window), "delete_event",
-                         G_CALLBACK (prefs_keybind_deleted), NULL);
-       g_signal_connect (G_OBJECT (window), "key_press_event",
-                         G_CALLBACK (prefs_keybind_key_pressed), NULL);
-       g_signal_connect (G_OBJECT (ok_btn), "clicked",
-                         G_CALLBACK (prefs_keybind_apply_clicked),
-                         NULL);
-       g_signal_connect (G_OBJECT (cancel_btn), "clicked",
-                         G_CALLBACK (prefs_keybind_cancel),
-                         NULL);
-
-       gtk_widget_show_all(window);
-
-       keybind.window = window;
-       keybind.combo = combo;
-}
-
-static gboolean prefs_keybind_key_pressed(GtkWidget *widget, GdkEventKey *event,
-                                         gpointer data)
-{
-       if (event && event->keyval == GDK_Escape)
-               prefs_keybind_cancel();
-       return FALSE;
-}
-
-static gint prefs_keybind_deleted(GtkWidget *widget, GdkEventAny *event,
-                                 gpointer data)
-{
-       prefs_keybind_cancel();
-       return TRUE;
-}
-
-static void prefs_keybind_cancel(void)
-{
-       gtk_widget_destroy(keybind.window);
-       keybind.window = NULL;
-       keybind.combo = NULL;
-}
-  
-struct KeyBind {
-       const gchar *accel_path;
-       const gchar *accel_key;
-};
-
-static void prefs_keybind_apply(struct KeyBind keybind[], gint num)
-{
-       gint i;
-       guint key;
-       GdkModifierType mods;
-
-       for (i = 0; i < num; i++) {
-               const gchar *accel_key
-                       = keybind[i].accel_key ? keybind[i].accel_key : "";
-               gtk_accelerator_parse(accel_key, &key, &mods);
-               gtk_accel_map_change_entry(keybind[i].accel_path,
-                                          key, mods, TRUE);
-       }
-}
-
-static void prefs_keybind_apply_clicked(GtkWidget *widget)
-{
-       GtkEntry *entry = GTK_ENTRY(GTK_COMBO(keybind.combo)->entry);
-       const gchar *text;
-       struct KeyBind *menurc;
-       gint n_menurc;
-
-       static struct KeyBind default_menurc[] = {
-               {"<Main>/File/Empty all Trash folders",         "<shift>D"},
-               {"<Main>/File/Save as...",                      "<control>S"},
-               {"<Main>/File/Print...",                        "<control>P"},
-               {"<Main>/File/Work offline",                    "<control>W"},
-               {"<Main>/File/Synchronise folders",             "<control><shift>S"},
-               {"<Main>/File/Exit",                            "<control>Q"},
-
-               {"<Main>/Edit/Copy",                            "<control>C"},
-               {"<Main>/Edit/Select all",                      "<control>A"},
-               {"<Main>/Edit/Find in current message...",      "<control>F"},
-               {"<Main>/Edit/Search folder...",                "<shift><control>F"},
-               {"<Main>/Edit/Quick search",                    "slash"},
-
-               {"<Main>/View/Show or hide/Message View",       "V"},
-               {"<Main>/View/Thread view",                     "<control>T"},
-               {"<Main>/View/Go to/Previous message",          "P"},
-               {"<Main>/View/Go to/Next message",              "N"},
-               {"<Main>/View/Go to/Previous unread message",   "<shift>P"},
-               {"<Main>/View/Go to/Next unread message",       "<shift>N"},
-               {"<Main>/View/Go to/Other folder...",           "G"},
-               {"<Main>/View/Open in new window",              "<control><alt>N"},
-               {"<Main>/View/Message source",                  "<control>U"},
-               {"<Main>/View/All headers",                     "<control>H"},
-               {"<Main>/View/Update summary",                  "<control><alt>U"},
-
-               {"<Main>/Message/Receive/Get from current account",
-                                                               "<control>I"},
-               {"<Main>/Message/Receive/Get from all accounts","<shift><control>I"},
-               {"<Main>/Message/Compose an email message",     "<control>M"},
-               {"<Main>/Message/Reply",                        "<control>R"},
-               {"<Main>/Message/Reply to/all",                 "<shift><control>R"},
-               {"<Main>/Message/Reply to/sender",              ""},
-               {"<Main>/Message/Reply to/mailing list",        "<control>L"},
-               {"<Main>/Message/Forward",                      "<control><alt>F"},
-               /* {"<Main>/Message/Forward as attachment",      ""}, */
-               {"<Main>/Message/Move...",                      "<control>O"},
-               {"<Main>/Message/Copy...",                      "<shift><control>O"},
-               {"<Main>/Message/Move to trash",                "<control>D"},
-               {"<Main>/Message/Mark/Mark",                    "<shift>asterisk"},
-               {"<Main>/Message/Mark/Unmark",                  "U"},
-               {"<Main>/Message/Mark/Mark as unread",          "<shift>exclam"},
-               {"<Main>/Message/Mark/Mark as read",            ""},
-
-               {"<Main>/Tools/Address book",                   "<shift><control>A"},
-               {"<Main>/Tools/Execute",                        "X"},
-               {"<Main>/Tools/Log window",                     "<shift><control>L"},
-
-               {"<Compose>/Message/Send",                              "<control>Return"},
-               {"<Compose>/Message/Send later",                        "<shift><control>S"},
-               {"<Compose>/Message/Attach file",                       "<control>M"},
-               {"<Compose>/Message/Insert file",                       "<control>I"},
-               {"<Compose>/Message/Insert signature",                  "<control>G"},
-               {"<Compose>/Message/Save",                              "<control>S"},
-               {"<Compose>/Message/Close",                             "<control>W"},
-               {"<Compose>/Edit/Undo",                                 "<control>Z"},
-               {"<Compose>/Edit/Redo",                                 "<control>Y"},
-               {"<Compose>/Edit/Cut",                                  "<control>X"},
-               {"<Compose>/Edit/Copy",                                 "<control>C"},
-               {"<Compose>/Edit/Paste",                                "<control>V"},
-               {"<Compose>/Edit/Select all",                           "<control>A"},
-               {"<Compose>/Edit/Advanced/Move a character backward",   "<control>B"},
-               {"<Compose>/Edit/Advanced/Move a character forward",    "<control>F"},
-               {"<Compose>/Edit/Advanced/Move a word backward,"        ""},
-               {"<Compose>/Edit/Advanced/Move a word forward",         ""},
-               {"<Compose>/Edit/Advanced/Move to beginning of line",   ""},
-               {"<Compose>/Edit/Advanced/Move to end of line",         "<control>E"},
-               {"<Compose>/Edit/Advanced/Move to previous line",       "<control>P"},
-               {"<Compose>/Edit/Advanced/Move to next line",           "<control>N"},
-               {"<Compose>/Edit/Advanced/Delete a character backward", "<control>H"},
-               {"<Compose>/Edit/Advanced/Delete a character forward",  "<control>D"},
-               {"<Compose>/Edit/Advanced/Delete a word backward",      ""},
-               {"<Compose>/Edit/Advanced/Delete a word forward",       ""},
-               {"<Compose>/Edit/Advanced/Delete line",                 "<control>U"},
-               {"<Compose>/Edit/Advanced/Delete entire line",          ""},
-               {"<Compose>/Edit/Advanced/Delete to end of line",       "<control>K"},
-               {"<Compose>/Edit/Wrap current paragraph",               "<control>L"},
-               {"<Compose>/Edit/Wrap all long lines",                  "<control><alt>L"},
-               {"<Compose>/Edit/Auto wrapping",                        "<shift><control>L"},
-               {"<Compose>/Edit/Edit with external editor",            "<shift><control>X"},
-               {"<Compose>/Tools/Address book",                        "<shift><control>A"},
-       };
-
-       static struct KeyBind mew_wl_menurc[] = {
-               {"<Main>/File/Empty all Trash folders",         "<shift>D"},
-               {"<Main>/File/Save as...",                      "Y"},
-               {"<Main>/File/Print...",                        "<shift>numbersign"},
-               {"<Main>/File/Exit",                            "<shift>Q"},
-
-               {"<Main>/Edit/Copy",                            "<control>C"},
-               {"<Main>/Edit/Select all",                      "<control>A"},
-               {"<Main>/Edit/Find in current message...",      "<control>F"},
-               {"<Main>/Edit/Search folder...",                "<control>S"},
-
-               {"<Main>/View/Show or hide/Message View",       ""},
-               {"<Main>/View/Thread view",                     "<shift>T"},
-               {"<Main>/View/Go to/Previous message",          "P"},
-               {"<Main>/View/Go to/Next message",              "N"},
-               {"<Main>/View/Go to/Previous unread message",   "<shift>P"},
-               {"<Main>/View/Go to/Next unread message",       "<shift>N"},
-               {"<Main>/View/Go to/Other folder...",           "G"},
-               {"<Main>/View/Open in new window",              "<control><alt>N"},
-               {"<Main>/View/Message source",                  "<control>U"},
-               {"<Main>/View/All headers",                     "<shift>H"},
-               {"<Main>/View/Update summary",                  "<shift>S"},
-
-               {"<Main>/Message/Receive/Get from current account",
-                                                               "<control>I"},
-               {"<Main>/Message/Receive/Get from all accounts","<shift><control>I"},
-               {"<Main>/Message/Compose an email message",     "W"},
-               {"<Main>/Message/Reply",                        "<control>R"},
-               {"<Main>/Message/Reply to/all",                 "<shift>A"},
-               {"<Main>/Message/Reply to/sender",              ""},
-               {"<Main>/Message/Reply to/mailing list",        "<control>L"},
-               {"<Main>/Message/Forward",                      "F"},
-               /* {"<Main>/Message/Forward as attachment", "<shift>F"}, */
-               {"<Main>/Message/Move...",                      "O"},
-               {"<Main>/Message/Copy...",                      "<shift>O"},
-               {"<Main>/Message/Delete",                       "D"},
-               {"<Main>/Message/Mark/Mark",                    "<shift>asterisk"},
-               {"<Main>/Message/Mark/Unmark",                  "U"},
-               {"<Main>/Message/Mark/Mark as unread",          "<shift>exclam"},
-               {"<Main>/Message/Mark/Mark as read",            "<shift>R"},
-
-               {"<Main>/Tools/Address book",                   "<shift><control>A"},
-               {"<Main>/Tools/Execute",                        "X"},
-               {"<Main>/Tools/Log window",                     "<shift><control>L"},
-
-               {"<Compose>/Message/Close",                             "<alt>W"},
-               {"<Compose>/Edit/Select all",                           ""},
-               {"<Compose>/Edit/Advanced/Move a word backward,"        "<alt>B"},
-               {"<Compose>/Edit/Advanced/Move a word forward",         "<alt>F"},
-               {"<Compose>/Edit/Advanced/Move to beginning of line",   "<control>A"},
-               {"<Compose>/Edit/Advanced/Delete a word backward",      "<control>W"},
-               {"<Compose>/Edit/Advanced/Delete a word forward",       "<alt>D"},
-       };
-
-       static struct KeyBind mutt_menurc[] = {
-               {"<Main>/File/Empty all Trash folders",         ""},
-               {"<Main>/File/Save as...",                      "S"},
-               {"<Main>/File/Print...",                        "P"},
-               {"<Main>/File/Exit",                            "Q"},
-
-               {"<Main>/Edit/Copy",                            "<control>C"},
-               {"<Main>/Edit/Select all",                      "<control>A"},
-               {"<Main>/Edit/Find in current message...",      "<control>F"},
-               {"<Main>/Edit/Search messages...",              "slash"},
-
-               {"<Main>/View/Show or hide/Message view",       "V"},
-               {"<Main>/View/Thread view",                     "<control>T"},
-               {"<Main>/View/Go to/Previous message",          ""},
-               {"<Main>/View/Go to/Next message",              ""},
-               {"<Main>/View/Go to/Previous unread message",   ""},
-               {"<Main>/View/Go to/Next unread message",       ""},
-               {"<Main>/View/Go to/Other folder...",           "C"},
-               {"<Main>/View/Open in new window",              "<control><alt>N"},
-               {"<Main>/View/Message source",                  "<control>U"},
-               {"<Main>/View/All headers",                     "<control>H"},
-               {"<Main>/View/Update summary",                  "<control><alt>U"},
-
-               {"<Main>/Message/Receive/Get from current account",
-                                                               "<control>I"},
-               {"<Main>/Message/Receive/Get from all accounts","<shift><control>I"},
-               {"<Main>/Message/Compose an email message",             "M"},
-               {"<Main>/Message/Reply",                        "R"},
-               {"<Main>/Message/Reply to/all",                 "G"},
-               {"<Main>/Message/Reply to/sender",              ""},
-               {"<Main>/Message/Reply to/mailing list",        "<control>L"},
-               {"<Main>/Message/Forward",                      "F"},
-               {"<Main>/Message/Forward as attachment",        ""},
-               {"<Main>/Message/Move...",                      "<control>O"},
-               {"<Main>/Message/Copy...",                      "<shift>C"},
-               {"<Main>/Message/Delete",                       "D"},
-               {"<Main>/Message/Mark/Mark",                    "<shift>F"},
-               {"<Main>/Message/Mark/Unmark",                  "U"},
-               {"<Main>/Message/Mark/Mark as unread",          "<shift>N"},
-               {"<Main>/Message/Mark/Mark as read",            ""},
-
-               {"<Main>/Tools/Address book",                   "<shift><control>A"},
-               {"<Main>/Tools/Execute",                        "X"},
-               {"<Main>/Tools/Log window",                     "<shift><control>L"},
-
-               {"<Compose>/Message/Close",                             "<alt>W"},
-               {"<Compose>/Edit/Select all",                           ""},
-               {"<Compose>/Edit/Advanced/Move a word backward",        "<alt>B"},
-               {"<Compose>/Edit/Advanced/Move a word forward",         "<alt>F"},
-               {"<Compose>/Edit/Advanced/Move to beginning of line",   "<control>A"},
-               {"<Compose>/Edit/Advanced/Delete a word backward",      "<control>W"},
-               {"<Compose>/Edit/Advanced/Delete a word forward",       "<alt>D"},
-       };
-
-       static struct KeyBind old_sylpheed_menurc[] = {
-               {"<Main>/File/Empty all Trash folders",         ""},
-               {"<Main>/File/Save as...",                      ""},
-               {"<Main>/File/Print...",                        "<alt>P"},
-               {"<Main>/File/Exit",                            "<alt>Q"},
-
-               {"<Main>/Edit/Copy",                            "<control>C"},
-               {"<Main>/Edit/Select all",                      "<control>A"},
-               {"<Main>/Edit/Find in current message...",      "<control>F"},
-               {"<Main>/Edit/Search folder...",                "<control>S"},
-
-               {"<Main>/View/Show or hide/Message View",       ""},
-               {"<Main>/View/Thread view",                     "<control>T"},
-               {"<Main>/View/Go to/Previous message",          "P"},
-               {"<Main>/View/Go to/Next message",              "N"},
-               {"<Main>/View/Go to/Previous unread message",   "<shift>P"},
-               {"<Main>/View/Go to/Next unread message",       "<shift>N"},
-               {"<Main>/View/Go to/Other folder...",           "<alt>G"},
-               {"<Main>/View/Open in new window",              "<shift><control>N"},
-               {"<Main>/View/Message source",                  "<control>U"},
-               {"<Main>/View/All headers",                     "<control>H"},
-               {"<Main>/View/Update summary",                  "<alt>U"},
-
-               {"<Main>/Message/Receive/Get from current account",
-                                                               "<alt>I"},
-               {"<Main>/Message/Receive/Get from all accounts","<shift><alt>I"},
-               {"<Main>/Message/Compose an email message",     "<alt>N"},
-               {"<Main>/Message/Reply",                        "<alt>R"},
-               {"<Main>/Message/Reply to/all",                 "<shift><alt>R"},
-               {"<Main>/Message/Reply to/sender",              "<control><alt>R"},
-               {"<Main>/Message/Reply to/mailing list",        "<control>L"},
-               {"<Main>/Message/Forward",                       "<shift><alt>F"},
-               /* "(menu-path \"<Main>/Message/Forward as attachment", "<shift><control>F"}, */
-               {"<Main>/Message/Move...",                      "<alt>O"},
-               {"<Main>/Message/Copy...",                      ""},
-               {"<Main>/Message/Delete",                       "<alt>D"},
-               {"<Main>/Message/Mark/Mark",                    "<shift>asterisk"},
-               {"<Main>/Message/Mark/Unmark",                  "U"},
-               {"<Main>/Message/Mark/Mark as unread",          "<shift>exclam"},
-               {"<Main>/Message/Mark/Mark as read",            ""},
-
-               {"<Main>/Tools/Address book",                   "<alt>A"},
-               {"<Main>/Tools/Execute",                        "<alt>X"},
-               {"<Main>/Tools/Log window",                     "<alt>L"},
-
-               {"<Compose>/Message/Close",                             "<alt>W"},
-               {"<Compose>/Edit/Select all",                           ""},
-               {"<Compose>/Edit/Advanced/Move a word backward",        "<alt>B"},
-               {"<Compose>/Edit/Advanced/Move a word forward",         "<alt>F"},
-               {"<Compose>/Edit/Advanced/Move to beginning of line",   "<control>A"},
-               {"<Compose>/Edit/Advanced/Delete a word backward",      "<control>W"},
-               {"<Compose>/Edit/Advanced/Delete a word forward",       "<alt>D"},
-       };
-  
-       text = gtk_entry_get_text(entry);
-  
-       if (!strcmp(text, _("Default"))) {
-               menurc = default_menurc;
-               n_menurc = G_N_ELEMENTS(default_menurc);
-       } else if (!strcmp(text, "Mew / Wanderlust")) {
-               menurc = mew_wl_menurc;
-               n_menurc = G_N_ELEMENTS(mew_wl_menurc);
-       } else if (!strcmp(text, "Mutt")) {
-               menurc = mutt_menurc;
-               n_menurc = G_N_ELEMENTS(mutt_menurc);
-       } else if (!strcmp(text, _("Old Sylpheed"))) {
-               menurc = old_sylpheed_menurc;
-               n_menurc = G_N_ELEMENTS(old_sylpheed_menurc);
-       } else {
-               return;
-       }
-
-       /* prefs_keybind_apply(empty_menurc, G_N_ELEMENTS(empty_menurc)); */
-       prefs_keybind_apply(menurc, n_menurc);
-
-       gtk_widget_destroy(keybind.window);
-       keybind.window = NULL;
-       keybind.combo = NULL;
-}
-
-void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, 
+static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, 
                                  gpointer data)
 {
        SummariesPage *prefs_summaries = (SummariesPage *) _page;
        
-       GtkWidget *vbox1;
-       GtkWidget *chkbtn_transhdr;
-       GtkWidget *chkbtn_folder_unread;
-       GtkWidget *hbox1;
+       GtkWidget *notebook;
+       GtkWidget *hbox0, *hbox1, *hbox2;
+       GtkWidget *vbox1, *vbox2, *vbox3, *vbox4;
+       GtkWidget *frame_new_folders;
+       GtkWidget *optmenu_folder_unread;
        GtkWidget *label_ng_abbrev;
        GtkWidget *spinbtn_ng_abbrev_len;
-       GtkObject *spinbtn_ng_abbrev_len_adj;
-       GtkWidget *vbox2;
-       GtkWidget *chkbtn_useaddrbook;
-       GtkWidget *chkbtn_threadsubj;
-       GtkWidget *vbox3;
+       GtkAdjustment *spinbtn_ng_abbrev_len_adj;
+       GtkWidget *checkbtn_useaddrbook;
+       GtkWidget *checkbtn_show_tooltips;
+       GtkWidget *checkbtn_threadsubj;
        GtkWidget *label_datefmt;
        GtkWidget *button_datefmt;
        GtkWidget *entry_datefmt;
-       GtkTooltips *tip_datefmt;
        GtkWidget *hbox_dispitem;
-       GtkWidget *frame_dispitem;
        GtkWidget *button_dispitem;
-
-       GtkWidget *vbox4;
-       GtkWidget *hbox2;
+       GtkWidget *checkbtn_reopen_last_folder;
        GtkWidget *checkbtn_always_show_msg;
-       GtkWidget *checkbtn_mark_as_read_on_newwin;
+       GtkWidget *checkbtn_show_on_folder_open;
+       GtkWidget *checkbtn_show_on_search_results;
+       GtkWidget *checkbtn_show_on_prevnext;
+       GtkWidget *checkbtn_show_on_deletemove;
+       GtkWidget *checkbtn_show_on_directional;
+       GtkWidget *spinbtn_mark_as_read_delay;
+       GtkAdjustment *spinbtn_mark_as_read_delay_adj;
        GtkWidget *checkbtn_immedexec;
        GtkWidget *checkbtn_ask_mark_all_read;
-       GtkTooltips *immedexec_tooltip;
-       GtkWidget *label;
-       GtkWidget *menu;
-       GtkWidget *menuitem;
-       GtkWidget *button_keybind;
-       GtkWidget *optmenu_select_on_entry;
+       GtkWidget *checkbtn_ask_override_colorlabel;
+       GtkWidget *label, *label_fill;
+       GtkListStore *menu;
+       GtkTreeIter iter;
        GtkWidget *optmenu_nextunreadmsgdialog;
-       GtkWidget *table;
-       GtkWidget *vbox5;
-       GtkTooltips *tooltips;
-
-       tooltips = gtk_tooltips_new();
+       GtkWidget *button_edit_actions;
+       GtkWidget *radio_mark_as_read_on_select;
+       GtkWidget *radio_mark_as_read_on_new_win;
+       GtkWidget *optmenu_sort_key;
+       GtkWidget *optmenu_sort_type;
+       GtkWidget *checkbtn_folder_default_thread;
+       GtkWidget *checkbtn_folder_default_thread_collapsed;
+       GtkWidget *checkbtn_folder_default_hide_read_threads;
+       GtkWidget *checkbtn_folder_default_hide_read_msgs;
+       GtkWidget *checkbtn_folder_default_hide_del_msgs;
+
+       notebook = gtk_notebook_new();
+       gtk_widget_show(notebook);
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
+                                gtk_label_new(_("Folder list")));
+       
+       hbox0 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox0);
+       gtk_box_pack_start(GTK_BOX (vbox1), hbox0, FALSE, FALSE, 0);
 
-       vbox2 = gtk_vbox_new (FALSE, 0);
-       gtk_widget_show (vbox2);
-       gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, TRUE, 0);
+       label = gtk_label_new (_("Display message count next to folder name"));
+       gtk_widget_show (label);
+       gtk_box_pack_start(GTK_BOX(hbox0), label, FALSE, FALSE, 0);
 
-       PACK_CHECK_BUTTON
-               (vbox2, chkbtn_transhdr,
-                _("Translate header names"));
-       gtk_tooltips_set_tip(tooltips, chkbtn_transhdr,
-                            _("The display of standard headers (such as 'From:', 'Subject:') "
-                            "will be translated into your language."), NULL);
+       optmenu_folder_unread = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+                               GTK_COMBO_BOX(optmenu_folder_unread)));
+       gtk_widget_show (optmenu_folder_unread);
+       
+       COMBOBOX_ADD (menu, _("No"), 0);
+       COMBOBOX_ADD (menu, _("Unread messages"), 1);
+       COMBOBOX_ADD (menu, _("Unread and Total messages"), 2);
 
-       PACK_CHECK_BUTTON (vbox2, chkbtn_folder_unread,
-                          _("Display unread number next to folder name"));
+       gtk_box_pack_start(GTK_BOX(hbox0), optmenu_folder_unread, FALSE, FALSE, 0);
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       PACK_CHECK_BUTTON
+               (vbox1, checkbtn_reopen_last_folder,
+                _("Open last opened folder at start-up"));
 
        label_ng_abbrev = gtk_label_new
                (_("Abbreviate newsgroup names longer than"));
        gtk_widget_show (label_ng_abbrev);
        gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
 
-       spinbtn_ng_abbrev_len_adj = gtk_adjustment_new (16, 0, 999, 1, 10, 10);
+       spinbtn_ng_abbrev_len_adj = GTK_ADJUSTMENT(gtk_adjustment_new (16, 0, 999, 1, 10, 0));
        spinbtn_ng_abbrev_len = gtk_spin_button_new
                (GTK_ADJUSTMENT (spinbtn_ng_abbrev_len_adj), 1, 0);
        gtk_widget_show (spinbtn_ng_abbrev_len);
        gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_ng_abbrev_len,
                            FALSE, FALSE, 0);
-       gtk_widget_set_size_request (spinbtn_ng_abbrev_len, 56, -1);
        gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_ng_abbrev_len),
                                     TRUE);
 
@@ -795,245 +420,349 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label_ng_abbrev);
        gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
 
-       /* ---- Summary ---- */
+       hbox_dispitem = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox_dispitem);
+       gtk_box_pack_start(GTK_BOX(vbox1), hbox_dispitem, FALSE, TRUE, 0);
 
-       vbox3 = gtk_vbox_new (FALSE, 0);
-       gtk_widget_show (vbox3);
-       gtk_container_add (GTK_CONTAINER (vbox2), vbox3);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox3), 0);
+       label = gtk_label_new(_("Displayed columns"));
+       gtk_widget_show(label);
+       gtk_box_pack_start(GTK_BOX(hbox_dispitem), label, FALSE, FALSE, 0);
+       button_dispitem = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+       gtk_widget_show (button_dispitem);
+       gtk_box_pack_start (GTK_BOX (hbox_dispitem), button_dispitem, FALSE, FALSE, 0);
+       g_signal_connect (G_OBJECT (button_dispitem), "clicked",
+                         G_CALLBACK (prefs_folder_column_open),
+                         NULL);
+
+       vbox1 = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox1);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
+                                gtk_label_new(_("Message list")));
+
+       /* Next Unread Message Dialog */
+       hbox1 = gtk_hbox_new (FALSE, 10);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);   
+
+       label = gtk_label_new (_("Show \"no unread (or new) message\" dialog"));
+       gtk_widget_show (label);
+       gtk_box_pack_start(GTK_BOX(hbox1), label, FALSE, FALSE, 0);
+       
+       optmenu_nextunreadmsgdialog = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+                               GTK_COMBO_BOX(optmenu_nextunreadmsgdialog)));
+       gtk_widget_show (optmenu_nextunreadmsgdialog);
+
+       COMBOBOX_ADD (menu, _("Always"), NEXTUNREADMSGDIALOG_ALWAYS);
+       COMBOBOX_ADD (menu, _("Assume 'Yes'"), NEXTUNREADMSGDIALOG_ASSUME_YES);
+       COMBOBOX_ADD (menu, _("Assume 'No'"), NEXTUNREADMSGDIALOG_ASSUME_NO);
+
+       gtk_box_pack_start(GTK_BOX(hbox1), optmenu_nextunreadmsgdialog, FALSE, FALSE, 0);
+
+       /* Open message on select policy */
+       vbox4 = gtkut_get_options_frame(vbox1, NULL, _("Open message when selected"));
+
+       PACK_CHECK_BUTTON(vbox4, checkbtn_always_show_msg,
+                       _("Always"));
+       PACK_CHECK_BUTTON(vbox4, checkbtn_show_on_folder_open,
+                       _("When opening a folder"));
+       PACK_CHECK_BUTTON(vbox4, checkbtn_show_on_search_results,
+                       _("When displaying search results"));
+       PACK_CHECK_BUTTON(vbox4, checkbtn_show_on_prevnext,
+                       _("When selecting next or previous message using shortcuts"));
+       PACK_CHECK_BUTTON(vbox4, checkbtn_show_on_deletemove,
+                       _("When deleting or moving messages"));
+       PACK_CHECK_BUTTON(vbox4, checkbtn_show_on_directional,
+                       _("When using directional keys"));
 
        PACK_CHECK_BUTTON
-               (vbox3, chkbtn_useaddrbook,
-                _("Display sender using address book"));
-       PACK_CHECK_BUTTON
-               (vbox3, chkbtn_threadsubj,
+               (vbox1, checkbtn_threadsubj,
                 _("Thread using subject in addition to standard headers"));
 
+       PACK_CHECK_BUTTON
+               (vbox1, checkbtn_immedexec,
+                _("Execute immediately when moving or deleting messages"));
+       CLAWS_SET_TIP(checkbtn_immedexec,
+                            _("Defers moving, copying and deleting of messages"
+                              " until you choose 'Tools/Execute'"));
+
+       vbox3 = gtkut_get_options_frame(vbox1, NULL, _("Mark message as read"));
+
+       radio_mark_as_read_on_select = gtk_radio_button_new_with_label(NULL,
+                       _("when selected, after"));
+
        hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox1), radio_mark_as_read_on_select, FALSE, FALSE, 0);
+
+       spinbtn_mark_as_read_delay_adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 60, 1, 10, 0));
+       spinbtn_mark_as_read_delay = gtk_spin_button_new
+                       (GTK_ADJUSTMENT (spinbtn_mark_as_read_delay_adj), 1, 0);
+       gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_mark_as_read_delay,
+                           FALSE, FALSE, 0);
+       gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_mark_as_read_delay),
+                                    TRUE);
+       gtk_box_pack_start (GTK_BOX (hbox1), gtk_label_new
+                       (_("seconds")), FALSE, FALSE, 0);
+
+       gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
+
+       radio_mark_as_read_on_new_win = gtk_radio_button_new_with_label_from_widget(
+                       GTK_RADIO_BUTTON(radio_mark_as_read_on_select),
+                       _("only when opened in a new window, or replied to"));
+       gtk_box_pack_start (GTK_BOX (vbox3), radio_mark_as_read_on_new_win,
+                       FALSE, FALSE, 0);
+       gtk_widget_show_all(vbox3);
+
+       PACK_CHECK_BUTTON
+               (vbox1, checkbtn_useaddrbook,
+                _("Display sender using address book"));
+                
+       PACK_CHECK_BUTTON
+               (vbox1, checkbtn_show_tooltips,
+                _("Show tooltips"));
+
+       hbox2 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox2);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox2, 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);
+       gtk_box_pack_start (GTK_BOX (hbox2), 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);
+       gtk_box_pack_start (GTK_BOX (hbox2), entry_datefmt, FALSE, FALSE, 0);
 
-       button_datefmt = gtk_button_new_with_label (" ... ");
+       button_datefmt = gtk_button_new_from_stock(GTK_STOCK_INFO);
 
        gtk_widget_show (button_datefmt);
-       gtk_box_pack_start (GTK_BOX (hbox1), button_datefmt, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox2), button_datefmt, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (button_datefmt), "clicked",
                          G_CALLBACK (date_format_create), NULL);
-       tip_datefmt = gtk_tooltips_new();
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(tip_datefmt),
-                            button_datefmt,
-                            _("Date format help"), NULL);
-
-       PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);
-
-       PACK_FRAME(vbox3, frame_dispitem, _("Set displayed columns"));
-
+       
+       label_fill = gtk_label_new(" ");
+       gtk_box_pack_start(GTK_BOX(hbox2), label_fill, TRUE, FALSE, 0);
+       
+       CLAWS_SET_TIP(button_datefmt,
+                            _("Date format help"));
+                            
        hbox_dispitem = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox_dispitem);
-       gtk_container_add (GTK_CONTAINER (frame_dispitem), hbox_dispitem);
-       gtk_container_set_border_width (GTK_CONTAINER (hbox_dispitem), 8);
-
-       button_dispitem = gtk_button_new_with_label
-               (_(" Folder list... "));
-       gtk_widget_show (button_dispitem);
-       gtk_box_pack_start (GTK_BOX (hbox_dispitem), button_dispitem, FALSE, FALSE, 0);
-       g_signal_connect (G_OBJECT (button_dispitem), "clicked",
-                         G_CALLBACK (prefs_folder_column_open),
-                         NULL);
+       gtk_box_pack_start(GTK_BOX(vbox1), hbox_dispitem, FALSE, TRUE, 0);
        
-       button_dispitem = gtk_button_new_with_label
-               (_(" Message list... "));
+       label = gtk_label_new(_("Displayed columns"));
+       gtk_widget_show(label);
+       gtk_box_pack_start(GTK_BOX(hbox_dispitem), label, FALSE, FALSE, 0);
+       button_dispitem = gtk_button_new_from_stock(GTK_STOCK_EDIT);
        gtk_widget_show (button_dispitem);
        gtk_box_pack_start (GTK_BOX (hbox_dispitem), button_dispitem, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (button_dispitem), "clicked",
                          G_CALLBACK (prefs_summary_column_open),
                          NULL);
 
-       vbox4 = gtk_vbox_new (FALSE, 0);
-       gtk_widget_show (vbox4);
-       gtk_box_pack_start (GTK_BOX (vbox1), vbox4, FALSE, FALSE, 0);
-
-       /* PACK_CHECK_BUTTON (vbox2, checkbtn_emacs,
-                          _("Emulate the behavior of mouse operation of\n"
-                            "Emacs-based mailer"));
-       gtk_label_set_justify (GTK_LABEL (GTK_BIN (checkbtn_emacs)->child),
-                              GTK_JUSTIFY_LEFT);   */
-
-       immedexec_tooltip = gtk_tooltips_new();
-
        PACK_CHECK_BUTTON
-               (vbox4, checkbtn_immedexec,
-                _("Execute immediately when moving or deleting messages"));
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(immedexec_tooltip), checkbtn_immedexec,
-                            _("Messages will be marked until execution"
-                              " if this is turned off"),
-                            NULL);
-
+               (vbox1, checkbtn_ask_mark_all_read,
+                _("Confirm when marking all messages as read or unread"));
        PACK_CHECK_BUTTON
-               (vbox4, checkbtn_ask_mark_all_read,
-                _("Confirm before marking all mails in a folder as read"));
+               (vbox1, checkbtn_ask_override_colorlabel,
+                _("Confirm when changing color labels"));
+       
+       hbox2 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox2);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0);
 
-       PACK_CHECK_BUTTON
-               (vbox4, checkbtn_always_show_msg,
-                _("Always open message when selected"));
+       vbox1 = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox1);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
+                                gtk_label_new(_("Defaults")));
 
-       PACK_CHECK_BUTTON
-               (vbox4, checkbtn_mark_as_read_on_newwin,
-                _("Only mark message as read when opened in a new window"));
+       hbox1 = gtk_hbox_new (FALSE, 10);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
+
+       button_edit_actions = gtk_button_new_with_label(_("Set selection when entering a folder"));
+       gtk_widget_show (button_edit_actions);
+       gtk_box_pack_start (GTK_BOX (hbox1), button_edit_actions,
+                         FALSE, TRUE, 0);
+       g_signal_connect (G_OBJECT (button_edit_actions), "clicked",
+                         G_CALLBACK (prefs_summary_open_open),
+                         NULL);
 
+       vbox2 = gtkut_get_options_frame(vbox1, &frame_new_folders, _("New folders"));
 
-       vbox5 = gtk_vbox_new (FALSE, 0);
-       gtk_widget_show (vbox5);
-       gtk_box_pack_start (GTK_BOX (vbox1), vbox5, FALSE, FALSE, 0);
+       hbox1 = gtk_hbox_new(FALSE, 10);
+       gtk_widget_show(hbox1);
+       gtk_box_pack_start(GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
 
-       table = gtk_table_new(1, 1, FALSE);
-       gtk_widget_show(table);
-       gtk_container_add (GTK_CONTAINER (vbox5), table);
-       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
-       gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+       label = gtk_label_new(_("Sort by"));
+       gtk_widget_show(label);
+       gtk_box_pack_start(GTK_BOX(hbox1), label, FALSE, FALSE, 0);
 
-       label = gtk_label_new (_("When entering a folder"));
-       gtk_widget_show (label);
-       gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1,
-                       (GtkAttachOptions) (GTK_FILL),
-                       (GtkAttachOptions) (0), 0, 0);
-       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-       gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-
-       optmenu_select_on_entry = gtk_option_menu_new ();
-       gtk_widget_show (optmenu_select_on_entry);
-
-       gtk_table_attach(GTK_TABLE(table), optmenu_select_on_entry, 1, 2, 0, 1,
-                       (GtkAttachOptions) (GTK_FILL),
-                       (GtkAttachOptions) (0), 0, 0);
-
-       menu = gtk_menu_new ();
-       MENUITEM_ADD (menu, menuitem, _("Do nothing"), SELECTONENTRY_NOTHING);
-       MENUITEM_ADD (menu, menuitem, _("Select first unread (or new or marked) message"),
-                     SELECTONENTRY_UNM);
-       MENUITEM_ADD (menu, menuitem, _("Select first unread (or marked or new) message"),
-                     SELECTONENTRY_UMN);
-       MENUITEM_ADD (menu, menuitem, _("Select first new (or unread or marked) message"),
-                     SELECTONENTRY_NUM);
-       MENUITEM_ADD (menu, menuitem, _("Select first new (or marked or unread) message"),
-                     SELECTONENTRY_NMU);
-       MENUITEM_ADD (menu, menuitem, _("Select first marked (or new or unread) message"),
-                     SELECTONENTRY_MNU);
-       MENUITEM_ADD (menu, menuitem, _("Select first marked (or unread or new) message"),
-                     SELECTONENTRY_MUN);
-
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_select_on_entry), menu);
+       optmenu_sort_key = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu_sort_key)));
+       gtk_widget_show(optmenu_sort_key);
 
-       /* Next Unread Message Dialog */
-       table = gtk_table_new(1, 1, FALSE);
-       gtk_widget_show(table);
-       gtk_container_add (GTK_CONTAINER (vbox5), table);
-       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
-       gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+       COMBOBOX_ADD(menu, _("Number"), SORT_BY_NUMBER);
+       COMBOBOX_ADD(menu, _("Size"), SORT_BY_SIZE);
+       COMBOBOX_ADD(menu, _("Date"), SORT_BY_DATE);
+       COMBOBOX_ADD(menu, _("Thread date"), SORT_BY_THREAD_DATE);
+       COMBOBOX_ADD(menu, _("From"), SORT_BY_FROM);
+       COMBOBOX_ADD(menu, _("To"), SORT_BY_TO);
+       COMBOBOX_ADD(menu, _("Subject"), SORT_BY_SUBJECT);
+       COMBOBOX_ADD(menu, _("Color label"), SORT_BY_LABEL);
+       COMBOBOX_ADD(menu, _("Tag"), SORT_BY_TAGS);
+       COMBOBOX_ADD(menu, _("Mark"), SORT_BY_MARK);
+       COMBOBOX_ADD(menu, _("Status"), SORT_BY_STATUS);
+       COMBOBOX_ADD(menu, _("Attachment"), SORT_BY_MIME);
+       COMBOBOX_ADD(menu, _("Score"), SORT_BY_SCORE);
+       COMBOBOX_ADD(menu, _("Locked"), SORT_BY_LOCKED);
+       COMBOBOX_ADD(menu, _("Don't sort"), SORT_BY_NONE);
 
-       label = gtk_label_new (_("Show \"no unread (or new) message\" dialog"));
-       gtk_widget_show (label);
-       gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,
-                       (GtkAttachOptions) (GTK_FILL),
-                       (GtkAttachOptions) (0), 0, 0);
-       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-       gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+       gtk_box_pack_start(GTK_BOX(hbox1), optmenu_sort_key, FALSE, FALSE, 0);
 
-       optmenu_nextunreadmsgdialog = gtk_option_menu_new ();
-       gtk_widget_show (optmenu_nextunreadmsgdialog);
+       optmenu_sort_type = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu_sort_type)));
+       gtk_widget_show(optmenu_sort_type);
 
-       gtk_table_attach(GTK_TABLE(table), optmenu_nextunreadmsgdialog, 1, 2, 1, 2,
-                       (GtkAttachOptions) (GTK_FILL),
-                       (GtkAttachOptions) (0), 0, 0);
+       COMBOBOX_ADD(menu, _("Ascending"), SORT_ASCENDING);
+       COMBOBOX_ADD(menu, _("Descending"), SORT_DESCENDING);
 
-       menu = gtk_menu_new ();
-       MENUITEM_ADD (menu, menuitem, _("Always"), NEXTUNREADMSGDIALOG_ALWAYS);
-       MENUITEM_ADD (menu, menuitem, _("Assume 'Yes'"), 
-                     NEXTUNREADMSGDIALOG_ASSUME_YES);
-       MENUITEM_ADD (menu, menuitem, _("Assume 'No'"), 
-                     NEXTUNREADMSGDIALOG_ASSUME_NO);
+       gtk_box_pack_start(GTK_BOX(hbox1), optmenu_sort_type, FALSE, FALSE, 0);
 
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog), menu);
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_folder_default_thread,
+                _("Enable threads"));
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_folder_default_thread_collapsed,
+                _("Collapse threads"));
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_folder_default_hide_read_threads,
+                _("Hide read threads"));
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_folder_default_hide_read_msgs,
+                _("Hide read messages"));
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_folder_default_hide_del_msgs,
+                _("Hide deleted messages"));
 
-       hbox2 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox2);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0);
+       prefs_summaries->optmenu_folder_unread = optmenu_folder_unread;
+       prefs_summaries->spinbtn_ng_abbrev_len = spinbtn_ng_abbrev_len;
+       prefs_summaries->checkbtn_useaddrbook = checkbtn_useaddrbook;
+       prefs_summaries->checkbtn_show_tooltips = checkbtn_show_tooltips;
+       prefs_summaries->checkbtn_threadsubj = checkbtn_threadsubj;
+       prefs_summaries->entry_datefmt = entry_datefmt;
+       prefs_summaries->checkbtn_reopen_last_folder = checkbtn_reopen_last_folder;
+
+       prefs_summaries->checkbtn_always_show_msg = checkbtn_always_show_msg;
+       prefs_summaries->checkbtn_show_on_folder_open = checkbtn_show_on_folder_open;
+       prefs_summaries->checkbtn_show_on_search_results = checkbtn_show_on_search_results;
+       prefs_summaries->checkbtn_show_on_prevnext = checkbtn_show_on_prevnext;
+       prefs_summaries->checkbtn_show_on_deletemove = checkbtn_show_on_deletemove;
+       prefs_summaries->checkbtn_show_on_directional = checkbtn_show_on_directional;
+
+       prefs_summaries->checkbtn_mark_as_read_on_newwin = radio_mark_as_read_on_new_win;
+       prefs_summaries->spinbtn_mark_as_read_delay = spinbtn_mark_as_read_delay;
+       prefs_summaries->checkbtn_immedexec = checkbtn_immedexec;
+       prefs_summaries->checkbtn_ask_mark_all_read = checkbtn_ask_mark_all_read;
+       prefs_summaries->checkbtn_ask_override_colorlabel = checkbtn_ask_override_colorlabel;
+       prefs_summaries->optmenu_sort_key = optmenu_sort_key;
+       prefs_summaries->optmenu_sort_type = optmenu_sort_type;
+       prefs_summaries->optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
+
+       prefs_summaries->checkbtn_folder_default_thread = checkbtn_folder_default_thread;
+       prefs_summaries->checkbtn_folder_default_thread_collapsed = checkbtn_folder_default_thread_collapsed;
+       prefs_summaries->checkbtn_folder_default_hide_read_threads = checkbtn_folder_default_hide_read_threads;
+       prefs_summaries->checkbtn_folder_default_hide_read_msgs = checkbtn_folder_default_hide_read_msgs;
+       prefs_summaries->checkbtn_folder_default_hide_del_msgs = checkbtn_folder_default_hide_del_msgs;
 
-       button_keybind = gtk_button_new_with_label (_(" Set key bindings... "));
-       gtk_widget_show (button_keybind);
-       gtk_box_pack_start (GTK_BOX (hbox2), button_keybind, FALSE, FALSE, 0);
-       g_signal_connect (G_OBJECT (button_keybind), "clicked",
-                         G_CALLBACK (prefs_keybind_select), NULL);
+       prefs_summaries->page.widget = vbox1;
+       g_signal_connect(G_OBJECT(checkbtn_always_show_msg), "toggled",
+                       G_CALLBACK(always_show_msg_toggled), prefs_summaries);
 
+       g_signal_connect(G_OBJECT(radio_mark_as_read_on_select), "toggled",
+                        G_CALLBACK(mark_as_read_toggled),
+                        spinbtn_mark_as_read_delay);
 
        prefs_summaries->window                 = GTK_WIDGET(window);
        
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_transhdr),
-                       prefs_common.trans_hdr);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_folder_unread),
+       combobox_select_by_data(GTK_COMBO_BOX(optmenu_folder_unread),
                        prefs_common.display_folder_unread);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_useaddrbook),
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_useaddrbook),
                        prefs_common.use_addr_book);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_threadsubj),
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_show_tooltips),
+                       prefs_common.show_tooltips);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_threadsubj),
                        prefs_common.thread_by_subject);
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_ng_abbrev_len),
                        prefs_common.ng_abbrev_len);
        gtk_entry_set_text(GTK_ENTRY(entry_datefmt), 
                        prefs_common.date_format?prefs_common.date_format:"");  
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_reopen_last_folder),
+                       prefs_common.goto_last_folder_on_startup);
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_always_show_msg),
                        prefs_common.always_show_msg);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_mark_as_read_on_newwin),
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_show_on_folder_open),
+                       prefs_common.open_selected_on_folder_open);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_show_on_search_results),
+                       prefs_common.open_selected_on_search_results);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_show_on_prevnext),
+                       prefs_common.open_selected_on_prevnext);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_show_on_deletemove),
+                       prefs_common.open_selected_on_deletemove);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_show_on_directional),
+                       prefs_common.open_selected_on_directional);
+
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_mark_as_read_on_new_win),
                        prefs_common.mark_as_read_on_new_window);
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_mark_as_read_delay),
+                       prefs_common.mark_as_read_delay);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_immedexec),
                        prefs_common.immediate_exec);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_ask_mark_all_read),
                        prefs_common.ask_mark_all_read);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_ask_override_colorlabel),
+                       prefs_common.ask_override_colorlabel);
 
-       gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_select_on_entry),
-                       prefs_common.select_on_entry);
-       gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_nextunreadmsgdialog),
-                       prefs_common.next_unread_msg_dialog);
-
-       prefs_summaries->chkbtn_transhdr = chkbtn_transhdr;
-       prefs_summaries->chkbtn_folder_unread = chkbtn_folder_unread;
-       prefs_summaries->spinbtn_ng_abbrev_len = spinbtn_ng_abbrev_len;
-       prefs_summaries->chkbtn_useaddrbook = chkbtn_useaddrbook;
-       prefs_summaries->chkbtn_threadsubj = chkbtn_threadsubj;
-       prefs_summaries->entry_datefmt = entry_datefmt;
+       combobox_select_by_data(GTK_COMBO_BOX(optmenu_sort_key),
+                       prefs_common.default_sort_key);
+       combobox_select_by_data(GTK_COMBO_BOX(optmenu_sort_type),
+                       prefs_common.default_sort_type);
 
-       prefs_summaries->checkbtn_always_show_msg = checkbtn_always_show_msg;
-       prefs_summaries->checkbtn_mark_as_read_on_newwin = checkbtn_mark_as_read_on_newwin;
-       prefs_summaries->checkbtn_immedexec = checkbtn_immedexec;
-       prefs_summaries->checkbtn_ask_mark_all_read = checkbtn_ask_mark_all_read;
-       prefs_summaries->optmenu_select_on_entry = optmenu_select_on_entry;
-       prefs_summaries->optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
+       combobox_select_by_data(GTK_COMBO_BOX(optmenu_nextunreadmsgdialog),
+                       prefs_common.next_unread_msg_dialog);
 
-       prefs_summaries->page.widget = vbox1;
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_default_thread),
+                       prefs_common.folder_default_thread);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_default_thread_collapsed),
+                       prefs_common.folder_default_thread_collapsed);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_default_hide_read_threads),
+                       prefs_common.folder_default_hide_read_threads);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_default_hide_read_msgs),
+                       prefs_common.folder_default_hide_read_msgs);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_default_hide_del_msgs),
+                       prefs_common.folder_default_hide_del_msgs);
+
+       gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
+               
+       prefs_summaries->page.widget = notebook;
 }
 
-void prefs_summaries_save(PrefsPage *_page)
+static void prefs_summaries_save(PrefsPage *_page)
 {
        SummariesPage *page = (SummariesPage *) _page;
-       GtkWidget *menu;
-       GtkWidget *menuitem;
 
-       prefs_common.trans_hdr = gtk_toggle_button_get_active(
-                       GTK_TOGGLE_BUTTON(page->chkbtn_transhdr));
-       prefs_common.display_folder_unread = gtk_toggle_button_get_active(
-                       GTK_TOGGLE_BUTTON(page->chkbtn_folder_unread));
+       prefs_common.display_folder_unread = combobox_get_active_data(
+                       GTK_COMBO_BOX(page->optmenu_folder_unread));
+
        prefs_common.use_addr_book = gtk_toggle_button_get_active(
-                       GTK_TOGGLE_BUTTON(page->chkbtn_useaddrbook));
+                       GTK_TOGGLE_BUTTON(page->checkbtn_useaddrbook));
+       prefs_common.show_tooltips = gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_show_tooltips));
        prefs_common.thread_by_subject = gtk_toggle_button_get_active(
-                       GTK_TOGGLE_BUTTON(page->chkbtn_threadsubj));
+                       GTK_TOGGLE_BUTTON(page->checkbtn_threadsubj));
        prefs_common.ng_abbrev_len = gtk_spin_button_get_value_as_int(
                        GTK_SPIN_BUTTON(page->spinbtn_ng_abbrev_len));
        
@@ -1041,24 +770,39 @@ void prefs_summaries_save(PrefsPage *_page)
        prefs_common.date_format = gtk_editable_get_chars(
                        GTK_EDITABLE(page->entry_datefmt), 0, -1);      
 
+       prefs_common.goto_last_folder_on_startup = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_reopen_last_folder));
+
        prefs_common.always_show_msg = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_always_show_msg));
+       prefs_common.open_selected_on_folder_open = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_show_on_folder_open));
+       prefs_common.open_selected_on_search_results = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_show_on_search_results));
+       prefs_common.open_selected_on_prevnext = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_show_on_prevnext));
+       prefs_common.open_selected_on_deletemove = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_show_on_deletemove));
+       prefs_common.open_selected_on_directional = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_show_on_directional));
+
        prefs_common.mark_as_read_on_new_window = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_mark_as_read_on_newwin));
        prefs_common.immediate_exec = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_immedexec));
        prefs_common.ask_mark_all_read = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_ask_mark_all_read));
-
-       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_select_on_entry));
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       prefs_common.select_on_entry = GPOINTER_TO_INT
-               (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-       
-       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_nextunreadmsgdialog));
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       prefs_common.next_unread_msg_dialog = GPOINTER_TO_INT
-               (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+       prefs_common.ask_override_colorlabel = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_ask_override_colorlabel));
+       prefs_common.mark_as_read_delay = gtk_spin_button_get_value_as_int(
+                       GTK_SPIN_BUTTON(page->spinbtn_mark_as_read_delay));
+
+       prefs_common.default_sort_key = combobox_get_active_data(
+                       GTK_COMBO_BOX(page->optmenu_sort_key));
+       prefs_common.default_sort_type = combobox_get_active_data(
+                       GTK_COMBO_BOX(page->optmenu_sort_type));
+       prefs_common.next_unread_msg_dialog = combobox_get_active_data(
+                       GTK_COMBO_BOX(page->optmenu_nextunreadmsgdialog));
        main_window_reflect_prefs_all();
 }
 
@@ -1098,13 +842,13 @@ static void date_format_ok_btn_clicked(GtkButton *button, GtkWidget **widget)
        GtkWidget *datefmt_sample = NULL;
        gchar *text;
 
-       g_return_if_fail(widget != NULL);
-       g_return_if_fail(*widget != NULL);
-       g_return_if_fail(prefs_summaries->entry_datefmt != NULL);
+       cm_return_if_fail(widget != NULL);
+       cm_return_if_fail(*widget != NULL);
+       cm_return_if_fail(prefs_summaries->entry_datefmt != NULL);
 
        datefmt_sample = GTK_WIDGET(g_object_get_data
                                    (G_OBJECT(*widget), "datefmt_sample"));
-       g_return_if_fail(datefmt_sample != NULL);
+       cm_return_if_fail(datefmt_sample != NULL);
 
        text = gtk_editable_get_chars(GTK_EDITABLE(datefmt_sample), 0, -1);
        g_free(prefs_common.date_format);
@@ -1118,8 +862,8 @@ static void date_format_ok_btn_clicked(GtkButton *button, GtkWidget **widget)
 static void date_format_cancel_btn_clicked(GtkButton *button,
                                           GtkWidget **widget)
 {
-       g_return_if_fail(widget != NULL);
-       g_return_if_fail(*widget != NULL);
+       cm_return_if_fail(widget != NULL);
+       cm_return_if_fail(*widget != NULL);
 
        gtk_widget_destroy(*widget);
        *widget = NULL;
@@ -1128,7 +872,7 @@ static void date_format_cancel_btn_clicked(GtkButton *button,
 static gboolean date_format_key_pressed(GtkWidget *keywidget, GdkEventKey *event,
                                        GtkWidget **widget)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                date_format_cancel_btn_clicked(NULL, widget);
        return FALSE;
 }
@@ -1136,8 +880,8 @@ static gboolean date_format_key_pressed(GtkWidget *keywidget, GdkEventKey *event
 static gboolean date_format_on_delete(GtkWidget *dialogwidget,
                                      GdkEventAny *event, GtkWidget **widget)
 {
-       g_return_val_if_fail(widget != NULL, FALSE);
-       g_return_val_if_fail(*widget != NULL, FALSE);
+       cm_return_val_if_fail(widget != NULL, FALSE);
+       cm_return_val_if_fail(*widget != NULL, FALSE);
 
        *widget = NULL;
        return FALSE;
@@ -1150,22 +894,16 @@ static void date_format_entry_on_change(GtkEditable *editable,
        struct tm *cal_time;
        gchar buffer[100];
        gchar *text;
+       struct tm lt;
 
        cur_time = time(NULL);
-       cal_time = localtime(&cur_time);
+       cal_time = localtime_r(&cur_time, &lt);
        buffer[0] = 0;
        text = gtk_editable_get_chars(editable, 0, -1);
        if (text)
                fast_strftime(buffer, sizeof buffer, text, cal_time); 
-       g_free(text);
-
-       text = conv_codeset_strdup(buffer,
-                                  conv_get_locale_charset_str(),
-                                  CS_UTF_8);
-       if (!text)
-               text = g_strdup(buffer);
 
-       gtk_label_set_text(example, text);
+       gtk_label_set_text(example, buffer);
 
        g_free(text);
 }
@@ -1183,13 +921,13 @@ static void date_format_select_row(GtkTreeView *list_view,
        GtkTreeIter iter;
        GtkTreeModel *model;
        
-       g_return_if_fail(date_format != NULL);
+       cm_return_if_fail(date_format != NULL);
 
        /* only on double click */
        datefmt_sample = GTK_WIDGET(g_object_get_data(G_OBJECT(date_format), 
                                                      "datefmt_sample"));
 
-       g_return_if_fail(datefmt_sample != NULL);
+       cm_return_if_fail(datefmt_sample != NULL);
 
        model = gtk_tree_view_get_model(list_view);
 
@@ -1208,6 +946,7 @@ static void date_format_select_row(GtkTreeView *list_view,
        strncpy(new_format, old_format, cur_pos);
        new_format[cur_pos] = '\0';
        strcat(new_format, format);
+       g_free(format);
        strcat(new_format, &old_format[cur_pos]);
 
        gtk_entry_set_text(GTK_ENTRY(datefmt_sample), new_format);
@@ -1215,3 +954,27 @@ static void date_format_select_row(GtkTreeView *list_view,
 
        g_free(new_format);
 }
+
+static void always_show_msg_toggled(GtkToggleButton *button,
+               gpointer user_data)
+{
+       const SummariesPage *prefs_summaries = (SummariesPage *)user_data;
+       gboolean state;
+
+       cm_return_if_fail(prefs_summaries != NULL);
+
+       state = gtk_toggle_button_get_active(button);
+
+       gtk_widget_set_sensitive(prefs_summaries->checkbtn_show_on_folder_open, !state);
+       gtk_widget_set_sensitive(prefs_summaries->checkbtn_show_on_search_results, !state);
+       gtk_widget_set_sensitive(prefs_summaries->checkbtn_show_on_prevnext, !state);
+       gtk_widget_set_sensitive(prefs_summaries->checkbtn_show_on_deletemove, !state);
+       gtk_widget_set_sensitive(prefs_summaries->checkbtn_show_on_directional, !state);
+}
+
+static void mark_as_read_toggled(GtkToggleButton *button, GtkWidget *spinbtn)
+{
+       gtk_widget_set_sensitive(spinbtn,
+               gtk_toggle_button_get_active(button));
+}