2012-09-19 [colin] 3.8.1cvs64
[claws.git] / src / prefs_msg_colors.c
index 6facc387bb17ca56c122ffd472c1c1906e9f3665..f0d41d5f50fb45f3857685da50ba3dbc0a9fdaf5 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & The Sylpheed-Claws Team
+ * Copyright (C) 2004-2012 Hiroyuki Yamamoto & 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 <stdlib.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "intl.h"
 #include "prefs_common.h"
 #include "prefs_gtk.h"
 
 #include "gtk/prefswindow.h"
 
 #include "manage_window.h"
+#include "mainwindow.h"
+#include "colorlabel.h"
+
+#define SAFE_STRING(str) \
+       (str) ? (str) : ""
 
 static struct MessageColorButtons {
-       GtkWidget *quote_level1_btn;
-       GtkWidget *quote_level2_btn;
-       GtkWidget *quote_level3_btn;
-       GtkWidget *uri_btn;
-       GtkWidget *tgt_folder_btn;
-       GtkWidget *signature_btn;
+       GtkWidget *btn_quote_level1;
+       GtkWidget *btn_quote_level2;
+       GtkWidget *btn_quote_level3;
+       GtkWidget *btn_quote_level1_bg;
+       GtkWidget *btn_quote_level2_bg;
+       GtkWidget *btn_quote_level3_bg;
+       GtkWidget *btn_uri;
+       GtkWidget *btn_tgt_folder;
+       GtkWidget *btn_signature;
+       GtkWidget *btn_color_new;
+       /* custom colors */
+       GtkWidget *custom_color[COLORLABELS];
 } color_buttons;
 
 typedef struct _MsgColorsPage
@@ -54,8 +66,12 @@ typedef struct _MsgColorsPage
 
        GtkWidget *window;
        
-       GtkWidget *chkbtn_enablecol;
-       GtkWidget *chkbtn_recycle_colors;
+       GtkWidget *checkbtn_enable_colors;
+       GtkWidget *checkbtn_enable_bgcolors;
+       GtkWidget *checkbtn_recycle_colors;
+
+       /* custom colors */
+       GtkWidget *entry_custom_colorlabel[COLORLABELS];
 } MsgColorsPage;
 
 static GtkWidget *color_dialog;
@@ -71,253 +87,640 @@ static gboolean quote_colors_set_dialog_key_pressed       (GtkWidget      *widget,
                                                 gpointer        data);
 static void set_button_bg_color                        (GtkWidget      *widget,
                                                 gint            color);
+static void prefs_msg_colors_reset_custom_colors(GtkWidget *widget,
+                                                gpointer        data);
 
-void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window, 
+static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window, 
                                    gpointer data)
 {
        MsgColorsPage *prefs_msg_colors = (MsgColorsPage *) _page;
        
-       GtkWidget *table;
-       GtkWidget *chkbtn_enablecol;
-       GtkWidget *quotelevel1_label;
-       GtkWidget *quotelevel2_label;
-       GtkWidget *quotelevel3_label;
-       GtkWidget *uri_label;
-       GtkWidget *signature_label;
-       GtkWidget *tgt_folder_label;
-       GtkWidget *chkbtn_recycle_colors;
+       GtkWidget *notebook;
+       GtkWidget *vbox1;
+       GtkWidget *vbox2;
+       GtkWidget *checkbtn_enable_colors;
+       GtkWidget *label_quote_level1;
+       GtkWidget *label_quote_level2;
+       GtkWidget *label_quote_level3;
+       GtkWidget *label_quote_color1;
+       GtkWidget *label_quote_color2;
+       GtkWidget *label_quote_color3;
+       GtkWidget *checkbtn_enable_bgcolors;
+       GtkWidget *label_quote_bgcolor1;
+       GtkWidget *label_quote_bgcolor2;
+       GtkWidget *label_quote_bgcolor3;
+       GtkWidget *lable_uri;
+       GtkWidget *label_signature;
+       GtkWidget *label_tgt_folder;
+       GtkWidget *checkbtn_recycle_colors;
        GtkWidget *hbox;
+       GtkWidget *label_color_new;
+       GtkWidget *frame_msg;
+       GtkWidget *frame_folder;
+       GtkWidget *frame_quote;
+       GtkWidget *vbox3;
+       GtkWidget *hbox_quote;
+       GtkWidget *vbox_quotefg;
+       GtkWidget *vbox_quotebg;
+       /* custom colors */
+       GtkWidget *hbox_custom_colors;
+       GtkWidget *vbox_custom_colors;
+       GtkWidget *vbox_custom_colors1;
+       GtkWidget *vbox_custom_colors2;
+       GtkWidget *hbox_reset_custom_colors;
+       GtkWidget *btn_reset_custom_colors;
+       GtkWidget *hbox_custom_color[COLORLABELS];
+       GtkWidget *entry_custom_colorlabel[COLORLABELS];
+       gint c;
+       gchar *tooltip_btn_text = NULL;
+       gchar *tooltip_entry_text = NULL;
+
+       notebook = gtk_notebook_new();
+       gtk_widget_show(notebook);
+       
+       vbox1 = gtk_vbox_new (FALSE, VBOX_BORDER);
+       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(_("Other")));
+
+       vbox2 = gtkut_get_options_frame(vbox1, &frame_msg, _("Message view"));
+
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
+       PACK_CHECK_BUTTON (hbox, checkbtn_enable_colors,
+                          _("Enable coloration of message text"));     
+
+       hbox_quote = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox_quote);
+       vbox_quotefg = gtk_vbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (vbox_quotefg);
+       vbox_quotebg = gtk_vbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (vbox_quotebg);
+       vbox3 = gtkut_get_options_frame(vbox2, &frame_quote, _("Quote"));
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, frame_quote);
+       
+       gtk_box_pack_start (GTK_BOX (vbox3), hbox_quote, FALSE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox_quote), vbox_quotefg, FALSE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox_quote), vbox_quotebg, FALSE, TRUE, 0);
+
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox_quotefg), hbox, FALSE, TRUE, 0);
 
