2010-03-22 [pawel] 3.7.5cvs36
[claws.git] / src / prefs_common.c
index ae6b0ddff2049de6d08e112f5df9cac0a891b0dd..69ce9752cca0023974101925ff928cc8ebf90f41 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto 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,
@@ -13,8 +13,8 @@
  * 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
@@ -59,6 +59,7 @@
 #include "stock_pixmap.h"
 #include "prefswindow.h"
 #include "colorlabel.h"
+#include "addrcustomattr.h"
 
 enum {
        DATEFMT_FMT,
@@ -95,13 +96,14 @@ static PrefParam param_os_specific[] = {
          &prefs_common.widgetfont,             P_STRING, NULL, NULL, NULL},
        {"message_font_gtk2",   "Monospace 9",
         &prefs_common.textfont,                P_STRING, NULL, NULL, NULL},
-        {"print_font_gtk2",     "Monospace 9"
-         &prefs_common.printfont
+        {"print_font_gtk2",     "Monospace 9",
+         &prefs_common.printfont,              P_STRING, NULL, NULL, NULL},
        {"small_font_gtk2",     "Sans 9",
          &prefs_common.smallfont,              P_STRING, NULL, NULL, NULL},
        {"normal_font_gtk2",    "Sans 9",
          &prefs_common.normalfont,             P_STRING, NULL, NULL, NULL},
-
+       {"bold_font_gtk2",      "Sans 9 Bold",
+         &prefs_common.boldfont,               P_STRING, NULL, NULL, NULL},
        /* Message */
        {"attach_save_directory", NULL,
         &prefs_common.attach_save_dir, P_STRING, NULL, NULL, NULL},
@@ -119,10 +121,6 @@ static PrefParam param_os_specific[] = {
         &prefs_common.pixmap_theme_path, P_STRING, NULL, NULL, NULL},
 
        /* Other */
-       {"uri_open_command", NULL,
-        &prefs_common.uri_cmd, P_STRING, NULL, NULL, NULL},
-       {"print_command", "notepad /p %s",
-        &prefs_common.print_cmd, P_STRING, NULL, NULL, NULL},
        {"ext_editor_command", "notepad %s",
         &prefs_common.ext_editor_cmd, P_STRING, NULL, NULL, NULL},
 
@@ -140,6 +138,10 @@ static PrefParam param_os_specific[] = {
  */
 
 static PrefParam param[] = {
+#ifdef MAEMO
+       {"data_root", "", &prefs_common.data_root, P_STRING,
+        NULL, NULL, NULL},
+#endif
        /* Receive */
        {"use_ext_inc", "FALSE", &prefs_common.use_extinc, P_BOOL,
         NULL, NULL, NULL},
@@ -162,7 +164,19 @@ static PrefParam param[] = {
        P_BOOL, NULL, NULL, NULL},
        {"newmail_notify_cmd", "", &SPECIFIC_PREFS.newmail_notify_cmd, P_STRING,
         NULL, NULL, NULL},
-       {"receive_dialog_mode", "1", &prefs_common.recv_dialog_mode, P_ENUM,
+#ifdef MAEMO
+       {"maemo_show_led", "TRUE", &prefs_common.maemo_show_led, P_BOOL,
+        NULL, NULL, NULL},
+       {"maemo_play_sound", "FALSE", &prefs_common.maemo_play_sound, P_BOOL,
+        NULL, NULL, NULL},
+       {"maemo_show_banner", "FALSE", &prefs_common.maemo_show_banner, P_BOOL,
+        NULL, NULL, NULL},
+#endif
+       {"receive_dialog_mode", "2", &prefs_common.recv_dialog_mode, P_ENUM,
+        NULL, NULL, NULL},
+       {"receivewin_width", "460", &prefs_common.receivewin_width, P_INT,
+        NULL, NULL, NULL},
+       {"receivewin_height", "-1", &prefs_common.receivewin_height, P_INT,
         NULL, NULL, NULL},
        {"no_receive_error_panel", "FALSE", &prefs_common.no_recv_err_panel,
         P_BOOL, NULL, NULL, NULL},
@@ -174,13 +188,24 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"confirm_send_queued_messages", "FALSE", &prefs_common.confirm_send_queued_messages,
         P_BOOL, NULL, NULL, NULL},
-       {"send_dialog_mode", "0", &prefs_common.send_dialog_mode, P_ENUM,
+#ifndef GENERIC_UMPC
+       {"send_dialog_mode", "0", &prefs_common.send_dialog_invisible, P_BOOL,
+        NULL, NULL, NULL},
+#else
+       {"send_dialog_mode", "1", &prefs_common.send_dialog_invisible, P_BOOL,
+        NULL, NULL, NULL},
+#endif
+       {"sendwin_width", "460", &prefs_common.sendwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"sendwin_height", "-1", &prefs_common.sendwin_height, P_INT,
         NULL, NULL, NULL},
 
        {"outgoing_charset", CS_AUTO, &prefs_common.outgoing_charset, P_STRING,
         NULL, NULL, NULL},
        {"encoding_method", "0", &prefs_common.encoding_method, P_ENUM,
         NULL, NULL, NULL},
+       {"outgoing_fallback_to_ascii", "TRUE", &prefs_common.outgoing_fallback_to_ascii, P_BOOL,
+        NULL, NULL, NULL},
 
        {"allow_jisx0201_kana", "FALSE", &prefs_common.allow_jisx0201_kana,
         P_BOOL, NULL, NULL, NULL},
@@ -195,6 +220,12 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"undo_level", "50", &prefs_common.undolevels, P_INT,
         NULL, NULL, NULL},
+       {"compose_with_format", "FALSE", &prefs_common.compose_with_format, P_BOOL,
+        NULL, NULL, NULL},
+       {"compose_subject_format", "",
+        &prefs_common.compose_subject_format, P_STRING, NULL, NULL, NULL},
+       {"compose_body_format", N_("Hello,\\n"),
+        &prefs_common.compose_body_format, P_STRING, NULL, NULL, NULL},
 
        {"linewrap_length", "72", &prefs_common.linewrap_len, P_INT,
         NULL, NULL, NULL},
@@ -202,20 +233,26 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"linewrap_pastes", "TRUE", &prefs_common.linewrap_pastes, P_BOOL,
         NULL, NULL, NULL},
+       {"primary_paste_unselects", "FALSE", &prefs_common.primary_paste_unselects, P_BOOL,
+        NULL, NULL, NULL},
        {"linewrap_auto", "TRUE", &prefs_common.autowrap, P_BOOL,
         NULL, NULL, NULL},
+       {"auto_indent", "TRUE", &prefs_common.auto_indent, P_BOOL,
+        NULL, NULL, NULL},
         {"autosave", "TRUE", &prefs_common.autosave,
         P_BOOL, NULL, NULL, NULL},
         {"autosave_length", "50", &prefs_common.autosave_length, P_INT,
         NULL, NULL, NULL},
-#if USE_ASPELL
+        {"warn_large_insert", "TRUE", &prefs_common.warn_large_insert,
+        P_BOOL, NULL, NULL, NULL},
+        {"warn_large_insert_size", "500", &prefs_common.warn_large_insert_size,
+        P_INT, NULL, NULL, NULL},
+
        {"enable_aspell", "TRUE", &prefs_common.enable_aspell, P_BOOL,
         NULL, NULL, NULL},
-       {"aspell_path", ASPELL_PATH, &prefs_common.aspell_path, P_STRING,
-        NULL, NULL, NULL},
        {"dictionary",  "", &prefs_common.dictionary, P_STRING,
         NULL, NULL, NULL},
-       {"aspell_sugmode", "1", &prefs_common.aspell_sugmode, P_INT,
+       {"alt_dictionary",  "", &prefs_common.alt_dictionary, P_STRING,
         NULL, NULL, NULL},
        {"use_alternate_dict", "FALSE", &prefs_common.use_alternate, P_BOOL,
         NULL, NULL, NULL},
@@ -223,9 +260,11 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"recheck_when_changing_dict", "TRUE", &prefs_common.recheck_when_changing_dict,
         P_BOOL, NULL, NULL, NULL},
-       {"misspelled_color", "16711680", &prefs_common.misspelled_col, P_COLOR,
+       {"misspelled_color", "#ff0000", &prefs_common.misspelled_col, P_COLOR,
         NULL, NULL, NULL},
-#endif
+       {"use_both_dicts", "FALSE", &prefs_common.use_both_dicts, P_BOOL,
+        NULL, NULL, NULL},
+
        {"reply_with_quote", "TRUE", &prefs_common.reply_with_quote, P_BOOL,
         NULL, NULL, NULL},
        {"compose_dnd_insert_or_attach", "0", &prefs_common.compose_dnd_mode, P_ENUM,
@@ -245,22 +284,28 @@ static PrefParam param[] = {
        {"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL,
         NULL, NULL, NULL},
 
+#ifndef GENERIC_UMPC
        {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
         NULL, NULL, NULL},
+#else
+       {"show_ruler", "FALSE", &prefs_common.show_ruler, P_BOOL,
+        NULL, NULL, NULL},
+#endif
 
        /* Quote */
        {"reply_quote_mark", "> ", &prefs_common.quotemark, P_STRING,
         NULL, NULL, NULL},
-       {"reply_quote_format", N_("On %d\\n%f wrote:\\n\\n%q"),
+       {"reply_quote_format", N_("On %d\\n%f wrote:\\n\\n%q\\n%X"),
         &prefs_common.quotefmt, P_STRING, NULL, NULL, NULL},
 
        {"forward_quote_mark", "> ", &prefs_common.fw_quotemark, P_STRING,
         NULL, NULL, NULL},
        {"forward_quote_format",
         N_("\\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, NULL, NULL, NULL},
+        "?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,
+        NULL, NULL, NULL},
        {"quote_chars", ">", &prefs_common.quote_chars, P_STRING,
         NULL, NULL, NULL},
 
@@ -278,6 +323,7 @@ static PrefParam param[] = {
          &prefs_common.normalfont_gtk1,        P_STRING, NULL, NULL, NULL},
 
        /* new fonts */
+#ifndef GENERIC_UMPC
        {"widget_font_gtk2",    NULL,
          &SPECIFIC_PREFS.widgetfont,           P_STRING, NULL, NULL, NULL},
        {"message_font_gtk2",   "Monospace 9",
@@ -288,6 +334,27 @@ static PrefParam param[] = {
          &SPECIFIC_PREFS.smallfont,            P_STRING, NULL, NULL, NULL},
        {"normal_font_gtk2",    "Sans 9",
          &SPECIFIC_PREFS.normalfont,           P_STRING, NULL, NULL, NULL},
+       {"bold_font_gtk2",      "Sans Bold 9",
+         &SPECIFIC_PREFS.boldfont,             P_STRING, NULL, NULL, NULL},
+#else
+       {"widget_font_gtk2",    NULL,
+         &SPECIFIC_PREFS.widgetfont,           P_STRING, NULL, NULL, NULL},
+       {"message_font_gtk2",   "Monospace 8",
+        &SPECIFIC_PREFS.textfont,                      P_STRING, NULL, NULL, NULL},
+        {"print_font_gtk2",     "Monospace 8",
+         &SPECIFIC_PREFS.printfont,             P_STRING, NULL, NULL, NULL},
+       {"small_font_gtk2",     "Sans 8",
+         &SPECIFIC_PREFS.smallfont,            P_STRING, NULL, NULL, NULL},
+       {"normal_font_gtk2",    "Sans 8",
+         &SPECIFIC_PREFS.normalfont,           P_STRING, NULL, NULL, NULL},
+       {"bold_font_gtk2",      "Sans Bold 8",
+         &SPECIFIC_PREFS.boldfont,             P_STRING, NULL, NULL, NULL},
+#endif
+
+       {"use_different_print_font", "FALSE", &prefs_common.use_different_print_font, P_BOOL,
+        NULL, NULL, NULL},
+       {"derive_from_normal_font", "TRUE", &prefs_common.derive_from_normal_font, P_BOOL,
+        NULL, NULL, NULL},
 
        /* custom colors */
        {"custom_color1", "#ff9900", &prefs_common.custom_colorlabel[0].color, P_COLOR,
@@ -314,10 +381,42 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"custom_colorlabel6", N_("Green"), &prefs_common.custom_colorlabel[5].label, P_STRING,
         NULL, NULL, NULL},
-       {"custom_color7", "#663366", &prefs_common.custom_colorlabel[6].color, P_COLOR,
+       {"custom_color7", "#663333", &prefs_common.custom_colorlabel[6].color, P_COLOR,
         NULL, NULL, NULL},
        {"custom_colorlabel7", N_("Brown"), &prefs_common.custom_colorlabel[6].label, P_STRING,
         NULL, NULL, NULL},
+       {"custom_color8", "#aaaaaa", &prefs_common.custom_colorlabel[7].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel8", N_("Grey"), &prefs_common.custom_colorlabel[7].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color9", "#c07254", &prefs_common.custom_colorlabel[8].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel9", N_("Light brown"), &prefs_common.custom_colorlabel[8].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color10", "#c00000", &prefs_common.custom_colorlabel[9].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel10", N_("Dark red"), &prefs_common.custom_colorlabel[9].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color11", "#cc1074", &prefs_common.custom_colorlabel[10].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel11", N_("Dark pink"), &prefs_common.custom_colorlabel[10].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color12", "#5094cd", &prefs_common.custom_colorlabel[11].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel12", N_("Steel blue"), &prefs_common.custom_colorlabel[11].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color13", "#ffd500", &prefs_common.custom_colorlabel[12].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel13", N_("Gold"), &prefs_common.custom_colorlabel[12].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color14", "#00d800", &prefs_common.custom_colorlabel[13].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel14", N_("Bright green"), &prefs_common.custom_colorlabel[13].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color15", "#c060c0", &prefs_common.custom_colorlabel[14].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel15", N_("Magenta"), &prefs_common.custom_colorlabel[14].label, P_STRING,
+        NULL, NULL, NULL},
 
        /* image viewer */
        {"display_image", "TRUE", &prefs_common.display_img, P_BOOL,
@@ -327,8 +426,8 @@ static PrefParam param[] = {
        {"inline_image", "TRUE", &prefs_common.inline_img, P_BOOL,
         NULL, NULL, NULL},
 
-       {"display_folder_unread_num", "FALSE",
-        &prefs_common.display_folder_unread, P_BOOL,
+       {"display_folder_unread_num", "0",
+        &prefs_common.display_folder_unread, P_INT,
         NULL, NULL, NULL},
        {"newsgroup_abbrev_len", "16",
         &prefs_common.ng_abbrev_len, P_INT,
@@ -350,22 +449,33 @@ static PrefParam param[] = {
 
        {"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL,
         NULL, NULL, NULL},
+#ifndef GENERIC_UMPC
        {"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM,
         NULL, NULL, NULL},
+#else
+       {"toolbar_style", "1", &prefs_common.toolbar_style, P_ENUM,
+        NULL, NULL, NULL},
+#endif
        {"toolbar_detachable", "FALSE", &prefs_common.toolbar_detachable, P_BOOL,
         NULL, NULL, NULL},
+       {"show_col_headers", "TRUE", &prefs_common.show_col_headers, P_BOOL,
+        NULL, NULL, NULL},
+#ifndef GENERIC_UMPC
        {"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
         NULL, NULL, NULL},
        {"show_searchbar", "TRUE", &prefs_common.show_searchbar, P_BOOL,
         NULL, NULL, NULL},
-
+#else
+       {"show_statusbar", "FALSE", &prefs_common.show_statusbar, P_BOOL,
+        NULL, NULL, NULL},
+       {"show_searchbar", "FALSE", &prefs_common.show_searchbar, P_BOOL,
+        NULL, NULL, NULL},
+#endif
 
        {"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_STATUS], P_BOOL, NULL, NULL, NULL},
-       {"summary_col_show_mime", "TRUE",
-        &prefs_common.summary_col_visible[S_COL_MIME], P_BOOL, NULL, NULL, NULL},
        {"summary_col_show_subject", "TRUE",
         &prefs_common.summary_col_visible[S_COL_SUBJECT], P_BOOL, NULL, NULL, NULL},
        {"summary_col_show_from", "TRUE",
@@ -374,6 +484,8 @@ static PrefParam param[] = {
         &prefs_common.summary_col_visible[S_COL_TO], 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_mime", "TRUE",
+        &prefs_common.summary_col_visible[S_COL_MIME], 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",
@@ -382,6 +494,8 @@ static PrefParam param[] = {
         &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_show_tags", "FALSE",
+        &prefs_common.summary_col_visible[S_COL_TAGS], P_BOOL, NULL, NULL, NULL},
 
        {"summary_col_pos_mark", "0",
          &prefs_common.summary_col_pos[S_COL_MARK], P_INT, NULL, NULL, NULL},
@@ -405,6 +519,8 @@ static PrefParam param[] = {
         &prefs_common.summary_col_pos[S_COL_LOCKED], P_INT, NULL, NULL, NULL},
        {"summary_col_pos_to", "10",
          &prefs_common.summary_col_pos[S_COL_TO], P_INT, NULL, NULL, NULL},
+       {"summary_col_pos_tags", "11",
+         &prefs_common.summary_col_pos[S_COL_TAGS], P_INT, NULL, NULL, NULL},
 
        {"summary_col_size_mark", "10",
         &prefs_common.summary_col_size[S_COL_MARK], P_INT, NULL, NULL, NULL},
@@ -412,12 +528,22 @@ static PrefParam param[] = {
         &prefs_common.summary_col_size[S_COL_STATUS], P_INT, NULL, NULL, NULL},
        {"summary_col_size_mime", "10",
         &prefs_common.summary_col_size[S_COL_MIME], P_INT, NULL, NULL, NULL},
+#ifndef GENERIC_UMPC
        {"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_to", "120",
         &prefs_common.summary_col_size[S_COL_TO], P_INT, NULL, NULL, NULL},
+#else
+       {"summary_col_size_subject", "300",
+        &prefs_common.summary_col_size[S_COL_SUBJECT], P_INT, NULL, NULL, NULL},
+       {"summary_col_size_from", "150",
+        &prefs_common.summary_col_size[S_COL_FROM], P_INT, NULL, NULL, NULL},
+       {"summary_col_size_to", "150",
+        &prefs_common.summary_col_size[S_COL_TO], P_INT, NULL, NULL, NULL},
+
+#endif
        {"summary_col_size_date", "118",
         &prefs_common.summary_col_size[S_COL_DATE], P_INT, NULL, NULL, NULL},
        {"summary_col_size_size", "45",
@@ -428,6 +554,8 @@ static PrefParam param[] = {
         &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},
+       {"summary_col_size_tags", "150",
+        &prefs_common.summary_col_size[S_COL_TAGS], P_INT, NULL, NULL, NULL},
 
        /* Widget size */
        {"folderwin_x", "16", &prefs_common.folderwin_x, P_INT,
@@ -459,6 +587,7 @@ static PrefParam param[] = {
        {"folder_col_pos_total", "3",
         &prefs_common.folder_col_pos[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
 
+#ifndef GENERIC_UMPC
        {"folder_col_size_folder", "120",
         &prefs_common.folder_col_size[F_COL_FOLDER], P_INT, NULL, NULL, NULL},
        {"folder_col_size_new", "32",
@@ -467,7 +596,16 @@ static PrefParam param[] = {
         &prefs_common.folder_col_size[F_COL_UNREAD], P_INT, NULL, NULL, NULL},
        {"folder_col_size_total", "32",
         &prefs_common.folder_col_size[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
-
+#else
+       {"folder_col_size_folder", "400",
+        &prefs_common.folder_col_size[F_COL_FOLDER], P_INT, NULL, NULL, NULL},
+       {"folder_col_size_new", "32",
+        &prefs_common.folder_col_size[F_COL_NEW], P_INT, NULL, NULL, NULL},
+       {"folder_col_size_unread", "32",
+        &prefs_common.folder_col_size[F_COL_UNREAD], P_INT, NULL, NULL, NULL},
+       {"folder_col_size_total", "32",
+        &prefs_common.folder_col_size[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
+#endif
        {"summaryview_width", "500", &prefs_common.summaryview_width, P_INT,
         NULL, NULL, NULL},
        {"summaryview_height", "244", &prefs_common.summaryview_height, P_INT,
@@ -496,6 +634,11 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"mainwin_y", "64", &prefs_common.mainwin_y, P_INT,
         NULL, NULL, NULL},
+       {"mainwin_maximised", "FALSE", &prefs_common.mainwin_maximised, P_BOOL,
+        NULL, NULL, NULL},
+       {"mainwin_fullscreen", "FALSE", &prefs_common.mainwin_fullscreen, P_BOOL,
+        NULL, NULL, NULL},
+#ifndef GENERIC_UMPC
        {"mainwin_width", "800", &prefs_common.mainwin_width, P_INT,
         NULL, NULL, NULL},
        {"mainwin_height", "600", &prefs_common.mainwin_height, P_INT,
@@ -512,6 +655,24 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"compose_height", "560", &prefs_common.compose_height, P_INT,
         NULL, NULL, NULL},
+#else
+       {"mainwin_width", "700", &prefs_common.mainwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"mainwin_height", "470", &prefs_common.mainwin_height, P_INT,
+        NULL, NULL, NULL},
+       {"messagewin_width", "700", &prefs_common.msgwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"messagewin_height", "470", &prefs_common.msgwin_height, P_INT,
+        NULL, NULL, NULL},
+       {"sourcewin_width", "700", &prefs_common.sourcewin_width, P_INT,
+        NULL, NULL, NULL},
+       {"sourcewin_height", "470", &prefs_common.sourcewin_height, P_INT,
+        NULL, NULL, NULL},
+       {"compose_width", "700", &prefs_common.compose_width, P_INT,
+        NULL, NULL, NULL},
+       {"compose_height", "470", &prefs_common.compose_height, P_INT,
+        NULL, NULL, NULL},
+#endif
        {"compose_x", "0", &prefs_common.compose_x, P_INT,
         NULL, NULL, NULL},
        {"compose_y", "0", &prefs_common.compose_y, P_INT,
@@ -520,25 +681,27 @@ static PrefParam param[] = {
        {"enable_color", "TRUE", &prefs_common.enable_color, P_BOOL,
         NULL, NULL, NULL},
 
-       {"quote_level1_color", "179", &prefs_common.quote_level1_col, P_COLOR,
+       {"quote_level1_color", "#0000b3", &prefs_common.quote_level1_col, P_COLOR,
         NULL, NULL, NULL},
-       {"quote_level2_color", "179", &prefs_common.quote_level2_col, P_COLOR,
+       {"quote_level2_color", "#0000b3", &prefs_common.quote_level2_col, P_COLOR,
         NULL, NULL, NULL},
-       {"quote_level3_color", "179", &prefs_common.quote_level3_col, P_COLOR,
+       {"quote_level3_color", "#0000b3", &prefs_common.quote_level3_col, P_COLOR,
         NULL, NULL, NULL},
        {"enable_bgcolor", "FALSE", &prefs_common.enable_bgcolor, P_BOOL,
         NULL, NULL, NULL},
-       {"quote_level1_bgcolor", "13421772", &prefs_common.quote_level1_bgcol, P_COLOR,
+       {"quote_level1_bgcolor", "#cccccc", &prefs_common.quote_level1_bgcol, P_COLOR,
+        NULL, NULL, NULL},
+       {"quote_level2_bgcolor", "#d4d4d4", &prefs_common.quote_level2_bgcol, P_COLOR,
         NULL, NULL, NULL},
-       {"quote_level2_bgcolor", "13948116", &prefs_common.quote_level2_bgcol, P_COLOR,
+       {"quote_level3_bgcolor", "#dddddd", &prefs_common.quote_level3_bgcol, P_COLOR,
         NULL, NULL, NULL},
-       {"quote_level3_bgcolor", "14540253", &prefs_common.quote_level3_bgcol, P_COLOR,
+       {"uri_color", "#007f00", &prefs_common.uri_col, P_COLOR,
         NULL, NULL, NULL},
-       {"uri_color", "32512", &prefs_common.uri_col, P_COLOR,
+       {"emphasis_color", "#0000cf", &prefs_common.emphasis_col, P_COLOR,
         NULL, NULL, NULL},
-       {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_COLOR,
+       {"target_folder_color", "#da1cca", &prefs_common.tgt_folder_col, P_COLOR,
         NULL, NULL, NULL},
-       {"signature_color", "7960953", &prefs_common.signature_col, P_COLOR,
+       {"signature_color", "#797979", &prefs_common.signature_col, P_COLOR,
         NULL, NULL, NULL},
        {"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors,
         P_BOOL, NULL, NULL, NULL},
@@ -553,6 +716,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"invoke_plugin_on_html", "FALSE", &prefs_common.invoke_plugin_on_html, P_BOOL,
         NULL, NULL, NULL},
+       {"promote_html_part", "FALSE", &prefs_common.promote_html_part, P_BOOL,
+        NULL, NULL, NULL},
        {"line_space", "2", &prefs_common.line_space, P_INT,
         NULL, NULL, NULL},
        {"never_send_retrcpt", "FALSE", &prefs_common.never_send_retrcpt, P_BOOL,
@@ -565,11 +730,10 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"scroll_half_page", "FALSE", &prefs_common.scroll_halfpage, P_BOOL,
         NULL, NULL, NULL},
-
-       {"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL,
+       {"respect_flowed_format", "FALSE", &prefs_common.respect_flowed_format, P_BOOL,
         NULL, NULL, NULL},
 
-       {"use_different_print_font", "FALSE", &prefs_common.use_different_print_font, P_BOOL,
+       {"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL,
         NULL, NULL, NULL},
 
        {"attach_desc", "TRUE", &prefs_common.attach_desc, P_BOOL,
@@ -586,18 +750,39 @@ static PrefParam param[] = {
         &SPECIFIC_PREFS.mime_open_cmd,     P_STRING, NULL, NULL, NULL},
 
        /* Interface */
-       {"separate_folder", "FALSE", &prefs_common.sep_folder, P_BOOL,
+#ifndef GENERIC_UMPC
+       {"layout_mode", "0", &prefs_common.layout_mode, P_INT,
         NULL, NULL, NULL},
-       {"separate_message", "FALSE", &prefs_common.sep_msg, P_BOOL,
+#else
+       {"layout_mode", "5", &prefs_common.layout_mode, P_INT,
         NULL, NULL, NULL},
-
+#endif
        /* {"emulate_emacs", "FALSE", &prefs_common.emulate_emacs, P_BOOL,
         NULL, NULL, NULL}, */
-       {"always_show_message_when_selected", "FALSE",
+       {"always_show_message_when_selected", "0",
         &prefs_common.always_show_msg,
-        P_BOOL, NULL, NULL, NULL},
-       {"select_on_entry", "2", &prefs_common.select_on_entry,
         P_ENUM, NULL, NULL, NULL},
+       {"select_on_entry", "3", &prefs_common.select_on_entry,
+        P_ENUM, NULL, NULL, NULL},
+       {"show_tooltips", "TRUE", &prefs_common.show_tooltips,
+        P_BOOL, NULL, NULL, NULL},
+
+       /* do it SUMMARY_OPEN_ACTIONS-1 times */
+       {"summary_select_prio1", "0", &prefs_common.summary_select_prio[0], P_ENUM,
+        NULL, NULL, NULL},
+       {"summary_select_prio2", "0", &prefs_common.summary_select_prio[1], P_ENUM,
+        NULL, NULL, NULL},
+       {"summary_select_prio3", "0", &prefs_common.summary_select_prio[2], P_ENUM,
+        NULL, NULL, NULL},
+       {"summary_select_prio4", "0", &prefs_common.summary_select_prio[3], P_ENUM,
+        NULL, NULL, NULL},
+       {"summary_select_prio5", "0", &prefs_common.summary_select_prio[4], P_ENUM,
+        NULL, NULL, NULL},
+       {"summary_select_prio6", "0", &prefs_common.summary_select_prio[5], P_ENUM,
+        NULL, NULL, NULL},
+       {"summary_select_prio7", "0", &prefs_common.summary_select_prio[6], P_ENUM,
+        NULL, NULL, NULL},
+
        {"mark_as_read_on_new_window", "FALSE",
         &prefs_common.mark_as_read_on_new_window,
         P_BOOL, NULL, NULL, NULL},
@@ -621,16 +806,27 @@ static PrefParam param[] = {
        {"apply_per_account_filtering_rules", "0", &prefs_common.apply_per_account_filtering_rules, P_ENUM,
         NULL, NULL, NULL},
 
+       /* Addressbook */
+       {"addressbook_use_editaddress_dialog", "TRUE", &prefs_common.addressbook_use_editaddress_dialog,
+        P_BOOL, NULL, NULL, NULL},
+       {"addressbook_hpaned_pos", "-1", &prefs_common.addressbook_hpaned_pos,
+        P_INT, NULL, NULL, NULL},
+       {"addressbook_vpaned_pos", "-1", &prefs_common.addressbook_vpaned_pos,
+        P_INT, NULL, NULL, NULL},
+
        /* Other */
+#ifndef G_OS_WIN32
        {"uri_open_command", DEFAULT_BROWSER_CMD,
         &SPECIFIC_PREFS.uri_cmd, P_STRING, NULL, NULL, NULL},
-       {"print_command", "lpr %s",
-        &SPECIFIC_PREFS.print_cmd, P_STRING, NULL, NULL, NULL},
+#endif
        {"ext_editor_command", DEFAULT_EDITOR_CMD,
         &SPECIFIC_PREFS.ext_editor_cmd, P_STRING, NULL, NULL, NULL},
-
+       {"cmds_use_system_default", "TRUE",
+        &prefs_common.cmds_use_system_default, P_BOOL, NULL, NULL, NULL},
        {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
         P_BOOL, NULL, NULL, NULL},
+       {"session_passwords", "FALSE", &prefs_common.session_passwords,
+        P_BOOL, NULL, NULL, NULL},
        {"confirm_on_exit", "FALSE", &prefs_common.confirm_on_exit, P_BOOL,
         NULL, NULL, NULL},
        {"clean_trash_on_exit", "FALSE", &prefs_common.clean_on_exit, P_BOOL,
@@ -643,19 +839,49 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"summary_quicksearch_type", "0", &prefs_common.summary_quicksearch_type, P_INT,
         NULL, NULL, NULL},
+#ifndef GENERIC_UMPC
        {"summary_quicksearch_recurse", "1", &prefs_common.summary_quicksearch_recurse, P_INT,
         NULL, NULL, NULL},
+#else
+       {"summary_quicksearch_recurse", "0", &prefs_common.summary_quicksearch_recurse, P_INT,
+        NULL, NULL, NULL},
+#endif
 
+#if defined(__OpenBSD__)
+       {"io_timeout_secs", "80", &prefs_common.io_timeout_secs,
+        P_INT, NULL, NULL, NULL},
+#else
        {"io_timeout_secs", "60", &prefs_common.io_timeout_secs,
         P_INT, NULL, NULL, NULL},
+#endif
        {"hide_score", "-9999", &prefs_common.kill_score, P_INT,
         NULL, NULL, NULL},
        {"important_score", "1", &prefs_common.important_score, P_INT,
         NULL, NULL, NULL},
-        {"clip_log", "TRUE", &prefs_common.cliplog, P_BOOL,
+
+       {"clip_log", "TRUE", &prefs_common.cliplog, P_BOOL,
         NULL, NULL, NULL},
        {"log_length", "500", &prefs_common.loglength, P_INT,
         NULL, NULL, NULL},
+#ifndef GENERIC_UMPC
+       {"enable_log_standard", "TRUE", &prefs_common.enable_log_standard, P_BOOL,
+        NULL, NULL, NULL},
+       {"enable_log_warning", "TRUE", &prefs_common.enable_log_warning, P_BOOL,
+        NULL, NULL, NULL},
+       {"enable_log_error", "TRUE", &prefs_common.enable_log_error, P_BOOL,
+        NULL, NULL, NULL},
+       {"enable_log_status", "TRUE", &prefs_common.enable_log_status, P_BOOL,
+        NULL, NULL, NULL},
+#else
+       {"enable_log_standard", "FALSE", &prefs_common.enable_log_standard, P_BOOL,
+        NULL, NULL, NULL},
+       {"enable_log_warning", "FALSE", &prefs_common.enable_log_warning, P_BOOL,
+        NULL, NULL, NULL},
+       {"enable_log_error", "FALSE", &prefs_common.enable_log_error, P_BOOL,
+        NULL, NULL, NULL},
+       {"enable_log_status", "FALSE", &prefs_common.enable_log_status, P_BOOL,
+        NULL, NULL, NULL},
+#endif
        {"log_msg_color", "#00af00", &prefs_common.log_msg_color, P_COLOR,
         NULL, NULL, NULL},
        {"log_warn_color", "#af0000", &prefs_common.log_warn_color, P_COLOR,
@@ -666,8 +892,36 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"log_out_color", "#0000ef", &prefs_common.log_out_color, P_COLOR,
         NULL, NULL, NULL},
+       {"log_status_ok_color", "#00af00", &prefs_common.log_status_ok_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"log_status_nok_color", "#0000af", &prefs_common.log_status_nok_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"log_status_skip_color", "#aa00aa", &prefs_common.log_status_skip_color, P_COLOR,
+        NULL, NULL, NULL},
 
-       {"color_new", "179", &prefs_common.color_new, P_COLOR,
+    {"enable_filtering_debug", "FALSE", &prefs_common.enable_filtering_debug, P_BOOL,
+        NULL, NULL, NULL},
+    {"filtering_debug_level", "1", &prefs_common.filtering_debug_level, P_INT,
+        NULL, NULL, NULL},
+    {"enable_filtering_debug_inc", "TRUE", &prefs_common.enable_filtering_debug_inc, P_BOOL,
+        NULL, NULL, NULL},
+    {"enable_filtering_debug_manual", "TRUE", &prefs_common.enable_filtering_debug_manual, P_BOOL,
+        NULL, NULL, NULL},
+    {"enable_filtering_debug_folder_proc", "FALSE", &prefs_common.enable_filtering_debug_folder_proc, P_BOOL,
+        NULL, NULL, NULL},
+    {"enable_filtering_debug_pre_proc", "FALSE", &prefs_common.enable_filtering_debug_pre_proc, P_BOOL,
+        NULL, NULL, NULL},
+    {"enable_filtering_debug_post_proc", "FALSE", &prefs_common.enable_filtering_debug_post_proc, P_BOOL,
+        NULL, NULL, NULL},
+    {"filtering_debug_clip_log", "TRUE", &prefs_common.filtering_debug_cliplog, P_BOOL,
+        NULL, NULL, NULL},
+       {"filtering_debug_log_length", "500", &prefs_common.filtering_debug_loglength, P_INT,
+        NULL, NULL, NULL},
+
+       {"gtk_can_change_accels", "TRUE", &prefs_common.gtk_can_change_accels, P_BOOL,
+        NULL, NULL, NULL},
+
+       {"color_new", "#0000b3", &prefs_common.color_new, P_COLOR,
         NULL, NULL, NULL},
 
        /* Some windows' sizes */
@@ -686,7 +940,7 @@ static PrefParam param[] = {
        {"matcherwin_height", "-1", &prefs_common.matcherwin_height, P_INT,
         NULL, NULL, NULL},
 
-       {"templateswin_width", "440", &prefs_common.templateswin_width, P_INT,
+       {"templateswin_width", "480", &prefs_common.templateswin_width, P_INT,
         NULL, NULL, NULL},
        {"templateswin_height", "-1", &prefs_common.templateswin_height, P_INT,
         NULL, NULL, NULL},
@@ -696,6 +950,11 @@ static PrefParam param[] = {
        {"actionswin_height", "-1", &prefs_common.actionswin_height, P_INT,
         NULL, NULL, NULL},
 
+       {"tagswin_width", "486", &prefs_common.tagswin_width, P_INT,
+        NULL, NULL, NULL},
+       {"tagswin_height", "-1", &prefs_common.tagswin_height, P_INT,
+        NULL, NULL, NULL},
+
        {"addressbookwin_width", "520", &prefs_common.addressbookwin_width, P_INT,
         NULL, NULL, NULL},
        {"addressbookwin_height", "-1", &prefs_common.addressbookwin_height, P_INT,
@@ -703,10 +962,15 @@ static PrefParam param[] = {
 
        {"addressbookeditpersonwin_width", "640", &prefs_common.addressbookeditpersonwin_width, P_INT,
         NULL, NULL, NULL},
-       {"addressbookeditpersonwin_height", "-1", &prefs_common.addressbookeditpersonwin_height, P_INT,
+       {"addressbookeditpersonwin_height", "320", &prefs_common.addressbookeditpersonwin_height, P_INT,
         NULL, NULL, NULL},
 
-       {"pluginswin_width", "480", &prefs_common.pluginswin_width, P_INT,
+       {"addressbookeditgroupwin_width", "580", &prefs_common.addressbookeditgroupwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"addressbookeditgroupwin_height", "340", &prefs_common.addressbookeditgroupwin_height, P_INT,
+        NULL, NULL, NULL},
+
+       {"pluginswin_width", "-1", &prefs_common.pluginswin_width, P_INT,
         NULL, NULL, NULL},
        {"pluginswin_height", "-1", &prefs_common.pluginswin_height, P_INT,
         NULL, NULL, NULL},
@@ -721,6 +985,9 @@ static PrefParam param[] = {
        {"folderitemwin_height", "-1", &prefs_common.folderitemwin_height, P_INT,
         NULL, NULL, NULL},
 
+       {"zero_replacement_char", "0", &prefs_common.zero_replacement, P_STRING,
+        NULL, NULL, NULL},
+
        {"editaccountwin_width", "500", &prefs_common.editaccountwin_width, P_INT,
         NULL, NULL, NULL},
        {"editaccountwin_height", "-1", &prefs_common.editaccountwin_height, P_INT,
@@ -736,6 +1003,11 @@ static PrefParam param[] = {
        {"logwin_height", "-1", &prefs_common.logwin_height, P_INT,
         NULL, NULL, NULL},
 
+       {"filtering_debugwin_width", "600", &prefs_common.filtering_debugwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"filtering_debugwin_height", "-1", &prefs_common.filtering_debugwin_height, P_INT,
+        NULL, NULL, NULL},
+
        {"folderselwin_width", "300", &prefs_common.folderselwin_width, P_INT,
         NULL, NULL, NULL},
        {"folderselwin_height", "-1", &prefs_common.folderselwin_height, P_INT,
@@ -751,6 +1023,21 @@ static PrefParam param[] = {
        {"addressbook_folderselwin_height", "-1", &prefs_common.addressbook_folderselwin_height, P_INT,
         NULL, NULL, NULL},
 
+       {"aboutwin_width", "450", &prefs_common.aboutwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"aboutwin_height", "500", &prefs_common.aboutwin_height, P_INT,
+        NULL, NULL, NULL},
+
+       {"addrgather_width", "450", &prefs_common.addrgather_width, P_INT,
+        NULL, NULL, NULL},
+       {"addrgather_height", "-1", &prefs_common.addrgather_height, P_INT,
+        NULL, NULL, NULL},
+
+       {"news_subscribe_width", "450", &prefs_common.news_subscribe_width, P_INT,
+        NULL, NULL, NULL},
+       {"news_subscribe_height", "400", &prefs_common.news_subscribe_height, P_INT,
+        NULL, NULL, NULL},
+
        /* Hidden */
        {"warn_dnd", "1", &prefs_common.warn_dnd, P_INT,
         NULL, NULL, NULL},
@@ -759,7 +1046,13 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"enable_swap_from", "FALSE", &prefs_common.swap_from, P_BOOL,
         NULL, NULL, NULL},
-       {"enable_rules_hint", "TRUE", &prefs_common.enable_rules_hint, P_BOOL,
+       {"use_stripes_everywhere", "TRUE", &prefs_common.use_stripes_everywhere, P_BOOL,
+        NULL, NULL, NULL},
+       {"use_stripes_in_summaries", "TRUE", &prefs_common.use_stripes_in_summaries, P_BOOL,
+        NULL, NULL, NULL},
+       {"stripes_color_offset", "4000", &prefs_common.stripes_color_offset, P_INT,
+        NULL, NULL, NULL},
+       {"enable_dotted_lines", "FALSE", &prefs_common.enable_dotted_lines, P_BOOL,
         NULL, NULL, NULL},
        {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
         NULL, NULL, NULL},
@@ -771,14 +1064,29 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"hover_timeout", "500", &prefs_common.hover_timeout, P_INT,
         NULL, NULL, NULL},
+#ifndef GENERIC_UMPC
        {"cache_max_mem_usage", "4096", &prefs_common.cache_max_mem_usage, P_INT,
         NULL, NULL, NULL},
        {"cache_min_keep_time", "15", &prefs_common.cache_min_keep_time, P_INT,
         NULL, NULL, NULL},
+#else
+       {"cache_max_mem_usage", "4096", &prefs_common.cache_max_mem_usage, P_INT,
+        NULL, NULL, NULL},
+       {"cache_min_keep_time", "0", &prefs_common.cache_min_keep_time, P_INT,
+        NULL, NULL, NULL},
+#endif
        {"thread_by_subject_max_age", "10", &prefs_common.thread_by_subject_max_age,
        P_INT, NULL, NULL, NULL },
+       {"last_opened_folder", "", &prefs_common.last_opened_folder,
+       P_STRING, NULL, NULL, NULL },
+       {"goto_last_folder_on_startup", "FALSE", &prefs_common.goto_last_folder_on_startup,
+       P_BOOL, NULL, NULL, NULL },
        {"summary_quicksearch_sticky", "1", &prefs_common.summary_quicksearch_sticky, P_INT,
         NULL, NULL, NULL},
+       {"summary_quicksearch_dynamic", "0", &prefs_common.summary_quicksearch_dynamic, P_INT,
+        NULL, NULL, NULL},
+       {"summary_quicksearch_autorun", "0", &prefs_common.summary_quicksearch_autorun, P_INT,
+        NULL, NULL, NULL},
        {"statusbar_update_step", "10", &prefs_common.statusbar_update_step, P_INT,
         NULL, NULL, NULL},
        {"compose_no_markup", "FALSE", &prefs_common.compose_no_markup, P_BOOL,
@@ -787,33 +1095,88 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"live_dangerously", "FALSE", &prefs_common.live_dangerously, P_BOOL,
         NULL, NULL, NULL},
+       {"save_parts_readwrite", "FALSE", &prefs_common.save_parts_readwrite, P_BOOL,
+        NULL, NULL, NULL},
        {"hide_quotes", "0", &prefs_common.hide_quotes, P_INT,
         NULL, NULL, NULL},
+       {"unsafe_ssl_certs", "FALSE", &prefs_common.unsafe_ssl_certs, P_BOOL,
+        NULL, NULL, NULL},
+#ifndef GENERIC_UMPC
+       {"real_time_sync", "FALSE", &prefs_common.real_time_sync, P_BOOL,
+        NULL, NULL, NULL},
+#else
+       {"real_time_sync", "TRUE", &prefs_common.real_time_sync, P_BOOL,
+        NULL, NULL, NULL},
+#endif
+
+       {"print_paper_type", NULL, &prefs_common.print_paper_type, P_STRING,
+        NULL, NULL, NULL},
+       {"print_paper_orientation", "0", &prefs_common.print_paper_orientation, P_INT,
+        NULL, NULL, NULL},
+       {"print_margin_top", "-1", &prefs_common.print_margin_top, P_INT,
+        NULL, NULL, NULL},
+       {"print_margin_bottom", "-1", &prefs_common.print_margin_bottom, P_INT,
+        NULL, NULL, NULL},
+       {"print_margin_left", "-1", &prefs_common.print_margin_left, P_INT,
+        NULL, NULL, NULL},
+       {"print_margin_right", "-1", &prefs_common.print_margin_right, P_INT,
+        NULL, NULL, NULL},
+       {"print_use_color", "0", &prefs_common.print_use_color, P_INT,
+        NULL, NULL, NULL},
+       {"print_use_collate", "0", &prefs_common.print_use_collate, P_INT,
+        NULL, NULL, NULL},
+       {"print_use_reverse", "0", &prefs_common.print_use_reverse, P_INT,
+        NULL, NULL, NULL},
+       {"print_use_duplex", "0", &prefs_common.print_use_duplex, P_INT,
+        NULL, NULL, NULL},
+       {"print_imgs", "1", &prefs_common.print_imgs, P_INT,
+        NULL, NULL, NULL},
+       {"print_previewwin_width", "600", &prefs_common.print_previewwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"print_previewwin_height", "-1", &prefs_common.print_previewwin_height, P_INT,
+        NULL, NULL, NULL},
+       {"use_networkmanager", "TRUE", &prefs_common.use_networkmanager, P_BOOL,
+        NULL, NULL, NULL},
+       {"use_shred", "FALSE", &prefs_common.use_shred, P_BOOL,
+        NULL, NULL, NULL},
+
+       {"two_line_vertical", "TRUE", &prefs_common.two_line_vert,
+       P_BOOL, NULL, NULL, NULL },
+
+       {"inherit_folder_properties", "FALSE", &prefs_common.inherit_folder_props, P_BOOL,
+        NULL, NULL, NULL},
+
+       {"flush_metadata", "TRUE", &prefs_common.flush_metadata, P_BOOL,
+        NULL, NULL, NULL},
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
-PrefsCommon *prefs_common_get(void)
-{
-       return &prefs_common;
-}
-
 /*
- * Read history list from the specified history file
+ * Read history list from the specified history file in the specified directory (subdir of rc_dir)
+ * Fallback to default_list if history file is not found
  */
-GList *prefs_common_read_history(const gchar *history) 
+GList *prefs_common_read_history_from_dir_with_defaults(const gchar *dirname, const gchar *history,
+                                                                                                                         GList *default_list)
 {
        FILE *fp;
        gchar *path;
        gchar buf[PREFSBUFSIZE];
        GList *tmp = NULL;
 
+       if (dirname) {
+               path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, dirname,
+                                  G_DIR_SEPARATOR_S, history,
+                                  NULL);
+       } else {
        path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, history,
                           NULL);
+       }
        if ((fp = g_fopen(path, "rb")) == NULL) {
                if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
                g_free(path);
-               return NULL;
+               /* returns default list if set, otherwise NULL */
+               return default_list;
        }
        g_free(path);
        while (fgets(buf, sizeof(buf), fp) != NULL) {
@@ -828,6 +1191,22 @@ GList *prefs_common_read_history(const gchar *history)
        return tmp;
 }
 
+/*
+ * Read history list from the specified history file in the specified directory (subdir of rc_dir)
+ */
+static GList *prefs_common_read_history_from_dir(const gchar *dirname, const gchar *history) 
+{
+       return prefs_common_read_history_from_dir_with_defaults(dirname, history, NULL);
+}
+
+/*
+ * Read history list from the specified history file
+ */
+static GList *prefs_common_read_history(const gchar *history) 
+{
+       return prefs_common_read_history_from_dir(NULL, history);
+}
+
 void prefs_common_read_config(void)
 {
        gchar *rcpath;
@@ -841,14 +1220,6 @@ void prefs_common_read_config(void)
 
        g_free(rcpath);
 
-       tmp = g_strdup(gettext(prefs_common.quotefmt));
-       g_free(prefs_common.quotefmt);
-       prefs_common.quotefmt = tmp;
-
-       tmp = g_strdup(gettext(prefs_common.fw_quotefmt));
-       g_free(prefs_common.fw_quotefmt);
-       prefs_common.fw_quotefmt = tmp;
-       
        tmp = g_strdup(gettext(prefs_common.date_format));
        g_free(prefs_common.date_format);
        prefs_common.date_format = tmp;
@@ -857,36 +1228,93 @@ void prefs_common_read_config(void)
                prefs_common_read_history(COMMAND_HISTORY);
        prefs_common.summary_quicksearch_history =
                prefs_common_read_history(QUICKSEARCH_HISTORY);
+       prefs_common.summary_search_from_history =
+               prefs_common_read_history(SUMMARY_SEARCH_FROM_HISTORY);
+       prefs_common.summary_search_to_history =
+               prefs_common_read_history(SUMMARY_SEARCH_TO_HISTORY);
+       prefs_common.summary_search_subject_history =
+               prefs_common_read_history(SUMMARY_SEARCH_SUBJECT_HISTORY);
+       prefs_common.summary_search_body_history =
+               prefs_common_read_history(SUMMARY_SEARCH_BODY_HISTORY);
+       prefs_common.summary_search_adv_condition_history =
+               prefs_common_read_history(SUMMARY_SEARCH_ADV_CONDITION_HISTORY);
+       prefs_common.message_search_history =
+               prefs_common_read_history(MESSAGE_SEARCH_HISTORY);
+       prefs_common.compose_save_to_history =
+               prefs_common_read_history(COMPOSE_SAVE_TO_HISTORY);
+
+       prefs_common.addressbook_custom_attributes = addressbook_update_custom_attr_from_prefs();
 
        colorlabel_update_colortable_from_prefs();
 }
 
+#define TRY(func) \
+if (!(func)) \
+{ \
+       g_warning("failed to write\n"); \
+       goto out;                       \
+} \
+
 /*
- * Save history list to the specified history file
+ * Save history list to the specified history file in the specified directory (subdir of rc_dir)
  */
-void prefs_common_save_history(const gchar *history, GList *list)
+static void prefs_common_save_history_to_dir(const gchar *dirname, const gchar *history, GList *list)
 {
        GList *cur;
        FILE *fp;
-       gchar *path;
+       gchar *path, *tmp_path;
 
+       if (dirname) {
+               path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, dirname,
+                                  G_DIR_SEPARATOR_S, history,
+                                  NULL);
+       } else {
        path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, history,
                           NULL);
-       if ((fp = g_fopen(path, "wb")) == NULL) {
-               FILE_OP_ERROR(path, "fopen");
-               g_free(path);
-               return;
+       }
+       tmp_path = g_strconcat(path, ".tmp", NULL);
+
+       if ((fp = g_fopen(tmp_path, "wb")) == NULL) {
+               FILE_OP_ERROR(tmp_path, "fopen");
+               goto out;
        }
 
        for (cur = list; cur != NULL; cur = cur->next) {
-               fputs((gchar *)cur->data, fp);
-               fputc('\n', fp);
+               TRY(fputs((gchar *)cur->data, fp) != EOF &&
+                   fputc('\n', fp) != EOF);
        }
 
-       fclose(fp);
+       if (fclose(fp) == EOF) {
+               FILE_OP_ERROR(tmp_path, "fclose");
+               fp = NULL;
+               goto out;
+       }
+       fp = NULL;
+#ifdef G_OS_WIN32
+       claws_unlink(path);
+#endif
+       if (g_rename(tmp_path, path) < 0) {
+               FILE_OP_ERROR(path, "rename");
+               goto out;
+       }
+
+out:
+       if (fp)
+               fclose(fp);
+       g_free(tmp_path);
        g_free(path);
 }
 
+/*
+ * Save history list to the specified history file
+ */
+static void prefs_common_save_history(const gchar *history, GList *list)
+{
+       prefs_common_save_history_to_dir(NULL, history, list);
+}
+
+#undef TRY
+
 void prefs_common_write_config(void)
 {
        prefs_write_config(param, "Common", COMMON_RC);
@@ -898,59 +1326,278 @@ void prefs_common_write_config(void)
                prefs_common.mime_open_cmd_history);
        prefs_common_save_history(QUICKSEARCH_HISTORY, 
                prefs_common.summary_quicksearch_history);
+       prefs_common_save_history(SUMMARY_SEARCH_FROM_HISTORY, 
+               prefs_common.summary_search_from_history);
+       prefs_common_save_history(SUMMARY_SEARCH_TO_HISTORY, 
+               prefs_common.summary_search_to_history);
+       prefs_common_save_history(SUMMARY_SEARCH_SUBJECT_HISTORY, 
+               prefs_common.summary_search_subject_history);
+       prefs_common_save_history(SUMMARY_SEARCH_BODY_HISTORY, 
+               prefs_common.summary_search_body_history);
+       prefs_common_save_history(SUMMARY_SEARCH_ADV_CONDITION_HISTORY, 
+               prefs_common.summary_search_adv_condition_history);
+       prefs_common_save_history(MESSAGE_SEARCH_HISTORY, 
+               prefs_common.message_search_history);
+       prefs_common_save_history(COMPOSE_SAVE_TO_HISTORY, 
+               prefs_common.compose_save_to_history);
+
+       prefs_common_save_history_to_dir(ADDRBOOK_DIR,
+               ADDRESSBOOK_CUSTOM_ATTRIBUTES, 
+               prefs_common.addressbook_custom_attributes);
 }
 
-void pref_set_textview_from_pref(GtkTextView *textview, gchar *txt)
+/* make a copy of string 'in' into buffer 'out'. un-escape \ sequences.
+   both 'in' and 'out' must be non-NULL.
+   'out' must be a pointer to a buffer whose size is at least equal
+   to strlen(txt)+1, this buffer will get cleared. out's contents
+   will always get set to a valid string, even if it's "".*/
+void pref_get_unescaped_pref(gchar *out, const gchar *in)
 {
-       GtkTextBuffer *buffer = gtk_text_view_get_buffer(textview);
-       gchar *o_out, *out = malloc(txt?(strlen(txt)+1):1);
-       gchar *t = txt;
-       memset(out, 0, strlen(txt)+1);
-       o_out = out;
-       while (*t != '\0') {
-               if (*t == '\\' && *(t+1) == 'n') {
-                       *out++ = '\n';
-                       t++;
-               } else if (*t == '\\') {
-                       t++;
+       const gchar *i;
+       gchar *o;
+
+       *out = '\0';
+
+       cm_return_if_fail( in != NULL );
+       cm_return_if_fail( out != NULL );
+
+       i = in;
+       o = out;
+       memset(out, 0, strlen(in)+1);
+       while (*i != '\0') {
+               if (*i == '\\' && *(i+1) == 'n') {
+                       *o++ = '\n';
+                       i++;
+               } else if (*i == '\\' && *(i+1) == 't') {
+                       *o++ = '\t';
+                       i++;
+               } else if (*i == '\\' && *(i+1) == '\\') {
+                       *o++ = '\\';
+                       i++;
                } else {
-                       *out++ = *t;
+                       *o++ = *i;
                }
-               t++;
+               i++;
        }
-       *out='\0';
+       *o='\0';
+}
+
+/* make a copy of string 'in' into buffer 'out'. escape \ sequences.
+   both 'in' and 'out' must be non-NULL.
+   'out' must be a pointer to a buffer whose size is at least equal
+   to 2*strlen(txt)+1. out's contents will always get set to a valid
+   string, even if it's "". */
+void pref_get_escaped_pref(gchar *out, const gchar *in)
+{
+       const gchar *i;
+       gchar *o;
+
+       *out = '\0';
+
+       cm_return_if_fail( in != NULL );
+       cm_return_if_fail( out != NULL );
+
+       i = in;
+       o = out;
+       while (*i != '\0') {
+               if (*i == '\n') {
+                       *o++ = '\\';
+                       *o++ = 'n';
+               } else if (*i == '\t') {
+                       *o++ = '\\';
+                       *o++ = 't';
+               } else if (*i == '\\') {
+                       *o++ = '\\';
+                       *o++ = '\\';
+               } else {
+                       *o++ = *i;
+               }
+               i++;
+       }
+       *o = '\0';
+}
+               
+/* set the contents of a textview widget from the internal \-escaped
+  representation of a pref string. both txt and textview must be non-NULL. */
+void pref_set_textview_from_pref(GtkTextView *textview, const gchar *txt)
+{
+       GtkTextBuffer *buffer;
+       gchar *out = NULL;
+
+       cm_return_if_fail( textview != NULL );
+
+       buffer = gtk_text_view_get_buffer(textview);
+
+       if (!txt) {
+               gtk_text_buffer_set_text(buffer, "", -1);
+       } else {
+               out = malloc(strlen(txt)+1);
+
+               pref_get_unescaped_pref(out, txt);
 
-       gtk_text_buffer_set_text(buffer, o_out?o_out:"", -1);
-       g_free(o_out);
+               gtk_text_buffer_set_text(buffer, out?out:"", -1);
+               g_free(out);
+       }
 }
 
+/* set the contents of a gtkentry widget from the internal \-escaped
+  representation of a pref string. both txt and entry must be non-NULL. */
+void pref_set_entry_from_pref(GtkEntry *entry, const gchar *txt)
+{
+       gchar *out = NULL;
+
+       cm_return_if_fail( entry != NULL );
+       if (!txt) {
+               gtk_entry_set_text(entry, "");
+       } else {
+               out = malloc(strlen(txt)+1);
+
+               pref_get_unescaped_pref(out, txt);
+
+               gtk_entry_set_text(entry, out?out:"");
+               g_free(out);
+       }
+}
+
+/* get the \-escaped internal representation of a pref from the contents of
+   a textview widget. textview must be non-NULL. */
 gchar *pref_get_pref_from_textview(GtkTextView *textview) 
 {
        GtkTextBuffer *buffer;
        GtkTextIter start, end;
-       gchar *o_out, *out, *tmp, *t;
+       gchar *out, *tmp;
        
+       cm_return_val_if_fail( textview != NULL, "" );
+
        buffer = gtk_text_view_get_buffer(textview);
        gtk_text_buffer_get_start_iter(buffer, &start);
        gtk_text_buffer_get_iter_at_offset(buffer, &end, -1);
        tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
-       t = tmp;
-       o_out = out = malloc(2*strlen(tmp)+1);
+       out = malloc(2*strlen(tmp)+1);
+       if (out)
+               pref_get_escaped_pref(out, tmp);
+       g_free(tmp);
+
+       return out?out:"";
+}
+
+/* get the \-escaped internal representation of a pref from the contents of
+   a gtkentry widget. entry must be non-NULL. */
+gchar *pref_get_pref_from_entry(GtkEntry *entry) 
+{
+       gchar *out, *tmp;
+
+       cm_return_val_if_fail( entry != NULL, "" );
+
+       tmp = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+       out = malloc(2*strlen(tmp)+1);
        
-       while (*t != '\0') {
-               if (*t == '\n') {
-                       *out++ = '\\';
-                       *out++ = 'n';
-               } else if (*t == '\\') {
-                       *out++ = '\\';
-                       *out++ = '\\';
-               } else {
-                       *out++ = *t;
-               }
-               t++;
-       }
-       *out = '\0';
+       if (out)
+               pref_get_escaped_pref(out, tmp);
        g_free(tmp);
 
-       return o_out;
+       return out?out:"";
+}
+
+/* ugly hack to be able to get this pref from ssl_certificate.c */
+gboolean prefs_common_unsafe_ssl_certs(void)
+{
+       return prefs_common.unsafe_ssl_certs;
+}
+
+gboolean prefs_common_enable_log_standard(void)
+{
+       return prefs_common.enable_log_standard;
+}
+
+gboolean prefs_common_enable_log_warning(void)
+{
+       return prefs_common.enable_log_warning;
+}
+gboolean prefs_common_enable_log_error(void)
+{
+       return prefs_common.enable_log_error;
+}
+gboolean prefs_common_enable_log_status(void)
+{
+       return prefs_common.enable_log_status;
+}
+
+#ifdef MAEMO
+const gchar *prefs_common_get_data_root(void)
+{
+       if (prefs_common.data_root && *prefs_common.data_root)
+               return prefs_common.data_root;
+       else
+               return NULL;
+}
+#endif
+/**
+   return the translated name of a header, if the translate_header option is
+   set, otherwise return the untranslated header name (header_name itself).
+   this function is provided for convenience, it's an interface to
+   prefs_common.trans_hdr.
+   works with header names either with or without trailing colon, provided
+   that gettext found such header name in the sources (they should all be
+   found in src/gtk/headers.h anyway).
+*/
+const gchar *prefs_common_translated_header_name(const gchar *header_name)
+{
+       if (header_name == NULL || *header_name == '\0')
+               return header_name;
+
+       return prefs_common.trans_hdr ? gettext(header_name) : header_name;
+}
+
+const gchar *prefs_common_get_uri_cmd(void)
+{
+#ifdef G_OS_WIN32
+       return NULL;
+#else
+       gchar *tmp = NULL;
+       
+       if (!prefs_common.cmds_use_system_default)
+               return prefs_common.uri_cmd;
+       
+       tmp = g_find_program_in_path("xdg-open");
+       if (!tmp) 
+               return prefs_common.uri_cmd;
+       
+       g_free(tmp);
+       return "xdg-open %s";
+#endif
+}
+
+const gchar *prefs_common_get_ext_editor_cmd(void)
+{
+       return prefs_common.ext_editor_cmd;
+#if 0 /* we should do that, but it detaches the editor and breaks
+        compose.c's external composition. */
+       gchar *tmp = NULL;
+       
+       if (!prefs_common.cmds_use_system_default)
+               return prefs_common.ext_editor_cmd;
+       
+       tmp = g_find_program_in_path("xdg-open");
+       if (!tmp) 
+               return prefs_common.ext_editor_cmd;
+       
+       g_free(tmp);
+       return "xdg-open %s";
+#endif 
+}
+
+gboolean prefs_common_get_use_shred(void)
+{
+       return prefs_common.use_shred;
+}
+
+gboolean prefs_common_get_flush_metadata (void)
+{
+       return prefs_common.flush_metadata;
+}
+
+PrefsCommon *prefs_common_get_prefs(void)
+{
+       return &prefs_common;
 }