-       table = gtk_table_new(8, 3, FALSE);
-       gtk_widget_show(table);
-       gtk_container_set_border_width(GTK_CONTAINER(table), 8);
-       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
-       gtk_table_set_col_spacings(GTK_TABLE(table), 8);
-
-       chkbtn_enablecol = 
-               gtk_check_button_new_with_label(_("Enable coloration of message"));
-       gtk_table_attach (GTK_TABLE (table), chkbtn_enablecol, 0, 1, 1, 2,
-                         (GtkAttachOptions) (GTK_FILL),
-                         (GtkAttachOptions) (0), 0, 0);
-
-       hbox = gtk_hbox_new(FALSE, 8);
-       gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 2, 3,
-                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
-
-       color_buttons.quote_level1_btn = gtk_button_new();
-       gtk_widget_set_size_request (color_buttons.quote_level1_btn, 30, 20);
-       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.quote_level1_btn, 
+       PACK_CHECK_BUTTON (hbox, checkbtn_recycle_colors,
+                          _("Cycle quote colors"));
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, checkbtn_recycle_colors);
+
+       CLAWS_SET_TIP(checkbtn_recycle_colors,
+                            _("If there are more than 3 quote levels, the colors will be reused"));
+
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox_quotefg), hbox, FALSE, TRUE, 0);
+
+       label_quote_level1 = gtk_label_new (_("1st Level"));
+       gtk_widget_show(label_quote_level1);
+       gtk_box_pack_start (GTK_BOX(hbox), label_quote_level1, 
                            FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_level1);
 
-       quotelevel1_label = gtk_label_new (_("Quoted Text - First Level"));
-       gtk_box_pack_start (GTK_BOX(hbox), quotelevel1_label, 
+       label_quote_color1 = gtk_label_new (_("Text"));
+       gtk_widget_show(label_quote_color1);
+       gtk_box_pack_end (GTK_BOX(hbox), label_quote_color1, 
                            FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_color1);
                
-       hbox = gtk_hbox_new(FALSE, 8);
-       gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 3, 4,
-                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+       color_buttons.btn_quote_level1 = gtk_button_new();
+       gtk_widget_show(color_buttons.btn_quote_level1);
+       gtk_widget_set_size_request (color_buttons.btn_quote_level1, 30, 20);
+       gtk_box_pack_end (GTK_BOX(hbox), color_buttons.btn_quote_level1, 
+                           FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_quote_level1);
+
+       CLAWS_SET_TIP(color_buttons.btn_quote_level1,
+                            Q_("Tooltip|Pick color for 1st level text"));
 
-       color_buttons.quote_level2_btn = gtk_button_new();
-       gtk_widget_set_size_request (color_buttons.quote_level2_btn, 30, 20);
-       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.quote_level2_btn, 
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox_quotefg), hbox, FALSE, TRUE, 0);
+
+       label_quote_level2 = gtk_label_new (_("2nd Level"));
+       gtk_widget_show(label_quote_level2);
+       gtk_box_pack_start (GTK_BOX(hbox), label_quote_level2, 
+                           FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_level2);
+
+       label_quote_color2 = gtk_label_new (_("Text"));
+       gtk_widget_show(label_quote_color2);
+       gtk_box_pack_end (GTK_BOX(hbox), label_quote_color2, 
                            FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_color2);
 
-       quotelevel2_label = gtk_label_new (_("Quoted Text - Second Level"));
-       gtk_box_pack_start (GTK_BOX(hbox), quotelevel2_label, 
+       color_buttons.btn_quote_level2 = gtk_button_new();
+       gtk_widget_show(color_buttons.btn_quote_level2);
+       gtk_widget_set_size_request (color_buttons.btn_quote_level2, 30, 20);
+       gtk_box_pack_end (GTK_BOX(hbox), color_buttons.btn_quote_level2, 
                            FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_quote_level2);
+
+       CLAWS_SET_TIP(color_buttons.btn_quote_level2,
+                            Q_("Tooltip|Pick color for 2nd level text"));
+
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox_quotefg), hbox, FALSE, TRUE, 0);
 
-       hbox = gtk_hbox_new(FALSE, 8);
-       gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 4, 5,
-                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+       label_quote_level3 = gtk_label_new (_("3rd Level"));
+       gtk_widget_show(label_quote_level3);
+       gtk_box_pack_start (GTK_BOX(hbox), label_quote_level3, 
+                           FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_level3);
 
-       color_buttons.quote_level3_btn = gtk_button_new_with_label ("");
-       gtk_widget_set_size_request (color_buttons.quote_level3_btn, 30, 20);
-       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.quote_level3_btn
+       label_quote_color3 = gtk_label_new (_("Text"));
+       gtk_widget_show(label_quote_color3);
+       gtk_box_pack_end (GTK_BOX(hbox), label_quote_color3
                            FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_color3);
 
-       quotelevel3_label = gtk_label_new (_("Quoted Text - Third Level"));
-       gtk_box_pack_start (GTK_BOX(hbox), quotelevel3_label, 
+       color_buttons.btn_quote_level3 = gtk_button_new();
+       gtk_widget_show(color_buttons.btn_quote_level3);
+       gtk_widget_set_size_request (color_buttons.btn_quote_level3, 30, 20);
+       gtk_box_pack_end (GTK_BOX(hbox), color_buttons.btn_quote_level3, 
                            FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_quote_level3);
+
+       CLAWS_SET_TIP(color_buttons.btn_quote_level3,
+                            Q_("Tooltip|Pick color for 3rd level text"));
+
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
+
+       PACK_CHECK_BUTTON (hbox, checkbtn_enable_bgcolors,
+                          _("Enable coloration of text background"));
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, checkbtn_enable_bgcolors);
+
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, hbox);
+       gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
+       
+       color_buttons.btn_quote_level1_bg = gtk_button_new();
+       gtk_widget_show(color_buttons.btn_quote_level1_bg);
+       gtk_widget_set_size_request (color_buttons.btn_quote_level1_bg, 30, 20);
+       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_quote_level1_bg, 
+                           FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, color_buttons.btn_quote_level1_bg);
+
+       CLAWS_SET_TIP(color_buttons.btn_quote_level1_bg,
+                            Q_("Tooltip|Pick color for 1st level text background"));
+
+       label_quote_bgcolor1 = gtk_label_new (_("Background"));
+       gtk_widget_show(label_quote_bgcolor1);
+       gtk_box_pack_start (GTK_BOX(hbox), label_quote_bgcolor1, 
+                           FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, label_quote_bgcolor1);
+
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, hbox);
+       gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
+       
+       color_buttons.btn_quote_level2_bg = gtk_button_new();
+       gtk_widget_show(color_buttons.btn_quote_level2_bg);
+       gtk_widget_set_size_request (color_buttons.btn_quote_level2_bg, 30, 20);
+       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_quote_level2_bg, 
+                           FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, color_buttons.btn_quote_level2_bg);
+
+       CLAWS_SET_TIP(color_buttons.btn_quote_level2_bg,
+                            Q_("Tooltip|Pick color for 2nd level text background"));
+
+       label_quote_bgcolor2 = gtk_label_new (_("Background"));
+       gtk_widget_show(label_quote_bgcolor2);
+       gtk_box_pack_start (GTK_BOX(hbox), label_quote_bgcolor2, 
+                           FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, label_quote_bgcolor2);
+       
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, hbox);
+       gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
+       
+       color_buttons.btn_quote_level3_bg = gtk_button_new();
+       gtk_widget_show(color_buttons.btn_quote_level3_bg);
+       gtk_widget_set_size_request (color_buttons.btn_quote_level3_bg, 30, 20);
+       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_quote_level3_bg, 
+                           FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, color_buttons.btn_quote_level3_bg);
+
+       CLAWS_SET_TIP(color_buttons.btn_quote_level3_bg,
+                            Q_("Tooltip|Pick color for 3rd level text background"));
+
+       label_quote_bgcolor3 = gtk_label_new (_("Background"));
+       gtk_widget_show(label_quote_bgcolor3);
+       gtk_box_pack_start (GTK_BOX(hbox), label_quote_bgcolor3, 
+                           FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, label_quote_bgcolor3);
+       
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
+
+       color_buttons.btn_uri = gtk_button_new();
+       gtk_widget_show(color_buttons.btn_uri);
+       gtk_widget_set_size_request (color_buttons.btn_uri, 30, 20);
+       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_uri, 
+                           FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_uri);
+
+       CLAWS_SET_TIP(color_buttons.btn_uri,
+                            Q_("Tooltip|Pick color for links"));
 
-       hbox = gtk_hbox_new(FALSE, 8);
-       gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 5, 6,
-                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+       lable_uri = gtk_label_new (_("URI link"));
+       gtk_widget_show(lable_uri);
+       gtk_box_pack_start (GTK_BOX(hbox), lable_uri, FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, lable_uri);
 
-       color_buttons.uri_btn = gtk_button_new_with_label ("");
-       gtk_widget_set_size_request (color_buttons.uri_btn, 30, 20);
-       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.uri_btn, 
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
+
+       color_buttons.btn_signature = gtk_button_new();
+       gtk_widget_show(color_buttons.btn_signature);
+       gtk_widget_set_size_request (color_buttons.btn_signature, 30, 20);
+       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_signature, 
                            FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_signature);
+
+       CLAWS_SET_TIP(color_buttons.btn_signature,
+                            Q_("Tooltip|Pick color for signatures"));
+
+       label_signature = gtk_label_new (_("Signatures"));
+       gtk_widget_show(label_signature);
+       gtk_box_pack_start (GTK_BOX(hbox), label_signature, FALSE, FALSE, 0);
+       SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_signature);
 
-       uri_label = gtk_label_new (_("URI link"));
-       gtk_box_pack_start (GTK_BOX(hbox), uri_label, FALSE, FALSE, 0);
+       vbox2 = gtkut_get_options_frame(vbox1, &frame_folder, _("Folder list"));
 
-       hbox = gtk_hbox_new(FALSE, 8);
-       gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 6, 7,
-                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
 
-       color_buttons.tgt_folder_btn = gtk_button_new_with_label ("");
-       gtk_widget_set_size_request (color_buttons.tgt_folder_btn, 30, 20);
-       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.tgt_folder_btn, 
+       color_buttons.btn_tgt_folder = gtk_button_new();
+       gtk_widget_show(color_buttons.btn_tgt_folder);
+       gtk_widget_set_size_request (color_buttons.btn_tgt_folder, 30, 20);
+       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_tgt_folder, 
                            FALSE, FALSE, 0);
 
-       tgt_folder_label = gtk_label_new (_("Target folder"));
-       gtk_box_pack_start (GTK_BOX(hbox), tgt_folder_label, FALSE, FALSE, 0);
+       CLAWS_SET_TIP(color_buttons.btn_tgt_folder,
+                            _("Pick color for Target folder. "
+                              "Target folder is used when the option 'Execute immediately "
+                              "when moving or deleting messages' is turned off"));
 
-       hbox = gtk_hbox_new(FALSE, 8);
-       gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 7, 8,
-                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+       label_tgt_folder = gtk_label_new (_("Target folder"));
+       gtk_widget_show(label_tgt_folder);
+       gtk_box_pack_start (GTK_BOX(hbox), label_tgt_folder, FALSE, FALSE, 0);
 
-       color_buttons.signature_btn = gtk_button_new_with_label ("");
-       gtk_widget_set_size_request (color_buttons.signature_btn, 30, 20);
-       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.signature_btn, 
+       hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+
+       color_buttons.btn_color_new = gtk_button_new();
+       gtk_widget_show (color_buttons.btn_color_new);
+       gtk_widget_set_size_request (color_buttons.btn_color_new, 30, 20);
+       gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_color_new,
                            FALSE, FALSE, 0);
 
-       signature_label = gtk_label_new (_("Signatures"));
-       gtk_box_pack_start (GTK_BOX(hbox), signature_label, FALSE, FALSE, 0);
+       CLAWS_SET_TIP(color_buttons.btn_color_new,
+                            _("Pick color for folders containing new messages"));
+
+       label_color_new = gtk_label_new (_("Folder containing new messages"));
+       gtk_widget_show(label_color_new);
+       gtk_box_pack_start (GTK_BOX(hbox), label_color_new, FALSE, FALSE, 0);
+
+       /* custom colors */
+       vbox_custom_colors = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       gtk_widget_show (vbox_custom_colors);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox_custom_colors), VBOX_BORDER);
+       gtk_notebook_prepend_page(GTK_NOTEBOOK(notebook), vbox_custom_colors,
+                                gtk_label_new(_("Color labels")));
+
+       hbox_custom_colors = gtk_hbox_new(FALSE, 8);
+       gtk_widget_show(hbox_custom_colors);
+       gtk_box_pack_start(GTK_BOX (vbox_custom_colors), hbox_custom_colors,
+                                  FALSE, TRUE, 0);
+
+       vbox_custom_colors1 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       gtk_widget_show (vbox_custom_colors1);
+       gtk_box_pack_start (GTK_BOX (hbox_custom_colors), vbox_custom_colors1, FALSE, FALSE, 0);
+
+       vbox_custom_colors2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       gtk_widget_show (vbox_custom_colors2);
+       gtk_box_pack_start (GTK_BOX (hbox_custom_colors), vbox_custom_colors2, FALSE, FALSE, 0);
+
+       for (c = 0; c < (COLORLABELS>>1)+(COLORLABELS&1); c++) {
+               /* TRANSLATORS: 'color %d' refers to the filtering/processing 
+                  rule name and should not be translated */
+               tooltip_btn_text = g_strdup_printf(Q_("Tooltip|Pick color for 'color %d'"), c+1);
+
+               /* TRANSLATORS: 'color %d' refers to the filtering/processing 
+                  rule name and should not be translated */
+               tooltip_entry_text = g_strdup_printf(_("Set label for 'color %d'"), c+1);
+
+               hbox_custom_color[c] = gtk_hbox_new(FALSE, 8);
+               gtk_widget_show(hbox_custom_color[c]);
+               gtk_box_pack_start(GTK_BOX (vbox_custom_colors1), hbox_custom_color[c],
+                                  FALSE, TRUE, 0);
+
+               color_buttons.custom_color[c] = gtk_button_new();
+               gtk_widget_show(color_buttons.custom_color[c]);
+               gtk_widget_set_size_request(color_buttons.custom_color[c], 30, 20);
+               gtk_box_pack_start(GTK_BOX (hbox_custom_color[c]), color_buttons.custom_color[c],
+                                  FALSE, FALSE, 0);
+
+               CLAWS_SET_TIP(color_buttons.custom_color[c],
+                                    tooltip_btn_text);
+
+               entry_custom_colorlabel[c] = gtk_entry_new();
+               gtk_widget_show (entry_custom_colorlabel[c]);
+               gtk_box_pack_start(GTK_BOX (hbox_custom_color[c]), entry_custom_colorlabel[c],
+                                  FALSE, FALSE, 0);
+               CLAWS_SET_TIP(entry_custom_colorlabel[c],
+                                    tooltip_entry_text);
+       }
 
-       chkbtn_recycle_colors = 
-               gtk_check_button_new_with_label(_("Recycle quote colors"));
-       gtk_table_attach (GTK_TABLE (table), chkbtn_recycle_colors, 0, 1, 8, 9,
-                         (GtkAttachOptions) (GTK_FILL),
-                         (GtkAttachOptions) (0), 0, 0);
-                         
-       gtk_widget_show_all(table);
+       for (c = (COLORLABELS>>1)+(COLORLABELS&1); c < COLORLABELS; c++) {
+               /* TRANSLATORS: 'color %d' refers to the filtering/processing 
+                  rule name and should not be translated */
+               tooltip_btn_text = g_strdup_printf(Q_("Tooltip|Pick color for 'color %d'"), c+1);
+
+               /* TRANSLATORS: 'color %d' refers to the filtering/processing 
+                  rule name and should not be translated */
+               tooltip_entry_text = g_strdup_printf(_("Set label for 'color %d'"), c+1);
+
+               hbox_custom_color[c] = gtk_hbox_new(FALSE, 8);
+               gtk_widget_show(hbox_custom_color[c]);
+               gtk_box_pack_start(GTK_BOX (vbox_custom_colors2), hbox_custom_color[c],
+                                  FALSE, TRUE, 0);
+
+               color_buttons.custom_color[c] = gtk_button_new();
+               gtk_widget_show(color_buttons.custom_color[c]);
+               gtk_widget_set_size_request(color_buttons.custom_color[c], 30, 20);
+               gtk_box_pack_start(GTK_BOX (hbox_custom_color[c]), color_buttons.custom_color[c],
+                                  FALSE, FALSE, 0);
+               CLAWS_SET_TIP(color_buttons.custom_color[c],
+                                    tooltip_btn_text);
+
+               entry_custom_colorlabel[c] = gtk_entry_new();
+               gtk_widget_show (entry_custom_colorlabel[c]);
+               gtk_box_pack_start(GTK_BOX (hbox_custom_color[c]), entry_custom_colorlabel[c],
+                                  FALSE, FALSE, 0);
+               CLAWS_SET_TIP(entry_custom_colorlabel[c],
+                                    tooltip_entry_text);
+       }
 
-       g_signal_connect(G_OBJECT(color_buttons.quote_level1_btn), "clicked",
+       g_free(tooltip_btn_text);
+       g_free(tooltip_entry_text);
+
+       hbox_reset_custom_colors = gtk_hbox_new(FALSE, VBOX_BORDER);
+       gtk_widget_show (hbox_reset_custom_colors);
+       gtk_box_pack_start(GTK_BOX (vbox_custom_colors), hbox_reset_custom_colors,
+                          FALSE, FALSE, 0);
+
+       btn_reset_custom_colors = gtk_button_new_with_label(_(" Use default "));
+       gtk_widget_show(btn_reset_custom_colors);
+       gtk_box_pack_start(GTK_BOX(hbox_reset_custom_colors), btn_reset_custom_colors,
+               FALSE, FALSE, 0);
+
+       g_signal_connect(G_OBJECT(color_buttons.btn_quote_level1), "clicked",
                         G_CALLBACK(quote_color_set_dialog), "LEVEL1");
-       g_signal_connect(G_OBJECT(color_buttons.quote_level2_btn), "clicked",
+       g_signal_connect(G_OBJECT(color_buttons.btn_quote_level2), "clicked",
                         G_CALLBACK(quote_color_set_dialog), "LEVEL2");
-       g_signal_connect(G_OBJECT(color_buttons.quote_level3_btn), "clicked",
+       g_signal_connect(G_OBJECT(color_buttons.btn_quote_level3), "clicked",
                         G_CALLBACK(quote_color_set_dialog), "LEVEL3");
-       g_signal_connect(G_OBJECT(color_buttons.uri_btn), "clicked",
+       g_signal_connect(G_OBJECT(color_buttons.btn_quote_level1_bg), "clicked",
+                        G_CALLBACK(quote_color_set_dialog), "LEVEL1BG");
+       g_signal_connect(G_OBJECT(color_buttons.btn_quote_level2_bg), "clicked",
+                        G_CALLBACK(quote_color_set_dialog), "LEVEL2BG");
+       g_signal_connect(G_OBJECT(color_buttons.btn_quote_level3_bg), "clicked",
+                        G_CALLBACK(quote_color_set_dialog), "LEVEL3BG");
+       g_signal_connect(G_OBJECT(color_buttons.btn_uri), "clicked",
                         G_CALLBACK(quote_color_set_dialog), "URI");
-       g_signal_connect(G_OBJECT(color_buttons.tgt_folder_btn), "clicked",
+       g_signal_connect(G_OBJECT(color_buttons.btn_tgt_folder), "clicked",
                         G_CALLBACK(quote_color_set_dialog), "TGTFLD");
-       g_signal_connect(G_OBJECT(color_buttons.signature_btn), "clicked",
+       g_signal_connect(G_OBJECT(color_buttons.btn_signature), "clicked",
                         G_CALLBACK(quote_color_set_dialog), "SIGNATURE");
+       g_signal_connect(G_OBJECT(color_buttons.btn_color_new), "clicked",
+                        G_CALLBACK(quote_color_set_dialog), "NEW");
+       /* custom colors */
+       for (c = 0; c < COLORLABELS; c++) {
+               g_signal_connect(G_OBJECT(color_buttons.custom_color[c]), "clicked",
+                                G_CALLBACK(quote_color_set_dialog), GINT_TO_POINTER(c));
+       }
+
+       g_signal_connect(G_OBJECT(btn_reset_custom_colors), "clicked",
+                        G_CALLBACK(prefs_msg_colors_reset_custom_colors), prefs_msg_colors);
 
-       set_button_bg_color(color_buttons.quote_level1_btn,
+       set_button_bg_color(color_buttons.btn_quote_level1,
                            prefs_common.quote_level1_col);
-       set_button_bg_color(color_buttons.quote_level2_btn,
+       set_button_bg_color(color_buttons.btn_quote_level2,
                            prefs_common.quote_level2_col);
-       set_button_bg_color(color_buttons.quote_level3_btn,
+       set_button_bg_color(color_buttons.btn_quote_level3,
                            prefs_common.quote_level3_col);
-       set_button_bg_color(color_buttons.uri_btn,
+       set_button_bg_color(color_buttons.btn_quote_level1_bg,
+                           prefs_common.quote_level1_bgcol);
+       set_button_bg_color(color_buttons.btn_quote_level2_bg,
+                           prefs_common.quote_level2_bgcol);
+       set_button_bg_color(color_buttons.btn_quote_level3_bg,
+                           prefs_common.quote_level3_bgcol);
+       set_button_bg_color(color_buttons.btn_uri,
                            prefs_common.uri_col);
-       set_button_bg_color(color_buttons.tgt_folder_btn,
+       set_button_bg_color(color_buttons.btn_tgt_folder,
                            prefs_common.tgt_folder_col);
-       set_button_bg_color(color_buttons.signature_btn,
+       set_button_bg_color(color_buttons.btn_signature,
                            prefs_common.signature_col);
+       set_button_bg_color(color_buttons.btn_color_new,
+                           prefs_common.color_new);
+       /* custom colors */
+       for (c = 0; c < COLORLABELS; c++) {
+               set_button_bg_color(color_buttons.custom_color[c],
+                                   prefs_common.custom_colorlabel[c].color);
+               gtk_entry_set_text(GTK_ENTRY (entry_custom_colorlabel[c]), 
+                                  gettext(SAFE_STRING (prefs_common.custom_colorlabel[c].label)));
+       }
 
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_enablecol),
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_colors),
                                     prefs_common.enable_color);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_recycle_colors),
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_bgcolors),
+                                    prefs_common.enable_bgcolor);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_recycle_colors),
                                     prefs_common.recycle_quote_colors);
 
-       prefs_msg_colors->window                = GTK_WIDGET(window);
-       prefs_msg_colors->chkbtn_enablecol      = chkbtn_enablecol;
-       prefs_msg_colors->chkbtn_recycle_colors = chkbtn_recycle_colors;
-
-       prefs_msg_colors->page.widget = table;
+       prefs_msg_colors->checkbtn_enable_colors        = checkbtn_enable_colors;
+       prefs_msg_colors->checkbtn_enable_bgcolors      = checkbtn_enable_bgcolors;
+       prefs_msg_colors->checkbtn_recycle_colors       = checkbtn_recycle_colors;
+       /* custom colors */
+       for (c = 0; c < COLORLABELS; c++) {
+               prefs_msg_colors->entry_custom_colorlabel[c] = entry_custom_colorlabel[c];
+       }
+       gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
+               
+       prefs_msg_colors->page.widget = notebook;
 }
 
 static void quote_color_set_dialog(GtkWidget *widget, gpointer data)
 {
        gchar *type = (gchar *)data;
        gchar *title = NULL;
-       gdouble color[4] = {0.0, 0.0, 0.0, 0.0};
+       GdkColor color;
        gint rgbvalue = 0;
        GtkColorSelectionDialog *dialog;
-
-       if(g_ascii_strcasecmp(type, "LEVEL1") == 0) {
-               title = _("Pick color for quotation level 1");
-               rgbvalue = prefs_common.quote_level1_col;
-       } else if(g_ascii_strcasecmp(type, "LEVEL2") == 0) {
-               title = _("Pick color for quotation level 2");
-               rgbvalue = prefs_common.quote_level2_col;
-       } else if(g_ascii_strcasecmp(type, "LEVEL3") == 0) {
-               title = _("Pick color for quotation level 3");
-               rgbvalue = prefs_common.quote_level3_col;
-       } else if(g_ascii_strcasecmp(type, "URI") == 0) {
-               title = _("Pick color for URI");
-               rgbvalue = prefs_common.uri_col;
-       } else if(g_ascii_strcasecmp(type, "TGTFLD") == 0) {
-               title = _("Pick color for target folder");
-               rgbvalue = prefs_common.tgt_folder_col;
-       } else if(g_ascii_strcasecmp(type, "SIGNATURE") == 0) {
-               title = _("Pick color for signatures");
-               rgbvalue = prefs_common.signature_col;
-       } else {   /* Should never be called */
-               g_warning("Unrecognized datatype '%s' in quote_color_set_dialog\n", type);
-               return;
+       GtkWidget *button_ok;
+       GtkWidget *button_cancel;
+       gint c;
+
+       /* custom colors */
+       /* leave the extra space at the end of the title, this is for translators' convenience */
+       for (c = 0; c < COLORLABELS; c++) {
+               if (GPOINTER_TO_INT(type) == c) {
+                       /* TRANSLATORS: 'color %d' refers to the filtering/processing 
+                          rule name and should not be translated */
+                       title = g_strdup_printf(Q_("Dialog title|Pick color for 'color %d'"), c+1);
+                       rgbvalue = prefs_common.custom_colorlabel[c].color;
+                       break;
+               }
+       }
+       /* other colors */
+       if (c == COLORLABELS) {
+               if(g_ascii_strcasecmp(type, "LEVEL1") == 0) {
+                       title = g_strdup(Q_("Dialog title|Pick color for 1st level text"));
+                       rgbvalue = prefs_common.quote_level1_col;
+               } else if(g_ascii_strcasecmp(type, "LEVEL2") == 0) {
+                       title = g_strdup(Q_("Dialog title|Pick color for 2nd level text"));
+                       rgbvalue = prefs_common.quote_level2_col;
+               } else if(g_ascii_strcasecmp(type, "LEVEL3") == 0) {
+                       title = g_strdup(Q_("Dialog title|Pick color for 3rd level text"));
+                       rgbvalue = prefs_common.quote_level3_col;
+               } else if(g_ascii_strcasecmp(type, "LEVEL1BG") == 0) {
+                       title = g_strdup(Q_("Dialog title|Pick color for 1st level text background"));
+                       rgbvalue = prefs_common.quote_level1_bgcol;
+               } else if(g_ascii_strcasecmp(type, "LEVEL2BG") == 0) {
+                       title = g_strdup(Q_("Dialog title|Pick color for 2nd level text background"));
+                       rgbvalue = prefs_common.quote_level2_bgcol;
+               } else if(g_ascii_strcasecmp(type, "LEVEL3BG") == 0) {
+                       title = g_strdup(Q_("Dialog title|Pick color for 3rd level text background"));
+                       rgbvalue = prefs_common.quote_level3_bgcol;
+               } else if(g_ascii_strcasecmp(type, "URI") == 0) {
+                       title = g_strdup(Q_("Dialog title|Pick color for links"));
+                       rgbvalue = prefs_common.uri_col;
+               } else if(g_ascii_strcasecmp(type, "TGTFLD") == 0) {
+                       title = g_strdup(Q_("Dialog title|Pick color for target folder"));
+                       rgbvalue = prefs_common.tgt_folder_col;
+               } else if(g_ascii_strcasecmp(type, "SIGNATURE") == 0) {
+                       title = g_strdup(Q_("Dialog title|Pick color for signatures"));
+                       rgbvalue = prefs_common.signature_col;
+               } else if(g_ascii_strcasecmp(type, "NEW") == 0) {
+                       title = g_strdup(Q_("Dialog title|Pick color for folder"));
+                       rgbvalue = prefs_common.color_new;
+               } else {
+                       /* Should never be called */
+                       g_warning("Unrecognized datatype '%s' in quote_color_set_dialog\n", type);
+                       return;
+               }
        }
 
        color_dialog = gtk_color_selection_dialog_new(title);
+       g_free(title);
        gtk_window_set_position(GTK_WINDOW(color_dialog), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(color_dialog), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(color_dialog), FALSE);
        manage_window_set_transient(GTK_WINDOW(color_dialog));
 
-       g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button),
-                        "clicked", G_CALLBACK(quote_colors_set_dialog_ok), data);
-       g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->cancel_button),
+       g_object_get(color_dialog, "ok-button", &button_ok,
+                               "cancel-button", &button_cancel,
+                               NULL);
+
+       g_signal_connect(G_OBJECT(button_cancel),
                         "clicked", G_CALLBACK(quote_colors_set_dialog_cancel), data);
+       g_signal_connect(G_OBJECT(button_ok),
+                        "clicked", G_CALLBACK(quote_colors_set_dialog_ok), data);
        g_signal_connect(G_OBJECT(color_dialog), "key_press_event",
                         G_CALLBACK(quote_colors_set_dialog_key_pressed),data);
 
        /* preselect the previous color in the color selection dialog */
-       color[0] = (gdouble) ((rgbvalue & 0xff0000) >> 16) / 255.0;
-       color[1] = (gdouble) ((rgbvalue & 0x00ff00) >>  8) / 255.0;
-       color[2] = (gdouble)  (rgbvalue & 0x0000ff)        / 255.0;
+
+       gtkut_convert_int_to_gdk_color(rgbvalue, &color);
+
        dialog = GTK_COLOR_SELECTION_DIALOG(color_dialog);
-       gtk_color_selection_set_color
-               (GTK_COLOR_SELECTION(dialog->colorsel), color);
+       gtk_color_selection_set_current_color
+               (GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(dialog)), &color);
 
        gtk_widget_show(color_dialog);
 }
 
 static void quote_colors_set_dialog_ok(GtkWidget *widget, gpointer data)
 {
-       GtkColorSelection *colorsel = (GtkColorSelection *)
-                                               ((GtkColorSelectionDialog *)color_dialog)->colorsel;
-       gdouble color[4];
-       gint red, green, blue, rgbvalue;
+       GtkColorSelection *colorsel = GTK_COLOR_SELECTION(
+               gtk_color_selection_dialog_get_color_selection
+                                               ((GtkColorSelectionDialog *)color_dialog));
+       GdkColor color;
+       gint rgbvalue;
        gchar *type = (gchar *)data;
+       gint c;
 
-       gtk_color_selection_get_color(colorsel, color);
-
-       red      = (gint) (color[0] * 255.0);
-       green    = (gint) (color[1] * 255.0);
-       blue     = (gint) (color[2] * 255.0);
-       rgbvalue = (gint) ((red * 0x10000) | (green * 0x100) | blue);
+       gtk_color_selection_get_current_color(colorsel, &color);
+       rgbvalue = gtkut_convert_gdk_color_to_int(&color);
 
-#if 0
-       fprintf(stderr, "redc = %f, greenc = %f, bluec = %f\n", color[0], color[1], color[2]);
-       fprintf(stderr, "red = %d, green = %d, blue = %d\n", red, green, blue);
-       fprintf(stderr, "Color is %x\n", rgbvalue);
-#endif
 
-       if (g_ascii_strcasecmp(type, "LEVEL1") == 0) {
-               prefs_common.quote_level1_col = rgbvalue;
-               set_button_bg_color(color_buttons.quote_level1_btn, rgbvalue);
-       } else if (g_ascii_strcasecmp(type, "LEVEL2") == 0) {
-               prefs_common.quote_level2_col = rgbvalue;
-               set_button_bg_color(color_buttons.quote_level2_btn, rgbvalue);
-       } else if (g_ascii_strcasecmp(type, "LEVEL3") == 0) {
-               prefs_common.quote_level3_col = rgbvalue;
-               set_button_bg_color(color_buttons.quote_level3_btn, rgbvalue);
-       } else if (g_ascii_strcasecmp(type, "URI") == 0) {
-               prefs_common.uri_col = rgbvalue;
-               set_button_bg_color(color_buttons.uri_btn, rgbvalue);
-       } else if (g_ascii_strcasecmp(type, "TGTFLD") == 0) {
-               prefs_common.tgt_folder_col = rgbvalue;
-               set_button_bg_color(color_buttons.tgt_folder_btn, rgbvalue);
-               folderview_set_target_folder_color(prefs_common.tgt_folder_col);
-       } else if (g_ascii_strcasecmp(type, "SIGNATURE") == 0) {
-               prefs_common.signature_col = rgbvalue;
-               set_button_bg_color(color_buttons.signature_btn, rgbvalue);
-       } else
-               fprintf( stderr, "Unrecognized datatype '%s' in quote_color_set_dialog_ok\n", type );
+       /* custom colors */
+       for (c = 0; c < COLORLABELS; c++) {
+               if (GPOINTER_TO_INT(type) == c) {
+                       prefs_common.custom_colorlabel[c].color = rgbvalue;
+                       set_button_bg_color(color_buttons.custom_color[c], rgbvalue);
+                       break;
+               }
+       }
+       /* other colors */
+       if (c == COLORLABELS) {
+               if (g_ascii_strcasecmp(type, "LEVEL1") == 0) {
+                       prefs_common.quote_level1_col = rgbvalue;
+                       set_button_bg_color(color_buttons.btn_quote_level1, rgbvalue);
+               } else if (g_ascii_strcasecmp(type, "LEVEL2") == 0) {
+                       prefs_common.quote_level2_col = rgbvalue;
+                       set_button_bg_color(color_buttons.btn_quote_level2, rgbvalue);
+               } else if (g_ascii_strcasecmp(type, "LEVEL3") == 0) {
+                       prefs_common.quote_level3_col = rgbvalue;
+                       set_button_bg_color(color_buttons.btn_quote_level3, rgbvalue);
+               } else if (g_ascii_strcasecmp(type, "LEVEL1BG") == 0) {
+                       prefs_common.quote_level1_bgcol = rgbvalue;
+                       set_button_bg_color(color_buttons.btn_quote_level1_bg, rgbvalue);
+               } else if (g_ascii_strcasecmp(type, "LEVEL2BG") == 0) {
+                       prefs_common.quote_level2_bgcol = rgbvalue;
+                       set_button_bg_color(color_buttons.btn_quote_level2_bg, rgbvalue);
+               } else if (g_ascii_strcasecmp(type, "LEVEL3BG") == 0) {
+                       prefs_common.quote_level3_bgcol = rgbvalue;
+                       set_button_bg_color(color_buttons.btn_quote_level3_bg, rgbvalue);
+               } else if (g_ascii_strcasecmp(type, "URI") == 0) {
+                       prefs_common.uri_col = rgbvalue;
+                       set_button_bg_color(color_buttons.btn_uri, rgbvalue);
+               } else if (g_ascii_strcasecmp(type, "TGTFLD") == 0) {
+                       prefs_common.tgt_folder_col = rgbvalue;
+                       set_button_bg_color(color_buttons.btn_tgt_folder, rgbvalue);
+                       folderview_set_target_folder_color(prefs_common.tgt_folder_col);
+               } else if (g_ascii_strcasecmp(type, "SIGNATURE") == 0) {
+                       prefs_common.signature_col = rgbvalue;
+                       set_button_bg_color(color_buttons.btn_signature, rgbvalue);
+               } else if (g_ascii_strcasecmp(type, "NEW") == 0) {
+                       prefs_common.color_new = rgbvalue;
+                       set_button_bg_color(color_buttons.btn_color_new, rgbvalue);
+               } else {
+                       g_printerr("Unrecognized datatype '%s' in quote_color_set_dialog_ok\n", type);
+               }
+       }
 
        gtk_widget_destroy(color_dialog);
 }
@@ -331,7 +734,32 @@ static gboolean quote_colors_set_dialog_key_pressed(GtkWidget *widget,
                                                GdkEventKey *event,
                                                gpointer data)
 {
-       gtk_widget_destroy(color_dialog);
+       GtkColorSelectionDialog *dialog;
+       GtkWidget *button_ok;
+       GtkWidget *button_cancel;
+
+       dialog = GTK_COLOR_SELECTION_DIALOG(widget);
+       g_object_get(dialog, "ok-button", &button_ok,
+                         "cancel-button", &button_cancel,
+                          NULL);
+
+       if (event) {
+               switch (event->keyval) {
+                       case GDK_KEY_Escape:
+                               gtk_button_clicked(GTK_BUTTON(&button_cancel));
+                               return TRUE;
+                       case GDK_KEY_Return: 
+                       case GDK_KEY_KP_Enter:
+                               /* NOTE: changing focus makes widget accept all currently 
+                                * changed settings! */
+                               gtk_widget_grab_focus(button_ok);
+                               /* call ok handler */                                           
+                               gtk_button_clicked(GTK_BUTTON(button_ok));
+                               return TRUE;
+                       default:
+                               break;
+               }
+       }
        return FALSE;
 }
 
@@ -349,14 +777,52 @@ static void set_button_bg_color(GtkWidget *widget, gint rgbvalue)
        gtk_widget_set_style(GTK_WIDGET(widget), newstyle);
 }
 
-void prefs_msg_colors_save(PrefsPage *_page)
+static void prefs_msg_colors_save(PrefsPage *_page)
 {
        MsgColorsPage *page = (MsgColorsPage *) _page;
+       gint c;
 
        prefs_common.enable_color = 
-               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->chkbtn_enablecol));
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_colors));
+       prefs_common.enable_bgcolor = 
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_bgcolors));
        prefs_common.recycle_quote_colors =
-               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->chkbtn_recycle_colors));
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_recycle_colors));
+
+       /* custom colors */
+       for (c = 0; c < COLORLABELS; c++) {
+               g_free(prefs_common.custom_colorlabel[c].label);
+               prefs_common.custom_colorlabel[c].label =
+                       gtk_editable_get_chars(GTK_EDITABLE(page->entry_custom_colorlabel[c]), 0, -1);
+       }
+       colorlabel_update_colortable_from_prefs();
+
+       main_window_reflect_prefs_all();
+       main_window_reflect_prefs_custom_colors(mainwindow_get_mainwindow());
+}
+
+static void prefs_msg_colors_reset_custom_colors(GtkWidget *widget, gpointer data)
+{
+#define CL(x)          (((gulong) (x) >> (gulong) 8) & 0xFFUL) 
+#define CR(r, g, b)    ((CL(r) << (gulong) 16) | \
+                        (CL(g) << (gulong)  8) | \
+                        (CL(b)))
+       MsgColorsPage *page = (MsgColorsPage *) data;
+       GdkColor color;
+       gint c;
+
+       for (c = 0; c < COLORLABELS; c++) {
+               color = colorlabel_get_default_color(c);
+               prefs_common.custom_colorlabel[c].color =
+                                                       (gint)CR(color.red, color.green, color.blue);
+               set_button_bg_color(color_buttons.custom_color[c],
+                                                       prefs_common.custom_colorlabel[c].color);
+               gtk_entry_set_text(GTK_ENTRY (page->entry_custom_colorlabel[c]),
+                                                       gettext(SAFE_STRING (colorlabel_get_color_default_text(c))));
+       }
+
+#undef CR
+#undef CL
 }
 
 static void prefs_msg_colors_destroy_widget(PrefsPage *_page)
@@ -370,7 +836,7 @@ void prefs_msg_colors_init(void)
        MsgColorsPage *page;
        static gchar *path[3];
 
-       path[0] = _("Message View");
+       path[0] = _("Display");
        path[1] = _("Colors");
        path[2] = NULL;
 
@@ -379,7 +845,7 @@ void prefs_msg_colors_init(void)
        page->page.create_widget = prefs_msg_colors_create_widget;
        page->page.destroy_widget = prefs_msg_colors_destroy_widget;
        page->page.save_page = prefs_msg_colors_save;
-       page->page.weight = 60.0;
+       page->page.weight = 165.0;
        prefs_gtk_register_page((PrefsPage *) page);
        prefs_msg_colors = page;
 }