fix overlapping labels and boxes when user has large GTK font
[claws.git] / src / prefs_matcher.c
index ef20092413dfcafca57d35148acf14aa450df95c..1f2d30fc7781a753713d6554fd680835be7bc29c 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2012 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,
  * 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 <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -31,7 +33,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include "intl.h"
+#if !GTK_CHECK_VERSION(3, 0, 0)
+#include "gtkcmoptionmenu.h"
+#endif
 #include "main.h"
 #include "prefs_gtk.h"
 #include "prefs_matcher.h"
 #include "alertpanel.h"
 #include "folder.h"
 #include "description_window.h"
+#include "combobox.h"
 
 #include "matcher_parser.h"
 #include "colorlabel.h"
+#include "tags.h"
+#ifndef USE_NEW_ADDRBOOK
+       #include "addressbook.h"
+#endif
+
+#ifndef USE_NEW_ADDRBOOK
+static void prefs_matcher_addressbook_select(void);
+#endif
+static void prefs_matcher_test_info(GtkWidget *widget, GtkWidget *parent);
+
+enum {
+       PREFS_MATCHER_COND,
+       PREFS_MATCHER_COND_VALID,
+       N_PREFS_MATCHER_COLUMNS
+};
 
 /*!
  *\brief       UI data for matcher dialog
@@ -58,31 +78,53 @@ static struct Matcher {
 
        GtkWidget *ok_btn;
 
-       GtkWidget *predicate_combo;
-       GtkWidget *predicate_flag_combo;
-       GtkWidget *header_combo;
-
-       GtkWidget *criteria_list;
-
-       GtkWidget *predicate_list;
-       GtkWidget *predicate_label;
-       GtkWidget *predicate_flag_list;
-
-       GtkWidget *bool_op_list;
+       GtkWidget *match_combo;
+       GtkWidget *header_addr_combo;
+       GtkWidget *bool_op_combo;
+       GtkWidget *criteria_label2;
+       GtkWidget *criteria_combo;
+       GtkWidget *criteria_combo2;
+       GtkWidget *match_combo2;
+       GtkWidget *match_label;
+       GtkWidget *match_label2;
+       GtkWidget *headers_combo;
+       GtkWidget *upper_filler;
+       GtkWidget *lower_filler;
 
        GtkWidget *header_entry;
-       GtkWidget *header_label;
-       GtkWidget *value_entry;
-       GtkWidget *value_label;
-       GtkWidget *case_chkbtn;
-       GtkWidget *regexp_chkbtn;
+       GtkWidget *header_addr_entry;
+       GtkWidget *string_entry;
+       GtkWidget *numeric_entry;
+       GtkWidget *numeric_label;
+       GtkWidget *addressbook_folder_combo;
+       GtkWidget *case_checkbtn;
+#ifndef G_OS_WIN32
+       GtkWidget *regexp_checkbtn;
+#endif
+#if !GTK_CHECK_VERSION(3, 0, 0)
        GtkWidget *color_optmenu;
+#endif
 
        GtkWidget *test_btn;
-
-       GtkWidget *cond_clist;
-
-       GtkWidget *criteria_table;
+       GtkWidget *addressbook_select_btn;
+
+       GtkTreeModel *model_age;
+       GtkTreeModel *model_age_units;
+       GtkTreeModel *model_contain;
+       GtkTreeModel *model_found;
+       GtkTreeModel *model_flags;
+       GtkTreeModel *model_headers;
+       GtkTreeModel *model_partial;
+       GtkTreeModel *model_phrase;
+       GtkTreeModel *model_score;
+       GtkTreeModel *model_set;
+       GtkTreeModel *model_size;
+       GtkTreeModel *model_size_units;
+       GtkTreeModel *model_tags;
+       GtkTreeModel *model_test;
+       GtkTreeModel *model_thread;
+       
+       GtkWidget *cond_list_view;
 
        gint selected_criteria; /*!< selected criteria in combobox */ 
 } matcher;
@@ -92,9 +134,6 @@ static struct Matcher {
  *             have the same CRITERIA_XXX id). I.e. both unread and ~unread
  *             have criteria id CRITERIA_UNREAD. This id is passed as the
  *             first parameter to #matcherprop_new and #matcherprop_unquote_new.
- *
- *\warning     Currently the enum constants should have the same order as the 
- *             #criteria_text  
  */            
 enum {
        CRITERIA_ALL = 0,
@@ -121,97 +160,89 @@ enum {
        CRITERIA_REPLIED = 19,
        CRITERIA_FORWARDED = 20,
        CRITERIA_LOCKED = 21,
-       CRITERIA_COLORLABEL = 22,
-       CRITERIA_IGNORE_THREAD = 23,
+       CRITERIA_SPAM = 22,
+       CRITERIA_COLORLABEL = 23,
+       CRITERIA_IGNORE_THREAD = 24,
+       CRITERIA_WATCH_THREAD = 25,
+
+       CRITERIA_SCORE_GREATER = 26,
+       CRITERIA_SCORE_LOWER = 27,
+       CRITERIA_SCORE_EQUAL = 28,
 
-       CRITERIA_SCORE_GREATER = 24,
-       CRITERIA_SCORE_LOWER = 25,
-       CRITERIA_SCORE_EQUAL = 26,
+       CRITERIA_TEST = 29,
 
-       CRITERIA_TEST = 27,
+       CRITERIA_SIZE_GREATER = 30,
+       CRITERIA_SIZE_SMALLER = 31,
+       CRITERIA_SIZE_EQUAL   = 32,
+       
+       CRITERIA_PARTIAL = 33,
 
-       CRITERIA_SIZE_GREATER = 28,
-       CRITERIA_SIZE_SMALLER = 29,
-       CRITERIA_SIZE_EQUAL   = 30,
+       CRITERIA_FOUND_IN_ADDRESSBOOK = 34,
        
-       CRITERIA_PARTIAL = 31
+       CRITERIA_TAG = 35,
+       CRITERIA_TAGGED = 36,
+
+       CRITERIA_HAS_ATTACHMENT = 37,
+       CRITERIA_SIGNED = 38,
+
+       CRITERIA_AGE_GREATER_HOURS = 39,
+       CRITERIA_AGE_LOWER_HOURS = 40
 };
 
-/*!
- *\brief       Descriptive text for conditions
- */
-static const gchar *criteria_text [] = {
-       N_("All messages"), N_("Subject"),
-       N_("From"), N_("To"), N_("Cc"), N_("To or Cc"),
-       N_("Newsgroups"), N_("In reply to"), N_("References"),
-       N_("Age greater than"), N_("Age lower than"),
-       N_("Header"), N_("Headers part"),
-       N_("Body part"), N_("Whole message"),
-       N_("Unread flag"), N_("New flag"),
-       N_("Marked flag"), N_("Deleted flag"),
-       N_("Replied flag"), N_("Forwarded flag"),
-       N_("Locked flag"),
-       N_("Color label"),
-       N_("Ignore thread"),
-       N_("Score greater than"), N_("Score lower than"),
-       N_("Score equal to"),
-       N_("Test"),
-       N_("Size greater than"), 
-       N_("Size smaller than"),
-       N_("Size exactly")
+enum {
+       MATCH_ALL       = 0,
+       MATCH_HEADER    = 1,
+       MATCH_AGE       = 2,
+       MATCH_PHRASE    = 3,
+       MATCH_FLAG      = 4,
+       MATCH_LABEL     = 5,
+       MATCH_THREAD    = 6,
+       MATCH_SCORE     = 7,
+       MATCH_SIZE      = 8,
+       MATCH_PARTIAL   = 9,
+       MATCH_ABOOK     = 10,
+       MATCH_TAGS      = 11,
+       MATCH_TEST      = 12
 };
 
-/*!
- *\brief       Boolean / predicate constants
- *
- *\warning     Same order as #bool_op_text!
- */
 enum {
-       BOOL_OP_OR = 0,
-       BOOL_OP_AND = 1
+       AGE_HOURS = 0,
+       AGE_DAYS  = 1,
+       AGE_WEEKS = 2
 };
 
-/*!
- *\brief       Descriptive text in UI
- */
-static const gchar *bool_op_text [] = {
-       N_("or"), N_("and")
+enum {
+       SIZE_UNIT_BYTES  = 0,
+       SIZE_UNIT_KBYTES = 1,
+       SIZE_UNIT_MBYTES = 2
+};
+
+#define MB_SIZE 0x100000
+#define KB_SIZE 0x000400
+
+enum {
+       THREAD_IGNORED = 0,
+       THREAD_NOT_IGNORED = 1,
+       THREAD_WATCHED = 2,
+       THREAD_NOT_WATCHED = 3
 };
 
 /*!
  *\brief       Contains predicate      
- *
- *\warning     Same order as in #predicate_text
  */
 enum {
        PREDICATE_CONTAINS = 0,
        PREDICATE_DOES_NOT_CONTAIN = 1
 };
 
-/*!
- *\brief       Descriptive text in UI for predicate
- */
-static const gchar *predicate_text [] = {
-       N_("contains"), N_("does not contain")
-};
-
 /*!
  *\brief       Enabled predicate
- *
- *\warning     Same order as in #predicate_flag_text
  */
 enum {
        PREDICATE_FLAG_ENABLED = 0,
        PREDICATE_FLAG_DISABLED = 1
 };
 
-/*!
- *\brief       Descriptive text in UI for enabled flag
- */
-static const gchar *predicate_flag_text [] = {
-       N_("yes"), N_("no")
-};
-
 /*!
  *\brief       Hooks
  */
@@ -221,7 +252,8 @@ static PrefsMatcherSignal *matchers_callback;
 static void prefs_matcher_create       (void);
 
 static void prefs_matcher_set_dialog   (MatcherList *matchers);
-static gint prefs_matcher_clist_set_row        (gint row, MatcherProp *prop);
+static void prefs_matcher_list_view_set_row    (GtkTreeIter *row, 
+                                                MatcherProp *prop);
 
 /* callback functions */
 
@@ -230,10 +262,6 @@ static void prefs_matcher_substitute_cb    (void);
 static void prefs_matcher_delete_cb    (void);
 static void prefs_matcher_up           (void);
 static void prefs_matcher_down         (void);
-static void prefs_matcher_select       (GtkCList       *clist,
-                                        gint            row,
-                                        gint            column,
-                                        GdkEvent       *event);
 static gboolean prefs_matcher_key_pressed(GtkWidget    *widget,
                                         GdkEventKey    *event,
                                         gpointer        data);
@@ -241,33 +269,164 @@ static void prefs_matcher_ok             (void);
 static void prefs_matcher_cancel       (void);
 static gint prefs_matcher_deleted      (GtkWidget *widget, GdkEventAny *event,
                                         gpointer data);
-static void prefs_matcher_criteria_select      (GtkList   *list,
-                                                GtkWidget *widget,
+static void prefs_matcher_criteria_select      (GtkWidget *widget,
                                                 gpointer   user_data);
+static void prefs_matcher_second_criteria_sel  (GtkWidget *widget,
+                                                gpointer   user_data);
+static void prefs_matcher_set_model            (GtkWidget *wiget,
+                                                GtkTreeModel *model);
 static MatcherList *prefs_matcher_get_list     (void);
 
+static GtkListStore* prefs_matcher_create_data_store   (void);
 
-/*!
- *\brief       Find index of list selection 
- *
- *\param       list GTK list widget
- *
- *\return      gint Selection index
- */
-static gint get_sel_from_list(GtkList *list)
+static void prefs_matcher_list_view_insert_matcher     (GtkWidget *list_view,
+                                                        GtkTreeIter *row_iter,
+                                                        const gchar *matcher,
+                                                        gboolean is_valid);
+
+static GtkWidget *prefs_matcher_list_view_create       (void);
+
+static void prefs_matcher_create_list_view_columns     (GtkWidget *list_view);
+
+static gboolean prefs_matcher_selected                 (GtkTreeSelection *selector,
+                                                        GtkTreeModel *model, 
+                                                        GtkTreePath *path,
+                                                        gboolean currently_selected,
+                                                        gpointer data);
+
+static int header_name_to_crit(const gchar *header)
 {
-       gint row = 0;
-       void * sel;
-       GList * child;
-
-       sel = list->selection->data;
-       for (child = list->children; child != NULL; child = g_list_next(child)) {
-               if (child->data == sel)
-                       return row;
-               row ++;
-       }
+       if (header == NULL)
+               return CRITERIA_HEADER;
+
+       if (!strcasecmp(header, "Subject"))
+               return CRITERIA_SUBJECT;
+       if (!strcasecmp(header, "From"))
+               return CRITERIA_FROM;
+       if (!strcasecmp(header, "To"))
+               return CRITERIA_TO;
+       if (!strcasecmp(header, "Cc"))
+               return CRITERIA_CC;
+       if (!strcasecmp(header, "To or Cc"))
+               return CRITERIA_TO_OR_CC;
+       if (!strcasecmp(header, "In-Reply-To"))
+               return CRITERIA_INREPLYTO;
+       if (!strcasecmp(header, "Newsgroups"))
+               return CRITERIA_NEWSGROUPS;
+       if (!strcasecmp(header, "References"))
+               return CRITERIA_REFERENCES;
+
+       return CRITERIA_HEADER;
+}
+
+static void prefs_matcher_models_create(void)
+{
+       GtkListStore *store;
+       GtkTreeIter iter;
+       
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("more than"), CRITERIA_AGE_GREATER);
+       COMBOBOX_ADD(store, _("less than"), CRITERIA_AGE_LOWER);
+       matcher.model_age = GTK_TREE_MODEL(store);
+
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("hours"), AGE_HOURS);
+       COMBOBOX_ADD(store, _("days"), AGE_DAYS);
+       COMBOBOX_ADD(store, _("weeks"), AGE_WEEKS);
+       matcher.model_age_units = GTK_TREE_MODEL(store);
+
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("higher than"), CRITERIA_SCORE_GREATER);
+       COMBOBOX_ADD(store, _("lower than"), CRITERIA_SCORE_LOWER);
+       COMBOBOX_ADD(store, _("exactly"), CRITERIA_SCORE_EQUAL);
+       matcher.model_score = GTK_TREE_MODEL(store);
+       
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("greater than"), CRITERIA_SIZE_GREATER);
+       COMBOBOX_ADD(store, _("smaller than"), CRITERIA_SIZE_SMALLER);
+       COMBOBOX_ADD(store, _("exactly"), CRITERIA_SIZE_EQUAL);
+       matcher.model_size = GTK_TREE_MODEL(store);
+
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("bytes"), SIZE_UNIT_BYTES);
+       COMBOBOX_ADD(store, _("kilobytes"), SIZE_UNIT_KBYTES);
+       COMBOBOX_ADD(store, _("megabytes"), SIZE_UNIT_MBYTES);
+       matcher.model_size_units = GTK_TREE_MODEL(store);
        
-       return row;
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("contains"), 0);
+       COMBOBOX_ADD(store, _("doesn't contain"), 0);
+       matcher.model_contain = GTK_TREE_MODEL(store);
+       
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, "Subject", CRITERIA_SUBJECT);
+       COMBOBOX_ADD(store, "From", CRITERIA_FROM);
+       COMBOBOX_ADD(store, "To", CRITERIA_TO);
+       COMBOBOX_ADD(store, "Cc", CRITERIA_CC);
+       COMBOBOX_ADD(store, "To or Cc", CRITERIA_TO_OR_CC);
+       COMBOBOX_ADD(store, "In-Reply-To", CRITERIA_INREPLYTO);
+       COMBOBOX_ADD(store, "Newsgroups", CRITERIA_NEWSGROUPS);
+       COMBOBOX_ADD(store, "References", CRITERIA_REFERENCES);
+       COMBOBOX_ADD(store, "Sender", CRITERIA_HEADER);
+       COMBOBOX_ADD(store, "X-ML-Name", CRITERIA_HEADER);
+       COMBOBOX_ADD(store, "X-List", CRITERIA_HEADER);
+       COMBOBOX_ADD(store, "X-Sequence", CRITERIA_HEADER);
+       COMBOBOX_ADD(store, "X-Mailer", CRITERIA_HEADER);
+       COMBOBOX_ADD(store, "X-BeenThere", CRITERIA_HEADER);
+       COMBOBOX_ADD(store, "List-Post", CRITERIA_HEADER);
+       COMBOBOX_ADD(store, "List-Id", CRITERIA_HEADER);
+       matcher.model_headers = GTK_TREE_MODEL(store);
+       
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("headers part"), CRITERIA_HEADERS_PART);
+       COMBOBOX_ADD(store, _("body part"), CRITERIA_BODY_PART);
+       COMBOBOX_ADD(store, _("whole message"), CRITERIA_MESSAGE);
+       matcher.model_phrase = GTK_TREE_MODEL(store);
+       
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("Unread"), CRITERIA_UNREAD);
+       COMBOBOX_ADD(store, _("New"), CRITERIA_NEW);
+       COMBOBOX_ADD(store, _("Marked"), CRITERIA_MARKED);
+       COMBOBOX_ADD(store, _("Deleted"), CRITERIA_DELETED);
+       COMBOBOX_ADD(store, _("Replied"), CRITERIA_REPLIED);
+       COMBOBOX_ADD(store, _("Forwarded"), CRITERIA_FORWARDED);
+       COMBOBOX_ADD(store, _("Locked"), CRITERIA_LOCKED);
+       COMBOBOX_ADD(store, _("Spam"), CRITERIA_SPAM);
+       COMBOBOX_ADD(store, _("Has attachment"), CRITERIA_HAS_ATTACHMENT);
+       COMBOBOX_ADD(store, _("Signed"), CRITERIA_SIGNED);
+       matcher.model_flags = GTK_TREE_MODEL(store);
+       
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("set"), 0);
+       COMBOBOX_ADD(store, _("not set"), 1);
+       matcher.model_set = GTK_TREE_MODEL(store);
+
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("yes"), CRITERIA_PARTIAL);
+       COMBOBOX_ADD(store, _("no"), CRITERIA_PARTIAL);
+       matcher.model_partial = GTK_TREE_MODEL(store);
+
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("Any tags"), CRITERIA_TAGGED);
+       COMBOBOX_ADD(store, _("Specific tag"), CRITERIA_TAG);
+       matcher.model_tags = GTK_TREE_MODEL(store);
+
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("ignored"), CRITERIA_IGNORE_THREAD);
+       COMBOBOX_ADD(store, _("not ignored"), CRITERIA_IGNORE_THREAD);
+       COMBOBOX_ADD(store, _("watched"), CRITERIA_WATCH_THREAD);
+       COMBOBOX_ADD(store, _("not watched"), CRITERIA_WATCH_THREAD);
+       matcher.model_thread = GTK_TREE_MODEL(store);
+       
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("found"), 0);
+       COMBOBOX_ADD(store, _("not found"), 1);
+       matcher.model_found = GTK_TREE_MODEL(store);
+
+       store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+       COMBOBOX_ADD(store, _("0 (Passed)"), 0);
+       COMBOBOX_ADD(store, _("non-0 (Failed)"), 1);
+       matcher.model_test = GTK_TREE_MODEL(store);
 }
 
 /*!
@@ -282,7 +441,14 @@ void prefs_matcher_open(MatcherList *matchers, PrefsMatcherSignal *cb)
        inc_lock();
 
        if (!matcher.window) {
+               prefs_matcher_models_create();
                prefs_matcher_create();
+       } else {
+#if !GTK_CHECK_VERSION(3, 0, 0)
+               /* update color label menu */
+               gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(matcher.color_optmenu),
+                               colorlabel_create_color_menu());
+#endif
        }
 
        manage_window_set_transient(GTK_WINDOW(matcher.window));
@@ -293,6 +459,19 @@ void prefs_matcher_open(MatcherList *matchers, PrefsMatcherSignal *cb)
        prefs_matcher_set_dialog(matchers);
 
        gtk_widget_show(matcher.window);
+       gtk_window_set_modal(GTK_WINDOW(matcher.window), TRUE);
+}
+
+/*!
+ *\brief       Save Gtk object size to prefs dataset
+ */
+static void prefs_matcher_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation)
+{
+       cm_return_if_fail(allocation != NULL);
+
+       prefs_common.matcherwin_width = allocation->width;
+       prefs_common.matcherwin_height = allocation->height;
 }
 
 /*!
@@ -307,31 +486,41 @@ static void prefs_matcher_create(void)
        GtkWidget *confirm_area;
 
        GtkWidget *vbox1;
-       GtkWidget *vbox2;
-       GtkWidget *vbox3;
-       GtkWidget *criteria_table;
-
-       GtkWidget *hbox1;
-
-       GtkWidget *header_combo;
-       GtkWidget *header_entry;
-       GtkWidget *header_label;
+       GtkWidget *frame;
+       GtkWidget *table;
+       GtkWidget *upper_hbox;
+       GtkWidget *lower_hbox;
+       GtkWidget *match_hbox;
        GtkWidget *criteria_combo;
-       GtkWidget *criteria_list;
        GtkWidget *criteria_label;
-       GtkWidget *value_label;
-       GtkWidget *value_entry;
-       GtkWidget *predicate_combo;
-       GtkWidget *predicate_list;
-       GtkWidget *predicate_flag_combo;
-       GtkWidget *predicate_flag_list;
-       GtkWidget *predicate_label;
+       GtkWidget *match_label;
+       GtkWidget *criteria_label2;
+       GtkWidget *headers_combo;
+       GtkWidget *match_combo2;
+       GtkWidget *match_label2;
+
+       GtkWidget *hbox;
+       GtkWidget *upper_filler;
+       GtkWidget *lower_filler;
+       
+       GtkWidget *criteria_combo2;
+       GtkWidget *header_entry;
+       GtkWidget *header_addr_combo;
+       GtkWidget *header_addr_entry;
+       GtkWidget *string_entry;
+       GtkWidget *addressbook_folder_combo;
+       GtkWidget *match_combo;
        GtkWidget *bool_op_combo;
-       GtkWidget *bool_op_list;
        GtkWidget *bool_op_label;
 
-       GtkWidget *regexp_chkbtn;
-       GtkWidget *case_chkbtn;
+       GtkWidget *numeric_hbox;
+       GtkWidget *numeric_entry;
+       GtkWidget *numeric_label;
+       
+#ifndef G_OS_WIN32
+       GtkWidget *regexp_checkbtn;
+#endif
+       GtkWidget *case_checkbtn;
 
        GtkWidget *reg_hbox;
        GtkWidget *btn_hbox;
@@ -342,36 +531,34 @@ static void prefs_matcher_create(void)
 
        GtkWidget *cond_hbox;
        GtkWidget *cond_scrolledwin;
-       GtkWidget *cond_clist;
+       GtkWidget *cond_list_view;
 
        GtkWidget *btn_vbox;
        GtkWidget *up_btn;
        GtkWidget *down_btn;
 
        GtkWidget *test_btn;
-
+       GtkWidget *addressbook_select_btn;
+#if !GTK_CHECK_VERSION(3, 0, 0)
        GtkWidget *color_optmenu;
+#endif
 
-       GList *combo_items;
-       gint i;
-
-       gchar *title[1];
+       static GdkGeometry geometry;
+       GtkSizeGroup *size_group;
+       GtkListStore *store;
+       GtkTreeIter iter;
 
        debug_print("Creating matcher configuration window...\n");
 
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-       gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-       gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_matcher");
+       gtk_container_set_border_width(GTK_CONTAINER(window), 4);
+       gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
 
        vbox = gtk_vbox_new(FALSE, 6);
-       gtk_widget_show(vbox);
        gtk_container_add(GTK_CONTAINER(window), vbox);
 
-       gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
-                               &cancel_btn, _("Cancel"), NULL, NULL);
-       gtk_widget_show(confirm_area);
+       gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK, NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_btn);
 
@@ -379,6 +566,8 @@ static void prefs_matcher_create(void)
                             _("Condition configuration"));
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(prefs_matcher_deleted), NULL);
+       g_signal_connect(G_OBJECT(window), "size_allocate",
+                        G_CALLBACK(prefs_matcher_size_allocate_cb), NULL);
        g_signal_connect(G_OBJECT(window), "key_press_event",
                         G_CALLBACK(prefs_matcher_key_pressed), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
@@ -388,287 +577,307 @@ static void prefs_matcher_create(void)
                         G_CALLBACK(prefs_matcher_cancel), NULL);
 
        vbox1 = gtk_vbox_new(FALSE, VSPACING);
-       gtk_widget_show(vbox1);
        gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
        gtk_container_set_border_width(GTK_CONTAINER (vbox1), 2);
 
-       criteria_table = gtk_table_new(2, 4, FALSE);
-       gtk_widget_show(criteria_table);
-
-       gtk_box_pack_start(GTK_BOX(vbox1), criteria_table, FALSE, FALSE, 0);
-       gtk_table_set_row_spacings(GTK_TABLE(criteria_table), 8);
-       gtk_table_set_col_spacings(GTK_TABLE(criteria_table), 8);
-
+       frame = gtk_frame_new(_("Rule"));
+       gtk_frame_set_label_align(GTK_FRAME(frame), 0.01, 0.5);
+       gtk_box_pack_start(GTK_BOX(vbox1), frame, FALSE, FALSE, 0);
+       
+       table = gtk_table_new(3, 3, FALSE);
+       gtk_container_add(GTK_CONTAINER(frame), table);
+       gtk_widget_set_size_request(frame, -1, -1);
+       
+       upper_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
+       hbox = gtk_hbox_new(FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), upper_hbox, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(""), TRUE, TRUE, 0);
+       gtk_table_attach(GTK_TABLE(table), hbox, 2, 3, 0, 1, 
+                       GTK_FILL, GTK_SHRINK, 2, 2);
+       
+       lower_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
+       hbox = gtk_hbox_new(FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), lower_hbox, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(""), TRUE, TRUE, 0);
+       gtk_table_attach(GTK_TABLE(table), hbox,2, 3, 1, 2, 
+                        GTK_FILL, GTK_SHRINK, 2, 2);
+       
+       size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+       gtk_size_group_add_widget(size_group, upper_hbox);
+       gtk_size_group_add_widget(size_group, lower_hbox);
+       
        /* criteria combo box */
-
-       criteria_label = gtk_label_new(_("Match type"));
-       gtk_widget_show(criteria_label);
-       gtk_misc_set_alignment(GTK_MISC(criteria_label), 0, 0.5);
-       gtk_table_attach(GTK_TABLE(criteria_table), criteria_label, 0, 1, 0, 1,
-                        GTK_FILL, 0, 0, 0);
-
-       criteria_combo = gtk_combo_new();
-       gtk_widget_show(criteria_combo);
-
-       combo_items = NULL;
-
-       for (i = 0; i < (gint) (sizeof(criteria_text) / sizeof(gchar *)); i++) {
-               combo_items = g_list_append(combo_items,
-                                           (gpointer) _(criteria_text[i]));
-       }
-       gtk_combo_set_popdown_strings(GTK_COMBO(criteria_combo), combo_items);
-
-       g_list_free(combo_items);
-
-       gtk_widget_set_usize(criteria_combo, 120, -1);
-       gtk_table_attach(GTK_TABLE(criteria_table), criteria_combo, 0, 1, 1, 2,
-                         0, 0, 0, 0);
-       criteria_list = GTK_COMBO(criteria_combo)->list;
-       g_signal_connect(G_OBJECT(criteria_list), "select-child",
+       criteria_label = gtk_label_new(_("Match criteria:"));
+       gtk_misc_set_alignment(GTK_MISC(criteria_label), 1, 0.5);
+       gtk_widget_set_size_request(criteria_label, -1, -1);
+       gtk_table_attach(GTK_TABLE(table), criteria_label, 0, 1, 0, 1, 
+                        GTK_FILL, GTK_SHRINK, 2, 2);
+
+       criteria_combo = gtkut_sc_combobox_create(NULL, FALSE);
+       store = GTK_LIST_STORE(gtk_combo_box_get_model(
+                               GTK_COMBO_BOX(criteria_combo)));
+       COMBOBOX_ADD(store, _("All messages"), 0);
+       COMBOBOX_ADD(store, _("Header"), 1);
+       COMBOBOX_ADD(store, _("Age"), 2);
+       COMBOBOX_ADD(store, _("Phrase"), 3);
+       COMBOBOX_ADD(store, _("Flags"), 4);
+       COMBOBOX_ADD(store, _("Color labels"), 5);
+       COMBOBOX_ADD(store, _("Thread"), 6);
+       COMBOBOX_ADD(store, _("Score"), 7);
+       COMBOBOX_ADD(store, _("Size"), 8);
+       COMBOBOX_ADD(store, _("Partially downloaded"), 9);
+       COMBOBOX_ADD(store, _("Address book"), 10);
+       COMBOBOX_ADD(store, _("Tags"), 11);
+       COMBOBOX_ADD(store, _("External program test"), 12);
+
+       gtk_widget_set_size_request(criteria_combo, 150, -1);
+       gtk_combo_box_set_active(GTK_COMBO_BOX(criteria_combo), MATCH_ALL);
+       gtk_table_attach(GTK_TABLE(table), criteria_combo, 1, 2, 0, 1,
+                        GTK_FILL, GTK_SHRINK, 2, 2);
+       g_signal_connect(G_OBJECT(criteria_combo), "changed",
                         G_CALLBACK(prefs_matcher_criteria_select),
                         NULL);
-
-       gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(criteria_combo)->entry),
-                              FALSE);
-
-       /* header name */
-
-       header_label = gtk_label_new(_("Header name"));
-       gtk_widget_show(header_label);
-       gtk_misc_set_alignment(GTK_MISC(header_label), 0, 0.5);
-       gtk_table_attach(GTK_TABLE(criteria_table), header_label, 1, 2, 0, 1,
-                        GTK_FILL, 0, 0, 0);
-
-       header_combo = gtk_combo_new();
-       gtk_widget_show(header_combo);
-       gtk_widget_set_usize(header_combo, 96, -1);
-       gtkut_combo_set_items(GTK_COMBO (header_combo),
-                             "Subject", "From", "To", "Cc", "Reply-To",
-                             "Sender", "X-ML-Name", "X-List", "X-Sequence",
-                             "X-Mailer","X-BeenThere",
-                             NULL);
-       gtk_table_attach(GTK_TABLE(criteria_table), header_combo, 1, 2, 1, 2,
-                        0, 0, 0, 0);
-       header_entry = GTK_COMBO(header_combo)->entry;
-       gtk_entry_set_editable(GTK_ENTRY(header_entry), TRUE);
-
-       /* value */
-
-       value_label = gtk_label_new(_("Value"));
-       gtk_widget_show(value_label);
-       gtk_misc_set_alignment(GTK_MISC (value_label), 0, 0.5);
-       gtk_table_attach(GTK_TABLE(criteria_table), value_label, 2, 3, 0, 1,
-                        GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
-
-       value_entry = gtk_entry_new();
-       gtk_widget_show(value_entry);
-       gtk_widget_set_usize(value_entry, 200, -1);
-       gtk_table_attach(GTK_TABLE(criteria_table), value_entry, 2, 3, 1, 2,
-                        GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
-
-       test_btn = gtk_button_new_with_label(_("Info ..."));
-       gtk_widget_show(test_btn);
-       gtk_table_attach(GTK_TABLE (criteria_table), test_btn, 3, 4, 1, 2,
-                        GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
-       g_signal_connect(G_OBJECT (test_btn), "clicked",
-                        G_CALLBACK(prefs_matcher_test_info),
+       
+       upper_filler = gtk_label_new("");
+       gtk_box_pack_start(GTK_BOX(upper_hbox), upper_filler, TRUE, TRUE, 0); 
+       
+       lower_filler = gtk_label_new("");
+       gtk_box_pack_start(GTK_BOX(lower_hbox), lower_filler, TRUE, TRUE, 0);
+                        
+       criteria_label2 = gtk_label_new("");
+       gtk_box_pack_start(GTK_BOX(upper_hbox), criteria_label2, FALSE, FALSE, 0);
+
+       /* headers combo box entry */
+#if !GTK_CHECK_VERSION(2, 24, 0)
+       headers_combo = gtk_combo_box_entry_new_with_model(matcher.model_headers, 0);
+#else
+       headers_combo = gtk_combo_box_new_with_model_and_entry(matcher.model_headers);
+       GtkCellRenderer *cell = gtk_cell_renderer_text_new();
+       gtk_cell_renderer_set_alignment(cell, 0.0, 0.5);
+       gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(headers_combo), cell, TRUE);
+       gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(headers_combo), 0);
+#endif
+       gtk_widget_set_size_request(headers_combo, 100, -1);
+       gtk_box_pack_start(GTK_BOX(upper_hbox), headers_combo, TRUE, TRUE, 0);
+       header_entry = gtk_bin_get_child(GTK_BIN((headers_combo)));
+       
+       criteria_combo2 = gtkut_sc_combobox_create(NULL, TRUE);
+       prefs_matcher_set_model(criteria_combo2, matcher.model_phrase);
+       gtk_box_pack_start(GTK_BOX(upper_hbox), criteria_combo2, TRUE, TRUE, 0);
+       g_signal_connect(G_OBJECT(criteria_combo2), "changed",
+                        G_CALLBACK(prefs_matcher_second_criteria_sel),
                         NULL);
 
-       color_optmenu = gtk_option_menu_new();
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(color_optmenu),
-                                colorlabel_create_color_menu());
-
-       /* predicate */
-
-       vbox2 = gtk_vbox_new(FALSE, VSPACING);
-       gtk_widget_show(vbox2);
-       gtk_box_pack_start(GTK_BOX(vbox1), vbox2, FALSE, FALSE, 0);
-
-       hbox1 = gtk_hbox_new(FALSE, 8);
-       gtk_widget_show(hbox1);
-       gtk_box_pack_start(GTK_BOX(vbox2), hbox1, FALSE, FALSE, 0);
-
-       predicate_label = gtk_label_new(_("Predicate"));
-       gtk_widget_show(predicate_label);
-       gtk_box_pack_start(GTK_BOX(hbox1), predicate_label,
-                          FALSE, FALSE, 0);
-
-       predicate_combo = gtk_combo_new();
-       gtk_widget_show(predicate_combo);
-       gtk_widget_set_usize(predicate_combo, 120, -1);
-       predicate_list = GTK_COMBO(predicate_combo)->list;
-       gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(predicate_combo)->entry),
-                              FALSE);
-
-       combo_items = NULL;
-
-       for (i = 0; i < (gint) (sizeof(predicate_text) / sizeof(gchar *)); i++) {
-               combo_items = g_list_append(combo_items,
-                                           (gpointer) _(predicate_text[i]));
-       }
-       gtk_combo_set_popdown_strings(GTK_COMBO(predicate_combo), combo_items);
+       /* book/folder value */
+       addressbook_folder_combo = combobox_text_new(TRUE, _("Any"), NULL);
+       gtk_widget_set_size_request(addressbook_folder_combo, 150, -1);
+       gtk_box_pack_start(GTK_BOX(upper_hbox), addressbook_folder_combo, TRUE, TRUE, 0);                        
 
-       g_list_free(combo_items);
+       addressbook_select_btn = gtk_button_new_with_label(_("Select..."));
+       gtk_box_pack_start(GTK_BOX(upper_hbox), addressbook_select_btn, FALSE, FALSE, 0);
+#ifndef USE_NEW_ADDRBOOK
+       g_signal_connect(G_OBJECT (addressbook_select_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_addressbook_select),
+                        NULL);
+#else
+       gtk_widget_set_sensitive(GTK_WIDGET(addressbook_select_btn), FALSE);
+#endif
+       match_label = gtk_label_new("");
+       gtk_misc_set_alignment(GTK_MISC(match_label), 1, 0.5);
+       gtk_table_attach(GTK_TABLE(table), match_label, 0, 1, 1, 2,
+                        GTK_FILL, GTK_SHRINK, 2, 2);
 
-       gtk_box_pack_start(GTK_BOX(hbox1), predicate_combo,
-                          FALSE, FALSE, 0);
+       match_hbox = gtk_hbox_new(FALSE, 0);
+       gtk_table_attach(GTK_TABLE(table), match_hbox, 1, 2, 1, 2,
+                        GTK_FILL, GTK_SHRINK, 2, 2); 
 
-       /* predicate flag */
+       match_combo = gtkut_sc_combobox_create(NULL, TRUE);
+       gtk_box_pack_start(GTK_BOX(match_hbox), match_combo, TRUE, TRUE, 0);
+       
+#if !GTK_CHECK_VERSION(3, 0, 0)
+       /* color labels combo */
+       color_optmenu = gtk_cmoption_menu_new();
+       gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(color_optmenu),
+                                colorlabel_create_color_menu());
+       gtk_box_pack_start(GTK_BOX(match_hbox), color_optmenu, FALSE, FALSE, 0);
+#endif
+       
+       /* address header name */
+       header_addr_combo = combobox_text_new(TRUE,
+                             C_("Filtering Matcher Menu", "All"), _("Any"),
+                             "From", "To", "Cc", "Reply-To", "Sender", NULL);
+       gtk_box_pack_start(GTK_BOX(match_hbox), header_addr_combo, FALSE, FALSE, 0);
+       header_addr_entry = gtk_bin_get_child(GTK_BIN((header_addr_combo)));
+       gtk_widget_set_size_request(header_addr_combo, 150, -1);
+       
+       match_label2 = gtk_label_new("");
+       gtk_box_pack_start(GTK_BOX(lower_hbox), match_label2, FALSE, FALSE, 0);
 
-       predicate_flag_combo = gtk_combo_new();
-       gtk_widget_hide(predicate_flag_combo);
-       gtk_widget_set_usize(predicate_flag_combo, 120, -1);
-       predicate_flag_list = GTK_COMBO(predicate_flag_combo)->list;
-       gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(predicate_flag_combo)->entry), FALSE);
+       /* numeric value */
+       numeric_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
+       gtk_box_pack_start(GTK_BOX(lower_hbox), numeric_hbox, FALSE, FALSE, 0);
 
-       combo_items = NULL;
+       numeric_entry = gtk_spin_button_new_with_range(0, 1000, 1);
+       gtk_spin_button_set_digits(GTK_SPIN_BUTTON(numeric_entry), 0);
+       gtk_box_pack_start(GTK_BOX(numeric_hbox), numeric_entry, FALSE, FALSE, 0);
+       
+       numeric_label = gtk_label_new("");
+       gtk_box_pack_start(GTK_BOX(numeric_hbox), numeric_label, FALSE, FALSE, 0);
+       gtk_box_pack_end(GTK_BOX(numeric_hbox), gtk_label_new(""), TRUE, TRUE, 0);
 
-       for (i = 0; i < (gint) (sizeof(predicate_text) / sizeof(gchar *)); i++) {
-               combo_items = g_list_append(combo_items, (gpointer) _(predicate_flag_text[i]));
-       }
-       gtk_combo_set_popdown_strings(GTK_COMBO(predicate_flag_combo),
-                                     combo_items);
+       match_combo2 = gtkut_sc_combobox_create(NULL, TRUE);
+       gtk_box_pack_start(GTK_BOX(lower_hbox), match_combo2, TRUE, TRUE, 0);
+       
+       /* string value */
+       string_entry = gtk_entry_new();
+       gtk_box_pack_start(GTK_BOX(lower_hbox), string_entry, TRUE, TRUE, 0);
 
-       g_list_free(combo_items);
+       hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
+       gtk_size_group_add_widget(size_group, hbox);
 
-       gtk_box_pack_start(GTK_BOX(hbox1), predicate_flag_combo,
-                          FALSE, FALSE, 0);
+       vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+       PACK_CHECK_BUTTON(vbox, case_checkbtn, _("Case sensitive"));
+#ifndef G_OS_WIN32
+       PACK_CHECK_BUTTON(vbox, regexp_checkbtn, _("Use regexp"));
+#endif
+       gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
 
-       vbox3 = gtk_vbox_new(FALSE, 0);
-       gtk_widget_show (vbox3);
-       gtk_box_pack_start(GTK_BOX(hbox1), vbox3, FALSE, FALSE, 0);
+       gtk_box_pack_end(GTK_BOX(hbox), gtk_label_new(""), TRUE, TRUE, 0);
+       gtk_table_attach(GTK_TABLE(table), hbox, 2, 3, 2, 3,
+                        GTK_FILL, GTK_SHRINK, 4, 0);
 
-       PACK_CHECK_BUTTON(vbox3, case_chkbtn, _("Case sensitive"));
-       PACK_CHECK_BUTTON(vbox3, regexp_chkbtn, _("Use regexp"));
+       /* test info button */
+       test_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
+       gtk_box_pack_start(GTK_BOX(lower_hbox), test_btn, FALSE, FALSE, 0);
+       g_signal_connect(G_OBJECT (test_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_test_info),
+                        window);
 
        /* register / substitute / delete */
-
-       reg_hbox = gtk_hbox_new(FALSE, 4);
-       gtk_widget_show(reg_hbox);
+       reg_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
        gtk_box_pack_start(GTK_BOX(vbox1), reg_hbox, FALSE, FALSE, 0);
 
        arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-       gtk_widget_show(arrow);
        gtk_box_pack_start(GTK_BOX(reg_hbox), arrow, FALSE, FALSE, 0);
-       gtk_widget_set_usize(arrow, -1, 16);
+       gtk_widget_set_size_request(arrow, -1, 16);
 
-       btn_hbox = gtk_hbox_new(TRUE, 4);
-       gtk_widget_show(btn_hbox);
+       btn_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
        gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
 
-       reg_btn = gtk_button_new_with_label(_("Add"));
-       gtk_widget_show(reg_btn);
+       reg_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
        gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(reg_btn), "clicked",
                         G_CALLBACK(prefs_matcher_register_cb), NULL);
 
-       subst_btn = gtk_button_new_with_label(_("  Replace  "));
-       gtk_widget_show(subst_btn);
+       subst_btn = gtkut_get_replace_btn(_("_Replace"));
        gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(subst_btn), "clicked",
                         G_CALLBACK(prefs_matcher_substitute_cb),
                         NULL);
 
-       del_btn = gtk_button_new_with_label(_("Delete"));
-       gtk_widget_show(del_btn);
+       del_btn = gtk_button_new_with_mnemonic (_("Re_move"));
+       gtk_button_set_image(GTK_BUTTON(del_btn),
+                       gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
        gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(prefs_matcher_delete_cb), NULL);
 
-       /* boolean operation */
-
-       bool_op_label = gtk_label_new(_("Boolean Op"));
-       gtk_misc_set_alignment(GTK_MISC(value_label), 0, 0.5);
-       gtk_widget_show(bool_op_label);
-       gtk_box_pack_start(GTK_BOX(btn_hbox), bool_op_label,
-                          FALSE, FALSE, 0);
-
-       bool_op_combo = gtk_combo_new();
-       gtk_widget_show(bool_op_combo);
-       gtk_widget_set_usize(bool_op_combo, 50, -1);
-       bool_op_list = GTK_COMBO(bool_op_combo)->list;
-       gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(bool_op_combo)->entry),
-                              FALSE);
-
-       combo_items = NULL;
-
-       for (i = 0; i < (gint) (sizeof(bool_op_text) / sizeof(gchar *)); i++) {
-               combo_items = g_list_append(combo_items,
-                                           (gpointer) _(bool_op_text[i]));
-       }
-       gtk_combo_set_popdown_strings(GTK_COMBO(bool_op_combo), combo_items);
-
-       g_list_free(combo_items);
-
-       gtk_box_pack_start(GTK_BOX(btn_hbox), bool_op_combo,
-                          FALSE, FALSE, 0);
-
-       cond_hbox = gtk_hbox_new(FALSE, 8);
-       gtk_widget_show(cond_hbox);
+       cond_hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
        gtk_box_pack_start(GTK_BOX(vbox1), cond_hbox, TRUE, TRUE, 0);
 
        cond_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
-       gtk_widget_show(cond_scrolledwin);
-       gtk_widget_set_usize(cond_scrolledwin, -1, 150);
+       gtk_widget_set_size_request(cond_scrolledwin, -1, 150);
        gtk_box_pack_start(GTK_BOX(cond_hbox), cond_scrolledwin,
                           TRUE, TRUE, 0);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(cond_scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
 
-       title[0] = _("Current condition rules");
-       cond_clist = gtk_clist_new_with_titles(1, title);
-       gtk_widget_show(cond_clist);
-       gtk_container_add(GTK_CONTAINER(cond_scrolledwin), cond_clist);
-       gtk_clist_set_column_width(GTK_CLIST(cond_clist), 0, 80);
-       gtk_clist_set_selection_mode(GTK_CLIST(cond_clist),
-                                    GTK_SELECTION_BROWSE);
-       GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(cond_clist)->column[0].button,
-                              GTK_CAN_FOCUS);
-       g_signal_connect(G_OBJECT(cond_clist), "select_row",
-                        G_CALLBACK(prefs_matcher_select), NULL);
-
-       btn_vbox = gtk_vbox_new(FALSE, 8);
-       gtk_widget_show(btn_vbox);
+       cond_list_view = prefs_matcher_list_view_create();                                     
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(cond_scrolledwin),
+                                           GTK_SHADOW_ETCHED_IN);
+       gtk_container_add(GTK_CONTAINER(cond_scrolledwin), cond_list_view);
+
+       btn_vbox = gtk_vbox_new(FALSE, VBOX_BORDER);
        gtk_box_pack_start(GTK_BOX(cond_hbox), btn_vbox, FALSE, FALSE, 0);
 
-       up_btn = gtk_button_new_with_label(_("Up"));
-       gtk_widget_show(up_btn);
+       up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
        gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(up_btn), "clicked",
                         G_CALLBACK(prefs_matcher_up), NULL);
 
-       down_btn = gtk_button_new_with_label(_("Down"));
-       gtk_widget_show(down_btn);
+       down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
        gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(down_btn), "clicked",
                         G_CALLBACK(prefs_matcher_down), NULL);
 
+       /* boolean operation */
+       GtkWidget *hbox_bool = gtk_hbox_new(FALSE, HSPACING_NARROW);
+       gtk_box_pack_start(GTK_BOX(vbox1), hbox_bool, FALSE, FALSE, 0);
+
+       bool_op_label = gtk_label_new(_("Message must match"));
+       gtk_box_pack_start(GTK_BOX(hbox_bool), bool_op_label,
+                          FALSE, FALSE, 0);
+
+       bool_op_combo = combobox_text_new(FALSE, _("at least one"), 
+                                         _("all"), NULL);
+       gtk_box_pack_start(GTK_BOX(hbox_bool), bool_op_combo,
+                          FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox_bool), gtk_label_new(_("of above rules")),
+                          FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox_bool), gtk_label_new(""),
+                          TRUE, TRUE, 0);
+       
+       if (!geometry.min_height) {
+               geometry.min_width = 550;
+               geometry.min_height = 368;
+       }
+
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+       gtk_widget_set_size_request(window, prefs_common.matcherwin_width,
+                                   prefs_common.matcherwin_height);
+
        gtk_widget_show_all(window);
 
        matcher.window    = window;
 
        matcher.ok_btn = ok_btn;
 
-       matcher.criteria_list = criteria_list;
-       matcher.header_combo = header_combo;
+       matcher.criteria_combo = criteria_combo;
+       matcher.criteria_combo2 = criteria_combo2;
        matcher.header_entry = header_entry;
-       matcher.header_label = header_label;
-       matcher.value_entry = value_entry;
-       matcher.value_label = value_label;
-       matcher.predicate_label = predicate_label;
-       matcher.predicate_list = predicate_list;
-       matcher.predicate_combo = predicate_combo;
-       matcher.predicate_flag_list = predicate_flag_list;
-       matcher.predicate_flag_combo = predicate_flag_combo;
-       matcher.case_chkbtn = case_chkbtn;
-       matcher.regexp_chkbtn = regexp_chkbtn;
-       matcher.bool_op_list = bool_op_list;
+       matcher.header_addr_combo = header_addr_combo;
+       matcher.header_addr_entry = header_addr_entry;
+       matcher.string_entry = string_entry;
+       matcher.numeric_entry = numeric_entry;
+       matcher.numeric_label = numeric_label;
+       matcher.addressbook_folder_combo = addressbook_folder_combo;
+       matcher.match_combo = match_combo;
+       matcher.case_checkbtn = case_checkbtn;
+#ifndef G_OS_WIN32
+       matcher.regexp_checkbtn = regexp_checkbtn;
+#endif
+       matcher.bool_op_combo = bool_op_combo;
        matcher.test_btn = test_btn;
+#ifndef USE_NEW_ADDRBOOK
+       matcher.addressbook_select_btn = addressbook_select_btn;
+#endif
+#if !GTK_CHECK_VERSION(3, 0, 0)
        matcher.color_optmenu = color_optmenu;
-       matcher.criteria_table = criteria_table;
+#endif
+       matcher.match_label = match_label;
+       matcher.criteria_label2 = criteria_label2;
+       matcher.headers_combo = headers_combo;
+       matcher.match_combo2 = match_combo2;
+       matcher.match_label2 = match_label2;
+       matcher.upper_filler = upper_filler;
+       matcher.lower_filler = lower_filler;
+       
+       matcher.cond_list_view = cond_list_view;
 
-       matcher.cond_clist = cond_clist;
+       matcher.selected_criteria = -1;
+       prefs_matcher_criteria_select(criteria_combo, NULL);
 }
 
 /*!
@@ -679,46 +888,85 @@ static void prefs_matcher_create(void)
  *
  *\return      gint Row index \a prop has been added
  */
-static gint prefs_matcher_clist_set_row(gint row, MatcherProp *prop)
+static void prefs_matcher_list_view_set_row(GtkTreeIter *row, MatcherProp *prop)
 {
-       GtkCList *clist = GTK_CLIST(matcher.cond_clist);
-       gchar *cond_str[1];
        gchar *matcher_str;
 
        if (prop == NULL) {
-               cond_str[0] = _("(New)");
-               return gtk_clist_append(clist, cond_str);
+               prefs_matcher_list_view_insert_matcher(matcher.cond_list_view,
+                                                      NULL, _("(New)"), FALSE);
+               return;                                                
        }
 
        matcher_str = matcherprop_to_string(prop);
-       cond_str[0] = matcher_str;
-       if (row < 0)
-               row = gtk_clist_append(clist, cond_str);
+       if (!row)
+               prefs_matcher_list_view_insert_matcher(matcher.cond_list_view,
+                                                      NULL, matcher_str,
+                                                      TRUE);
        else
-               gtk_clist_set_text(clist, row, 0, cond_str[0]);
+               prefs_matcher_list_view_insert_matcher(matcher.cond_list_view,
+                                                      row, matcher_str, 
+                                                      TRUE);
        g_free(matcher_str);
+}
+
+static gboolean match_combo2_model_set(void)
+{
+       GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(matcher.match_combo2));
+       if (model == matcher.model_age_units ||
+           model == matcher.model_found ||
+           model == matcher.model_partial ||
+           model == matcher.model_phrase ||
+           model == matcher.model_set ||
+           model == matcher.model_size_units ||
+           model == matcher.model_tags ||
+           model == matcher.model_thread)
+               return TRUE;
+       else
+               debug_print("match_combo2 model unset.\n");
 
-       return row;
+       return FALSE;
 }
 
-/*!
- *\brief       Clears a condition in the list widget
- */
-static void prefs_matcher_reset_condition(void)
+static gboolean match_combo_model_set(void)
 {
-       gtk_list_select_item(GTK_LIST(matcher.criteria_list), 0);
-       gtk_list_select_item(GTK_LIST(matcher.predicate_list), 0);
-       gtk_entry_set_text(GTK_ENTRY(matcher.header_entry), "");
-       gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), "");
+       GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(matcher.match_combo));
+       if (model == matcher.model_age ||
+           model == matcher.model_contain ||
+           model == matcher.model_flags ||
+           model == matcher.model_score ||
+           model == matcher.model_size ||
+           model == matcher.model_test)
+               return TRUE;
+       else
+               debug_print("match_combo model unset.\n");
+
+       return FALSE;
 }
 
 /*!
- *\brief       Update scrollbar
+ *\brief       Clears a condition in the list widget
  */
-static void prefs_matcher_update_hscrollbar(void)
+static void prefs_matcher_reset_condition(void)
 {
-       gint optwidth = gtk_clist_optimal_column_width(GTK_CLIST(matcher.cond_clist), 0);
-       gtk_clist_set_column_width(GTK_CLIST(matcher.cond_clist), 0, optwidth);
+       gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.criteria_combo), MATCH_ALL);
+       gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.criteria_combo2), 0);
+       if (match_combo_model_set())
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo), 0);
+       if (match_combo2_model_set())
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2), 0);
+#if !GTK_CHECK_VERSION(3, 0, 0)
+       gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(matcher.color_optmenu), 0);
+#endif
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(matcher.numeric_entry), 0);
+       gtk_entry_set_text(GTK_ENTRY(matcher.header_entry), "");
+       gtk_entry_set_text(GTK_ENTRY(matcher.header_addr_entry), "");
+       gtk_entry_set_text(GTK_ENTRY(matcher.string_entry), "");
+       gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))), "");
+#ifndef G_OS_WIN32
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
+#endif
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
 }
 
 /*!
@@ -728,32 +976,31 @@ static void prefs_matcher_update_hscrollbar(void)
  */
 static void prefs_matcher_set_dialog(MatcherList *matchers)
 {
-       GtkCList *clist = GTK_CLIST(matcher.cond_clist);
        GSList *cur;
        gboolean bool_op = 1;
+       GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model
+                               (GTK_TREE_VIEW(matcher.cond_list_view)));
 
-       gtk_clist_freeze(clist);
-       gtk_clist_clear(clist);
+       gtk_list_store_clear(store);                            
 
-       prefs_matcher_clist_set_row(-1, NULL);
+       prefs_matcher_list_view_set_row(NULL, NULL);
        if (matchers != NULL) {
                for (cur = matchers->matchers; cur != NULL;
                     cur = g_slist_next(cur)) {
                        MatcherProp *prop;
                        prop = (MatcherProp *) cur->data;
-                       prefs_matcher_clist_set_row(-1, prop);
+                       prefs_matcher_list_view_set_row(NULL, prop);
                }
 
                bool_op = matchers->bool_and;
        }
        
-       prefs_matcher_update_hscrollbar();
-
-       gtk_clist_thaw(clist);
-
-       gtk_list_select_item(GTK_LIST(matcher.bool_op_list), bool_op);
+       gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.bool_op_combo), bool_op);
 
        prefs_matcher_reset_condition();
+       
+       combobox_set_sensitive(GTK_COMBO_BOX(matcher.criteria_combo), MATCH_TAGS,
+                       (tags_get_size() > 0) ? TRUE : FALSE);
 }
 
 /*!
@@ -766,29 +1013,38 @@ static MatcherList *prefs_matcher_get_list(void)
 {
        gchar *matcher_str;
        MatcherProp *prop;
-       gint row = 1;
        gboolean bool_and;
        GSList *matcher_list;
        MatcherList *matchers;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
 
-       matcher_list = NULL;
+       model = gtk_tree_view_get_model(GTK_TREE_VIEW(matcher.cond_list_view));
+       if (!gtk_tree_model_get_iter_first(model, &iter))
+               return NULL;
 
-       while (gtk_clist_get_text(GTK_CLIST(matcher.cond_clist),
-                                 row, 0, &matcher_str)) {
+       matcher_list = NULL;
 
-               if (strcmp(matcher_str, _("(New)")) != 0) {
+       do {
+               gboolean is_valid;
+       
+               gtk_tree_model_get(model, &iter,
+                                  PREFS_MATCHER_COND, &matcher_str,
+                                  PREFS_MATCHER_COND_VALID, &is_valid,
+                                  -1);
+               
+               if (is_valid) {
                        /* tmp = matcher_str; */
                        prop = matcher_parser_get_prop(matcher_str);
-                       
+                       g_free(matcher_str);
                        if (prop == NULL)
                                break;
                        
                        matcher_list = g_slist_append(matcher_list, prop);
                }
-               row ++;
-       }
+       } while (gtk_tree_model_iter_next(model, &iter));
 
-       bool_and = get_sel_from_list(GTK_LIST(matcher.bool_op_list));
+       bool_and = gtk_combo_box_get_active(GTK_COMBO_BOX(matcher.bool_op_combo));
 
        matchers = matcherlist_new(matcher_list, bool_and);
 
@@ -830,15 +1086,29 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
        case MATCHCRITERIA_LOCKED:
        case MATCHCRITERIA_NOT_LOCKED:
                return CRITERIA_LOCKED;
+       case MATCHCRITERIA_NOT_SPAM:
+       case MATCHCRITERIA_SPAM:
+               return CRITERIA_SPAM;
+       case MATCHCRITERIA_HAS_ATTACHMENT:
+       case MATCHCRITERIA_HAS_NO_ATTACHMENT:
+               return CRITERIA_HAS_ATTACHMENT;
+       case MATCHCRITERIA_SIGNED:
+       case MATCHCRITERIA_NOT_SIGNED:
+               return CRITERIA_SIGNED;
        case MATCHCRITERIA_PARTIAL:
        case MATCHCRITERIA_NOT_PARTIAL:
                return CRITERIA_PARTIAL;
+#if !GTK_CHECK_VERSION(3, 0, 0)
        case MATCHCRITERIA_COLORLABEL:
        case MATCHCRITERIA_NOT_COLORLABEL:
                return CRITERIA_COLORLABEL;
+#endif
        case MATCHCRITERIA_IGNORE_THREAD:
        case MATCHCRITERIA_NOT_IGNORE_THREAD:
                return CRITERIA_IGNORE_THREAD;
+       case MATCHCRITERIA_WATCH_THREAD:
+       case MATCHCRITERIA_NOT_WATCH_THREAD:
+               return CRITERIA_WATCH_THREAD;
        case MATCHCRITERIA_NOT_SUBJECT:
        case MATCHCRITERIA_SUBJECT:
                return CRITERIA_SUBJECT;
@@ -863,19 +1133,28 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
        case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
        case MATCHCRITERIA_TO_OR_CC:
                return CRITERIA_TO_OR_CC;
+       case MATCHCRITERIA_NOT_TAG:
+       case MATCHCRITERIA_TAG:
+               return CRITERIA_TAG;
+       case MATCHCRITERIA_NOT_TAGGED:
+       case MATCHCRITERIA_TAGGED:
+               return CRITERIA_TAGGED;
        case MATCHCRITERIA_NOT_BODY_PART:
        case MATCHCRITERIA_BODY_PART:
                return CRITERIA_BODY_PART;
        case MATCHCRITERIA_NOT_MESSAGE:
        case MATCHCRITERIA_MESSAGE:
                return CRITERIA_MESSAGE;
-               break;
        case MATCHCRITERIA_NOT_HEADERS_PART:
        case MATCHCRITERIA_HEADERS_PART:
                return CRITERIA_HEADERS_PART;
        case MATCHCRITERIA_NOT_HEADER:
        case MATCHCRITERIA_HEADER:
                return CRITERIA_HEADER;
+       case MATCHCRITERIA_AGE_GREATER_HOURS:
+               return CRITERIA_AGE_GREATER_HOURS;
+       case MATCHCRITERIA_AGE_LOWER_HOURS:
+               return CRITERIA_AGE_LOWER_HOURS;
        case MATCHCRITERIA_AGE_GREATER:
                return CRITERIA_AGE_GREATER;
        case MATCHCRITERIA_AGE_LOWER:
@@ -895,6 +1174,9 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
                return CRITERIA_SIZE_SMALLER;
        case MATCHCRITERIA_SIZE_EQUAL:
                return CRITERIA_SIZE_EQUAL;
+       case MATCHCRITERIA_FOUND_IN_ADDRESSBOOK:
+       case MATCHCRITERIA_NOT_FOUND_IN_ADDRESSBOOK:
+               return CRITERIA_FOUND_IN_ADDRESSBOOK;
        default:
                return -1;
        }
@@ -927,12 +1209,22 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                return MATCHCRITERIA_FORWARDED;
        case CRITERIA_LOCKED:
                return MATCHCRITERIA_LOCKED;
+       case CRITERIA_SPAM:
+               return MATCHCRITERIA_SPAM;
+       case CRITERIA_HAS_ATTACHMENT:
+               return MATCHCRITERIA_HAS_ATTACHMENT;
+       case CRITERIA_SIGNED:
+               return MATCHCRITERIA_SIGNED;
        case CRITERIA_PARTIAL:
                return MATCHCRITERIA_PARTIAL;
+#if !GTK_CHECK_VERSION(3, 0, 0)
        case CRITERIA_COLORLABEL:
                return MATCHCRITERIA_COLORLABEL;
+#endif
        case CRITERIA_IGNORE_THREAD:
                return MATCHCRITERIA_IGNORE_THREAD;
+       case CRITERIA_WATCH_THREAD:
+               return MATCHCRITERIA_WATCH_THREAD;
        case CRITERIA_SUBJECT:
                return MATCHCRITERIA_SUBJECT;
        case CRITERIA_FROM:
@@ -943,6 +1235,10 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                return MATCHCRITERIA_CC;
        case CRITERIA_TO_OR_CC:
                return MATCHCRITERIA_TO_OR_CC;
+       case CRITERIA_TAG:
+               return MATCHCRITERIA_TAG;
+       case CRITERIA_TAGGED:
+               return MATCHCRITERIA_TAGGED;
        case CRITERIA_NEWSGROUPS:
                return MATCHCRITERIA_NEWSGROUPS;
        case CRITERIA_INREPLYTO:
@@ -953,6 +1249,10 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                return MATCHCRITERIA_AGE_GREATER;
        case CRITERIA_AGE_LOWER:
                return MATCHCRITERIA_AGE_LOWER;
+       case CRITERIA_AGE_GREATER_HOURS:
+               return MATCHCRITERIA_AGE_GREATER_HOURS;
+       case CRITERIA_AGE_LOWER_HOURS:
+               return MATCHCRITERIA_AGE_LOWER_HOURS;
        case CRITERIA_SCORE_GREATER:
                return MATCHCRITERIA_SCORE_GREATER;
        case CRITERIA_SCORE_LOWER:
@@ -975,6 +1275,8 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                return MATCHCRITERIA_SIZE_SMALLER;
        case CRITERIA_SIZE_EQUAL:
                return MATCHCRITERIA_SIZE_EQUAL;
+       case CRITERIA_FOUND_IN_ADDRESSBOOK:
+               return MATCHCRITERIA_FOUND_IN_ADDRESSBOOK;
        default:
                return -1;
        }
@@ -1005,12 +1307,22 @@ static gint prefs_matcher_not_criteria(gint matcher_criteria)
                return MATCHCRITERIA_NOT_FORWARDED;
        case MATCHCRITERIA_LOCKED:
                return MATCHCRITERIA_NOT_LOCKED;
+       case MATCHCRITERIA_SPAM:
+               return MATCHCRITERIA_NOT_SPAM;
+       case MATCHCRITERIA_HAS_ATTACHMENT:
+               return MATCHCRITERIA_HAS_NO_ATTACHMENT;
+       case MATCHCRITERIA_SIGNED:
+               return MATCHCRITERIA_NOT_SIGNED;
        case MATCHCRITERIA_PARTIAL:
                return MATCHCRITERIA_NOT_PARTIAL;
+#if !GTK_CHECK_VERSION(3, 0, 0)
        case MATCHCRITERIA_COLORLABEL:
                return MATCHCRITERIA_NOT_COLORLABEL;
+#endif
        case MATCHCRITERIA_IGNORE_THREAD:
                return MATCHCRITERIA_NOT_IGNORE_THREAD;
+       case MATCHCRITERIA_WATCH_THREAD:
+               return MATCHCRITERIA_NOT_WATCH_THREAD;
        case MATCHCRITERIA_SUBJECT:
                return MATCHCRITERIA_NOT_SUBJECT;
        case MATCHCRITERIA_FROM:
@@ -1021,6 +1333,10 @@ static gint prefs_matcher_not_criteria(gint matcher_criteria)
                return MATCHCRITERIA_NOT_CC;
        case MATCHCRITERIA_TO_OR_CC:
                return MATCHCRITERIA_NOT_TO_AND_NOT_CC;
+       case MATCHCRITERIA_TAG:
+               return MATCHCRITERIA_NOT_TAG;
+       case MATCHCRITERIA_TAGGED:
+               return MATCHCRITERIA_NOT_TAGGED;
        case MATCHCRITERIA_NEWSGROUPS:
                return MATCHCRITERIA_NOT_NEWSGROUPS;
        case MATCHCRITERIA_INREPLYTO:
@@ -1037,11 +1353,93 @@ static gint prefs_matcher_not_criteria(gint matcher_criteria)
                return MATCHCRITERIA_NOT_TEST;
        case MATCHCRITERIA_BODY_PART:
                return MATCHCRITERIA_NOT_BODY_PART;
+       case MATCHCRITERIA_FOUND_IN_ADDRESSBOOK:
+               return MATCHCRITERIA_NOT_FOUND_IN_ADDRESSBOOK;
        default:
                return matcher_criteria;
        }
 }
 
+static gint prefs_matcher_get_criteria(void)
+{
+       gint match_criteria = gtk_combo_box_get_active(GTK_COMBO_BOX(
+                                       matcher.criteria_combo));
+       const gchar *header = NULL;
+         
+       switch (match_criteria) {
+       case MATCH_ABOOK:
+               return CRITERIA_FOUND_IN_ADDRESSBOOK;   
+       case MATCH_ALL:
+               return CRITERIA_ALL;
+       case MATCH_AGE:
+       case MATCH_SCORE:
+       case MATCH_SIZE:
+       case MATCH_FLAG:
+               return combobox_get_active_data(GTK_COMBO_BOX(
+                                       matcher.match_combo));
+       case MATCH_HEADER:
+               header = gtk_entry_get_text(GTK_ENTRY(matcher.header_entry));
+               return header_name_to_crit(header);
+#if !GTK_CHECK_VERSION(3, 0, 0)
+       case MATCH_LABEL:
+               return CRITERIA_COLORLABEL;
+#endif
+       case MATCH_PARTIAL:
+               return CRITERIA_PARTIAL;
+       case MATCH_TEST:
+               return CRITERIA_TEST;
+       case MATCH_PHRASE:
+       case MATCH_TAGS:
+       case MATCH_THREAD:
+               return combobox_get_active_data(GTK_COMBO_BOX(
+                                       matcher.criteria_combo2));
+       }
+       
+       return -1;
+}
+
+static gint prefs_matcher_get_pred(const gint criteria)
+{
+       switch(criteria) {
+       case CRITERIA_SUBJECT:
+       case CRITERIA_FROM:
+       case CRITERIA_TO:
+       case CRITERIA_CC:
+       case CRITERIA_TO_OR_CC:
+       case CRITERIA_NEWSGROUPS:
+       case CRITERIA_INREPLYTO:
+       case CRITERIA_REFERENCES:
+       case CRITERIA_HEADER:
+       case CRITERIA_HEADERS_PART:
+       case CRITERIA_BODY_PART:
+       case CRITERIA_MESSAGE:
+       case CRITERIA_TAG:
+       case CRITERIA_TAGGED:
+       case CRITERIA_TEST:
+               return gtk_combo_box_get_active(GTK_COMBO_BOX(matcher.match_combo));
+       case CRITERIA_FOUND_IN_ADDRESSBOOK:
+       case CRITERIA_UNREAD:
+       case CRITERIA_NEW:
+       case CRITERIA_MARKED:
+       case CRITERIA_DELETED:
+       case CRITERIA_REPLIED:
+       case CRITERIA_FORWARDED:
+       case CRITERIA_LOCKED:
+       case CRITERIA_SPAM:
+       case CRITERIA_HAS_ATTACHMENT:
+       case CRITERIA_SIGNED:
+       case CRITERIA_COLORLABEL:
+               return gtk_combo_box_get_active(GTK_COMBO_BOX(matcher.match_combo2));
+       case CRITERIA_WATCH_THREAD:
+               return gtk_combo_box_get_active(GTK_COMBO_BOX(matcher.criteria_combo2)) - 2;
+       case CRITERIA_IGNORE_THREAD:
+       case CRITERIA_PARTIAL:
+               return gtk_combo_box_get_active(GTK_COMBO_BOX(matcher.criteria_combo2));
+       }
+       
+       return 0;
+}
+
 /*!
  *\brief       Converts the text in the selected row to a 
  *             matcher structure
@@ -1054,75 +1452,39 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        gint criteria;
        gint matchtype;
        gint value_pred;
-       gint value_pred_flag;
-       gint value_criteria;
+       gint value_criteria = prefs_matcher_get_criteria();
        gboolean use_regexp;
        gboolean case_sensitive;
        const gchar *header;
        const gchar *expr;
-       gint value;
-       const gchar *value_str;
+       gint value, sel;
 
-       value_criteria = get_sel_from_list(GTK_LIST(matcher.criteria_list));
+       if (value_criteria == -1)
+               return NULL;
 
-       criteria = prefs_matcher_get_matching_from_criteria(value_criteria);
+#ifndef G_OS_WIN32
+       use_regexp = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn));
+#else
+       use_regexp = FALSE;
+#endif
+       case_sensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn));
 
-       value_pred = get_sel_from_list(GTK_LIST(matcher.predicate_list));
-       value_pred_flag = get_sel_from_list(GTK_LIST(matcher.predicate_flag_list));
+       if (use_regexp) {
+               if (case_sensitive)
+                       matchtype = MATCHTYPE_REGEXP;
+               else
+                       matchtype = MATCHTYPE_REGEXPCASE;
+       }
+       else {
+               if (case_sensitive)
+                       matchtype = MATCHTYPE_MATCH;
+               else
+                       matchtype = MATCHTYPE_MATCHCASE;
+       }
 
-       use_regexp = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn));
-       case_sensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn));
-
-       switch (value_criteria) {
-       case CRITERIA_UNREAD:
-       case CRITERIA_NEW:
-       case CRITERIA_MARKED:
-       case CRITERIA_DELETED:
-       case CRITERIA_REPLIED:
-       case CRITERIA_FORWARDED:
-       case CRITERIA_LOCKED:
-       case CRITERIA_PARTIAL:
-       case CRITERIA_TEST:
-       case CRITERIA_COLORLABEL:
-       case CRITERIA_IGNORE_THREAD:
-               if (value_pred_flag == PREDICATE_FLAG_DISABLED)
-                       criteria = prefs_matcher_not_criteria(criteria);
-               break;
-       case CRITERIA_SUBJECT:
-       case CRITERIA_FROM:
-       case CRITERIA_TO:
-       case CRITERIA_CC:
-       case CRITERIA_TO_OR_CC:
-       case CRITERIA_NEWSGROUPS:
-       case CRITERIA_INREPLYTO:
-       case CRITERIA_REFERENCES:
-       case CRITERIA_HEADERS_PART:
-       case CRITERIA_BODY_PART:
-       case CRITERIA_MESSAGE:
-       case CRITERIA_AGE_GREATER:
-       case CRITERIA_AGE_LOWER:
-       case CRITERIA_HEADER:
-               if (value_pred == PREDICATE_DOES_NOT_CONTAIN)
-                       criteria = prefs_matcher_not_criteria(criteria);
-               break;
-       }
-
-       if (use_regexp) {
-               if (case_sensitive)
-                       matchtype = MATCHTYPE_REGEXP;
-               else
-                       matchtype = MATCHTYPE_REGEXPCASE;
-       }
-       else {
-               if (case_sensitive)
-                       matchtype = MATCHTYPE_MATCH;
-               else
-                       matchtype = MATCHTYPE_MATCHCASE;
-       }
-
-       header = NULL;
-       expr = NULL;
-       value = 0;
+       header = NULL;
+       expr = NULL;
+       value = 0;
 
        switch (value_criteria) {
        case CRITERIA_ALL:
@@ -1133,8 +1495,13 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        case CRITERIA_REPLIED:
        case CRITERIA_FORWARDED:
        case CRITERIA_LOCKED:
+       case CRITERIA_SPAM:
+       case CRITERIA_HAS_ATTACHMENT:
+       case CRITERIA_SIGNED:
        case CRITERIA_PARTIAL:
        case CRITERIA_IGNORE_THREAD:
+       case CRITERIA_WATCH_THREAD:
+       case CRITERIA_TAGGED:
                break;
 
        case CRITERIA_SUBJECT:
@@ -1142,53 +1509,129 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        case CRITERIA_TO:
        case CRITERIA_CC:
        case CRITERIA_TO_OR_CC:
+       case CRITERIA_TAG:
        case CRITERIA_NEWSGROUPS:
        case CRITERIA_INREPLYTO:
        case CRITERIA_REFERENCES:
        case CRITERIA_HEADERS_PART:
        case CRITERIA_BODY_PART:
        case CRITERIA_MESSAGE:
+               expr = gtk_entry_get_text(GTK_ENTRY(matcher.string_entry));
+               
+               if(*expr == '\0') {
+                       alertpanel_error(_("Search pattern is not set."));
+                       return NULL;
+               }
+               break;
+
        case CRITERIA_TEST:
-               expr = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
+               expr = gtk_entry_get_text(GTK_ENTRY(matcher.string_entry));
+               
+               if(*expr == '\0') {
+                       alertpanel_error(_("Test command is not set."));
+                       return NULL;
+               }
                break;
 
        case CRITERIA_AGE_GREATER:
        case CRITERIA_AGE_LOWER:
+               value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(
+                                                        matcher.numeric_entry));
+               sel = gtk_combo_box_get_active(GTK_COMBO_BOX(matcher.match_combo2));
+               if(sel == AGE_WEEKS)
+                       value *= 7;
+               else if (sel == AGE_HOURS) {
+                       if (value_criteria == CRITERIA_AGE_GREATER)
+                               value_criteria = CRITERIA_AGE_GREATER_HOURS;
+                       else 
+                               value_criteria = CRITERIA_AGE_LOWER_HOURS;
+               }
+               break;
+                       
        case CRITERIA_SCORE_GREATER:
        case CRITERIA_SCORE_LOWER:
        case CRITERIA_SCORE_EQUAL:
+               value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(
+                                                        matcher.numeric_entry));
+               break;
+                                                        
        case CRITERIA_SIZE_GREATER:
        case CRITERIA_SIZE_SMALLER:
        case CRITERIA_SIZE_EQUAL:
-               value_str = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
-
-               if (*value_str == '\0') {
-                   alertpanel_error(_("Value is not set."));
-                   return NULL;
-               }
-
-               value = atoi(value_str);
-
+               value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(
+                                                        matcher.numeric_entry));
+               sel = gtk_combo_box_get_active(GTK_COMBO_BOX(matcher.match_combo2));
+               if(sel == SIZE_UNIT_MBYTES)
+                       value *= MB_SIZE;
+               if(sel == SIZE_UNIT_KBYTES)
+                       value *= KB_SIZE;
                break;
                
+#if !GTK_CHECK_VERSION(3, 0, 0)
        case CRITERIA_COLORLABEL:
                value = colorlabel_get_color_menu_active_item
-                       (gtk_option_menu_get_menu(GTK_OPTION_MENU
+                       (gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU
                                (matcher.color_optmenu))); 
                break;
+#endif
 
        case CRITERIA_HEADER:
-
                header = gtk_entry_get_text(GTK_ENTRY(matcher.header_entry));
-               expr = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
+               expr = gtk_entry_get_text(GTK_ENTRY(matcher.string_entry));
 
                if (*header == '\0') {
                    alertpanel_error(_("Header name is not set."));
                    return NULL;
                }
+               
+               if(*expr == '\0') {
+                       alertpanel_error(_("Search pattern is not set."));
+                       return NULL;
+               } 
+               break;
+
+       case CRITERIA_FOUND_IN_ADDRESSBOOK:
+               header = gtk_entry_get_text(GTK_ENTRY(matcher.header_addr_entry));
+               expr = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))));
+
+               if (*header == '\0') {
+                   alertpanel_error(_("Header name is not set."));
+                   return NULL;
+               }
+               if (*expr == '\0') {
+                       gchar *tmp;
+
+                       if (g_utf8_collate(header, C_("Filtering Matcher Menu", "All")) == 0)
+                               tmp = g_strdup(_("all addresses in all headers"));
+                       else
+                       if (g_utf8_collate(header, _("Any")) == 0)
+                               tmp = g_strdup(_("any address in any header"));
+                       else
+                               tmp = g_strdup_printf(_("the address(es) in header '%s'"), header);
+                       alertpanel_error(_("Book/folder path is not set.\n\n"
+                                               "If you want to match %s against the whole address book, "
+                                               "you have to select '%s' from the book/folder drop-down list."),
+                                               tmp, _("Any"));
+                       g_free(tmp);
+                   return NULL;
+               }
+               /* store UNtranslated "Any"/"All" in matcher expressions */
+               if (g_utf8_collate(header, C_("Filtering Matcher Menu", "All")) == 0)
+                       header = "All";
+               else
+                       if (g_utf8_collate(header, _("Any")) == 0)
+                               header = "Any";
+               if (g_utf8_collate(expr, _("Any")) == 0)
+                       expr = "Any";
                break;
        }
 
+       criteria = prefs_matcher_get_matching_from_criteria(value_criteria);
+
+       value_pred = prefs_matcher_get_pred(value_criteria);
+       if(value_pred)
+               criteria = prefs_matcher_not_criteria(criteria);
+
        matcherprop = matcherprop_new(criteria, header, matchtype,
                                      expr, value);
 
@@ -1206,12 +1649,11 @@ static void prefs_matcher_register_cb(void)
        if (matcherprop == NULL)
                return;
 
-       prefs_matcher_clist_set_row(-1, matcherprop);
+       prefs_matcher_list_view_set_row(NULL, matcherprop);
 
        matcherprop_free(matcherprop);
-
+       
        prefs_matcher_reset_condition();
-       prefs_matcher_update_hscrollbar();
 }
 
 /*!
@@ -1219,26 +1661,31 @@ static void prefs_matcher_register_cb(void)
  */
 static void prefs_matcher_substitute_cb(void)
 {
-       GtkCList *clist = GTK_CLIST(matcher.cond_clist);
-       gint row;
        MatcherProp *matcherprop;
+       GtkTreeIter row;
+       GtkTreeSelection *selection;
+       GtkTreeModel *model;
+       gboolean is_valid;
 
-       if (!clist->selection) return;
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row == 0)
+       selection = gtk_tree_view_get_selection
+                       (GTK_TREE_VIEW(matcher.cond_list_view));
+       
+       if (!gtk_tree_selection_get_selected(selection, &model, &row))
                return;
        
+       gtk_tree_model_get(model, &row, 
+                          PREFS_MATCHER_COND_VALID, &is_valid,
+                          -1);
+       if (!is_valid)
+               return;
+
        matcherprop = prefs_matcher_dialog_to_matcher();
        if (matcherprop == NULL)
                return;
 
-       prefs_matcher_clist_set_row(row, matcherprop);
+       prefs_matcher_list_view_set_row(&row, matcherprop);
 
        matcherprop_free(matcherprop);
-
-       prefs_matcher_reset_condition();
-       
-       prefs_matcher_update_hscrollbar();
 }
 
 /*!
@@ -1246,19 +1693,27 @@ static void prefs_matcher_substitute_cb(void)
  */
 static void prefs_matcher_delete_cb(void)
 {
-       GtkCList *clist = GTK_CLIST(matcher.cond_clist);
-       gint row;
+       GtkTreeIter row;
+       GtkTreeSelection *selection;
+       GtkTreeModel *model;
+       gboolean is_valid;
+
+       selection = gtk_tree_view_get_selection
+                       (GTK_TREE_VIEW(matcher.cond_list_view));
+       
+       if (!gtk_tree_selection_get_selected(selection, &model, &row))
+               return;
+               
+       gtk_tree_model_get(model, &row, 
+                          PREFS_MATCHER_COND_VALID, &is_valid,
+                          -1);
 
-       if (!clist->selection) return;
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row == 0)
+       if (!is_valid)
                return;
 
-       gtk_clist_remove(clist, row);
+       gtk_list_store_remove(GTK_LIST_STORE(model), &row);             
 
        prefs_matcher_reset_condition();
-
-       prefs_matcher_update_hscrollbar();
 }
 
 /*!
@@ -1266,17 +1721,43 @@ static void prefs_matcher_delete_cb(void)
  */
 static void prefs_matcher_up(void)
 {
-       GtkCList *clist = GTK_CLIST(matcher.cond_clist);
-       gint row;
-
-       if (!clist->selection) return;
-
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row > 1) {
-               gtk_clist_row_move(clist, row, row - 1);
-               if (gtk_clist_row_is_visible(clist, row - 1) != GTK_VISIBILITY_FULL)
-                       gtk_clist_moveto(clist, row - 1, 0, 0, 0);
+       GtkTreePath *prev, *sel, *try;
+       GtkTreeIter isel;
+       GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
+       GtkTreeIter iprev;
+       
+       if (!gtk_tree_selection_get_selected
+               (gtk_tree_view_get_selection
+                       (GTK_TREE_VIEW(matcher.cond_list_view)),
+                &model,        
+                &isel))
+               return;
+       store = (GtkListStore *)model;
+       sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
+       if (!sel)
+               return;
+       
+       /* no move if we're at row 0 or 1, looks phony, but other
+        * solutions are more convoluted... */
+       try = gtk_tree_path_copy(sel);
+       if (!gtk_tree_path_prev(try) || !gtk_tree_path_prev(try)) {
+               gtk_tree_path_free(try);
+               gtk_tree_path_free(sel);
+               return;
        }
+       gtk_tree_path_free(try);
+
+       prev = gtk_tree_path_copy(sel);         
+       if (gtk_tree_path_prev(prev)) {
+               gtk_tree_model_get_iter(GTK_TREE_MODEL(store),
+                                       &iprev, prev);
+               gtk_list_store_swap(store, &iprev, &isel);
+               /* XXX: GTK2 select row?? */
+       }
+
+       gtk_tree_path_free(sel);
+       gtk_tree_path_free(prev);
 }
 
 /*!
@@ -1284,372 +1765,309 @@ static void prefs_matcher_up(void)
  */
 static void prefs_matcher_down(void)
 {
-       GtkCList *clist = GTK_CLIST(matcher.cond_clist);
-       gint row;
+       GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
+       GtkTreeIter next, sel;
+       GtkTreePath *try;
+       
+       if (!gtk_tree_selection_get_selected
+               (gtk_tree_view_get_selection
+                       (GTK_TREE_VIEW(matcher.cond_list_view)),
+                &model,
+                &sel))
+               return;
+       store = (GtkListStore *)model;
+       try = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &sel);
+       if (!try) 
+               return;
+       
+       /* move when not at row 0 ... */
+       if (gtk_tree_path_prev(try)) {
+               next = sel;
+               if (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &next))
+                       gtk_list_store_swap(store, &next, &sel);
+       }
+               
+       gtk_tree_path_free(try);
+}
+
+static void prefs_matcher_enable_widget(GtkWidget* widget, const gboolean enable)
+{
+       cm_return_if_fail(widget != NULL);
+
+       if(enable == TRUE) {
+               gtk_widget_set_sensitive(widget, TRUE);
+               gtk_widget_show(widget);        
+       } else {
+               gtk_widget_set_sensitive(widget, FALSE);
+               gtk_widget_hide(widget);
+       }
+}
 
-       if (!clist->selection) return;
+static void prefs_matcher_set_model(GtkWidget *widget, GtkTreeModel *model)
+{
+       cm_return_if_fail(widget != NULL);
+       cm_return_if_fail(model != NULL);
+       
+       gtk_combo_box_set_model(GTK_COMBO_BOX(widget), model);
+       gtk_combo_box_set_active(GTK_COMBO_BOX(widget), 0);
+}
 
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row >= 1 && row < clist->rows - 1) {
-               gtk_clist_row_move(clist, row, row + 1);
-               if (gtk_clist_row_is_visible(clist, row + 1) != GTK_VISIBILITY_FULL)
-                       gtk_clist_moveto(clist, row + 1, 0, 1, 0);
+static void prefs_matcher_second_criteria_sel(GtkWidget *widget,
+                                             gpointer user_data)
+{
+       gint criteria = gtk_combo_box_get_active(GTK_COMBO_BOX(
+                                               matcher.criteria_combo));
+       gint criteria2 = combobox_get_active_data(GTK_COMBO_BOX(
+                                               matcher.criteria_combo2));
+       
+       if(criteria != MATCH_PHRASE && criteria != MATCH_TAGS) return;
+       
+       if(criteria == MATCH_PHRASE) {
+               switch(criteria2) {
+               case CRITERIA_HEADERS_PART:
+                       gtk_label_set_text(GTK_LABEL(matcher.match_label),
+                                       _("Headers part"));
+                       break;
+               case CRITERIA_BODY_PART:
+                       gtk_label_set_text(GTK_LABEL(matcher.match_label),
+                                       _("Body part"));
+                       break;  
+               case CRITERIA_MESSAGE:
+                       gtk_label_set_text(GTK_LABEL(matcher.match_label),
+                                       _("Whole message"));
+                       break;
+               }
+       }
+       
+       if(criteria == MATCH_TAGS) {
+               if(criteria2 == CRITERIA_TAGGED) {
+                       prefs_matcher_enable_widget(matcher.upper_filler, FALSE);
+                       prefs_matcher_enable_widget(matcher.match_label2, TRUE);
+                       prefs_matcher_enable_widget(matcher.string_entry, FALSE);
+                       prefs_matcher_enable_widget(matcher.case_checkbtn, FALSE);
+#ifndef G_OS_WIN32
+                       prefs_matcher_enable_widget(matcher.regexp_checkbtn, FALSE);
+#endif
+               } else {
+                       prefs_matcher_enable_widget(matcher.upper_filler, TRUE);
+                       prefs_matcher_enable_widget(matcher.match_label2, FALSE);
+                       prefs_matcher_enable_widget(matcher.string_entry, TRUE);
+                       prefs_matcher_enable_widget(matcher.case_checkbtn, TRUE);
+#ifndef G_OS_WIN32
+                       prefs_matcher_enable_widget(matcher.regexp_checkbtn, TRUE);
+                       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
+                                               matcher.regexp_checkbtn), FALSE);
+#endif
+                       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
+                                               matcher.case_checkbtn), FALSE);
+               }
        }
 }
 
+#define MATCH_COMBO_IS_ENABLED(x) (x != MATCH_ALL && x != MATCH_ABOOK && \
+               x != MATCH_PARTIAL && x != MATCH_THREAD && x != MATCH_LABEL) ? TRUE : FALSE
+#define MATCH_CASE_REGEXP(x) (x == MATCH_HEADER || x == MATCH_PHRASE) ? TRUE : FALSE 
+#define MATCH_NUMERIC(x) (x == MATCH_AGE || x == MATCH_SCORE || \
+                         x == MATCH_SIZE) ? TRUE : FALSE
+
 /*!
- *\brief       Signal handler for select row.
+ *\brief       Change widgets depending on the selected condition
  *
- *\param       clist List widget
- *\param       row Selected row
- *\param       column Selected column
- *\param       event Event information
+ *\param       criteria combo widget
+ *\param       user_data Not used      
  */
-static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
-                                GdkEvent *event)
+static void prefs_matcher_criteria_select(GtkWidget *widget,
+                                         gpointer user_data)
 {
-       gchar *matcher_str;
-       MatcherProp *prop;
-       gboolean negative_cond;
-       gint criteria;
-
-       if (!gtk_clist_get_text(GTK_CLIST(matcher.cond_clist),
-                               row, 0, &matcher_str))
-               return;
-
-       negative_cond = FALSE;
+       gint value, old_value;
 
-       if (row == 0) {
-               prefs_matcher_reset_condition();
-               return;
-       }
+       old_value = matcher.selected_criteria;
+       matcher.selected_criteria = value = gtk_combo_box_get_active
+               (GTK_COMBO_BOX(matcher.criteria_combo));
 
-       prop = matcher_parser_get_prop(matcher_str);
-       if (prop == NULL)
+       if (old_value == matcher.selected_criteria)
                return;
 
-       criteria = prefs_matcher_get_criteria_from_matching(prop->criteria);
-       if (criteria != -1)
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    criteria);
-
-       switch(prop->criteria) {
-       case MATCHCRITERIA_NOT_UNREAD:
-       case MATCHCRITERIA_NOT_NEW:
-       case MATCHCRITERIA_NOT_MARKED:
-       case MATCHCRITERIA_NOT_DELETED:
-       case MATCHCRITERIA_NOT_REPLIED:
-       case MATCHCRITERIA_NOT_FORWARDED:
-       case MATCHCRITERIA_NOT_LOCKED:
-       case MATCHCRITERIA_NOT_PARTIAL:
-       case MATCHCRITERIA_NOT_COLORLABEL:
-       case MATCHCRITERIA_NOT_IGNORE_THREAD:
-       case MATCHCRITERIA_NOT_SUBJECT:
-       case MATCHCRITERIA_NOT_FROM:
-       case MATCHCRITERIA_NOT_TO:
-       case MATCHCRITERIA_NOT_CC:
-       case MATCHCRITERIA_NOT_NEWSGROUPS:
-       case MATCHCRITERIA_NOT_INREPLYTO:
-       case MATCHCRITERIA_NOT_REFERENCES:
-       case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
-       case MATCHCRITERIA_NOT_BODY_PART:
-       case MATCHCRITERIA_NOT_MESSAGE:
-       case MATCHCRITERIA_NOT_HEADERS_PART:
-       case MATCHCRITERIA_NOT_HEADER:
-               negative_cond = TRUE;
+       prefs_matcher_enable_widget(matcher.criteria_label2,
+                                   (value == MATCH_ABOOK   ||
+                                    value == MATCH_PHRASE  ||
+                                    value == MATCH_HEADER  ||
+                                    value == MATCH_PARTIAL ||
+                                    value == MATCH_TAGS    ||
+                                    value == MATCH_THREAD));
+       prefs_matcher_enable_widget(matcher.headers_combo,
+                                   (value == MATCH_HEADER));
+       prefs_matcher_enable_widget(matcher.criteria_combo2,
+                                   (value == MATCH_PHRASE  ||
+                                    value == MATCH_PARTIAL ||
+                                    value == MATCH_TAGS    ||
+                                    value == MATCH_THREAD));
+       prefs_matcher_enable_widget(matcher.match_combo2,
+                                   (value == MATCH_ABOOK ||
+                                    value == MATCH_AGE   ||
+                                    value == MATCH_FLAG  ||
+                                    value == MATCH_LABEL ||
+                                    value == MATCH_SIZE));
+       prefs_matcher_enable_widget(matcher.match_label2,
+                                   (value == MATCH_ABOOK ||
+                                    value == MATCH_FLAG  ||
+                                    value == MATCH_LABEL ||
+                                    value == MATCH_TAGS));
+       prefs_matcher_enable_widget(matcher.header_addr_combo,
+                                   (value == MATCH_ABOOK));
+       prefs_matcher_enable_widget(matcher.string_entry,
+                                   (MATCH_CASE_REGEXP(value) ||
+                                    value == MATCH_TEST));
+       prefs_matcher_enable_widget(matcher.numeric_entry,
+                                   MATCH_NUMERIC(value));
+       prefs_matcher_enable_widget(matcher.numeric_label,
+                                   (value == MATCH_SCORE));
+       prefs_matcher_enable_widget(matcher.addressbook_folder_combo,
+                                   (value == MATCH_ABOOK));
+       prefs_matcher_enable_widget(matcher.match_combo,
+                                   MATCH_COMBO_IS_ENABLED(value));
+       prefs_matcher_enable_widget(matcher.case_checkbtn,
+                                   MATCH_CASE_REGEXP(value));
+#ifndef G_OS_WIN32
+       prefs_matcher_enable_widget(matcher.regexp_checkbtn,
+                                   MATCH_CASE_REGEXP(value));
+#endif
+       prefs_matcher_enable_widget(matcher.test_btn,
+                                   (value == MATCH_TEST));
+       prefs_matcher_enable_widget(matcher.addressbook_select_btn,
+                                   (value == MATCH_ABOOK));
+#if !GTK_CHECK_VERSION(3, 0, 0)
+       prefs_matcher_enable_widget(matcher.color_optmenu,
+                                   (value == MATCH_LABEL));
+#endif
+       prefs_matcher_enable_widget(matcher.upper_filler,
+                                   MATCH_CASE_REGEXP(value));
+       prefs_matcher_enable_widget(matcher.lower_filler,
+                                   (value == MATCH_ABOOK));
+                               
+       gtk_label_set_text(GTK_LABEL(matcher.match_label), "");
+       gtk_entry_set_text(GTK_ENTRY(matcher.string_entry), "");
+
+       switch(value) {
+       case MATCH_ABOOK:
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.header_addr_combo), 0);  
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.addressbook_folder_combo), 0);
+               prefs_matcher_set_model(matcher.match_combo2, matcher.model_found);
+               gtk_label_set_text(GTK_LABEL(matcher.criteria_label2), _("in"));
+               gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Header"));
+               gtk_label_set_text(GTK_LABEL(matcher.match_label2), _("content is"));
                break;
-       }
-       
-       switch(prop->criteria) {
-       case MATCHCRITERIA_ALL:
+       case MATCH_AGE:
+               prefs_matcher_set_model(matcher.match_combo, matcher.model_age);
+               prefs_matcher_set_model(matcher.match_combo2, matcher.model_age_units);
+               gtk_spin_button_set_range(GTK_SPIN_BUTTON(
+                                 matcher.numeric_entry), 0, 1000);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(matcher.numeric_entry), 0);
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2), AGE_DAYS);
+               gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Age is"));
                break;
-
-       case MATCHCRITERIA_NOT_SUBJECT:
-       case MATCHCRITERIA_NOT_FROM:
-       case MATCHCRITERIA_NOT_TO:
-       case MATCHCRITERIA_NOT_CC:
-       case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
-       case MATCHCRITERIA_NOT_NEWSGROUPS:
-       case MATCHCRITERIA_NOT_INREPLYTO:
-       case MATCHCRITERIA_NOT_REFERENCES:
-       case MATCHCRITERIA_NOT_HEADERS_PART:
-       case MATCHCRITERIA_NOT_BODY_PART:
-       case MATCHCRITERIA_NOT_MESSAGE:
-       case MATCHCRITERIA_SUBJECT:
-       case MATCHCRITERIA_FROM:
-       case MATCHCRITERIA_TO:
-       case MATCHCRITERIA_CC:
-       case MATCHCRITERIA_TO_OR_CC:
-       case MATCHCRITERIA_NEWSGROUPS:
-       case MATCHCRITERIA_INREPLYTO:
-       case MATCHCRITERIA_REFERENCES:
-       case MATCHCRITERIA_HEADERS_PART:
-       case MATCHCRITERIA_BODY_PART:
-       case MATCHCRITERIA_MESSAGE:
-       case MATCHCRITERIA_TEST:
-               gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), prop->expr);
+       case MATCH_FLAG:
+               prefs_matcher_set_model(matcher.match_combo, matcher.model_flags);
+               prefs_matcher_set_model(matcher.match_combo2, matcher.model_set);
+               gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Flag"));
+               gtk_label_set_text(GTK_LABEL(matcher.match_label2), _("is"));
                break;
-
-       case MATCHCRITERIA_AGE_GREATER:
-       case MATCHCRITERIA_AGE_LOWER:
-       case MATCHCRITERIA_SCORE_GREATER:
-       case MATCHCRITERIA_SCORE_LOWER:
-       case MATCHCRITERIA_SCORE_EQUAL:
-       case MATCHCRITERIA_SIZE_GREATER:
-       case MATCHCRITERIA_SIZE_SMALLER:
-       case MATCHCRITERIA_SIZE_EQUAL:
-               gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), itos(prop->value));
+       case MATCH_HEADER:
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.headers_combo), 0);
+               prefs_matcher_set_model(matcher.match_combo, matcher.model_contain);
+               gtk_label_set_text(GTK_LABEL(matcher.criteria_label2), _("Name:"));
+               gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Header"));
+#ifndef G_OS_WIN32
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
+#endif
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
                break;
-
-       case MATCHCRITERIA_NOT_COLORLABEL:
-       case MATCHCRITERIA_COLORLABEL:
-               gtk_option_menu_set_history(GTK_OPTION_MENU(matcher.color_optmenu),
-                                           prop->value);
+#if !GTK_CHECK_VERSION(3, 0, 0)
+       case MATCH_LABEL:
+               gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(matcher.color_optmenu), 0);
+               prefs_matcher_set_model(matcher.match_combo2, matcher.model_set);
+               gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Label"));
+               gtk_label_set_text(GTK_LABEL(matcher.match_label2), _("is"));
                break;
-
-       case MATCHCRITERIA_NOT_HEADER:
-       case MATCHCRITERIA_HEADER:
-               gtk_entry_set_text(GTK_ENTRY(matcher.header_entry), prop->header);
-               gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), prop->expr);
+#endif
+       case MATCH_PARTIAL:
+               prefs_matcher_set_model(matcher.criteria_combo2, matcher.model_partial);
+               gtk_label_set_text(GTK_LABEL(matcher.criteria_label2), _("Value:"));
                break;
-       }
-
-       if (negative_cond)
-               gtk_list_select_item(GTK_LIST(matcher.predicate_list), 1);
-       else
-               gtk_list_select_item(GTK_LIST(matcher.predicate_list), 0);
-
-       switch(prop->matchtype) {
-       case MATCHTYPE_MATCH:
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), FALSE);
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn), TRUE);
+       case MATCH_PHRASE:
+               prefs_matcher_set_model(matcher.criteria_combo2, matcher.model_phrase);
+               prefs_matcher_set_model(matcher.match_combo, matcher.model_contain);
+               gtk_label_set_text(GTK_LABEL(matcher.criteria_label2), _("in"));
+#ifndef G_OS_WIN32
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
+#endif
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
+               prefs_matcher_second_criteria_sel(NULL, NULL);
+               break;  
+       case MATCH_SCORE:
+               prefs_matcher_set_model(matcher.match_combo, matcher.model_score);
+               gtk_spin_button_set_range(GTK_SPIN_BUTTON(
+                                         matcher.numeric_entry), -1000, 1000);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(matcher.numeric_entry), 0);
+               gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Score is"));
+               gtk_label_set_text(GTK_LABEL(matcher.numeric_label), _("points"));
+               break;  
+       case MATCH_SIZE:
+               prefs_matcher_set_model(matcher.match_combo, matcher.model_size);
+               prefs_matcher_set_model(matcher.match_combo2, matcher.model_size_units);
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2),
+                                        SIZE_UNIT_KBYTES);
+               gtk_spin_button_set_range(GTK_SPIN_BUTTON(
+                                         matcher.numeric_entry), 0, 100000);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(matcher.numeric_entry), 0);
+               gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Size is"));
                break;
-
-       case MATCHTYPE_MATCHCASE:
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), FALSE);
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn), FALSE);
+       case MATCH_TAGS:
+               prefs_matcher_set_model(matcher.criteria_combo2, matcher.model_tags);
+               prefs_matcher_set_model(matcher.match_combo, matcher.model_contain);
+               gtk_label_set_text(GTK_LABEL(matcher.criteria_label2), _("Scope:"));
+               gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Message"));
+               gtk_label_set_text(GTK_LABEL(matcher.match_label2), _("tags"));
+               prefs_matcher_second_criteria_sel(NULL, NULL);
                break;
-
-       case MATCHTYPE_REGEXP:
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), TRUE);
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn), TRUE);
+       case MATCH_THREAD:
+               prefs_matcher_set_model(matcher.criteria_combo2, matcher.model_thread);
+               gtk_label_set_text(GTK_LABEL(matcher.criteria_label2), _("type is"));
                break;
-
-       case MATCHTYPE_REGEXPCASE:
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), TRUE);
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn), FALSE);
+       case MATCH_TEST:
+               prefs_matcher_set_model(matcher.match_combo, matcher.model_test);
+               gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Program returns"));
                break;
-       }
+       }       
 }
 
 /*!
- *\brief       Helper function that allows us to replace the 'Value' entry box
- *             by another widget.
+ *\brief       Handle key press
  *
- *\param       old_widget Widget that needs to be removed.
- *\param       new_widget Replacement widget
+ *\param       widget Widget receiving key press
+ *\param       event Key event
+ *\param       data User data
  */
-static void prefs_matcher_set_value_widget(GtkWidget *old_widget, 
-                                          GtkWidget *new_widget)
+static gboolean prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
+                                    gpointer data)
 {
-       /* TODO: find out why the following spews harmless "parent errors" */
-
-       /* NOTE: we first need to bump up the refcount of the old_widget,
-        * because the gtkut_container_remove() will otherwise destroy it */
-       gtk_widget_ref(old_widget);
-       gtkut_container_remove(GTK_CONTAINER(matcher.criteria_table), old_widget);
-       gtk_widget_show(new_widget);
-       gtk_widget_set_usize(new_widget, 200, -1);
-       gtk_table_attach(GTK_TABLE(matcher.criteria_table), new_widget, 
-                        2, 3, 1, 2, 
-                        GTK_FILL | GTK_SHRINK | GTK_EXPAND, 
-                        0, 0, 0);
+       if (event && event->keyval == GDK_KEY_Escape) {
+               prefs_matcher_cancel();
+               return TRUE;            
+       }
+       return FALSE;
 }
 
 /*!
- *\brief       Change widgets depending on the selected condition
- *
- *\param       list List widget
- *\param       widget Not used
- *\param       user_data Not used      
+ *\brief       Cancel matcher dialog
  */
-static void prefs_matcher_criteria_select(GtkList *list,
-                                         GtkWidget *widget,
-                                         gpointer user_data)
+static void prefs_matcher_cancel(void)
 {
-       gint value, old_value;
-
-       old_value = matcher.selected_criteria;
-       matcher.selected_criteria = value = get_sel_from_list
-               (GTK_LIST(matcher.criteria_list));
-       
-       /* CLAWS: the value widget is currently either the color label combo box,
-        * or a GtkEntry, so kiss for now */
-       if (matcher.selected_criteria == CRITERIA_COLORLABEL) { 
-               prefs_matcher_set_value_widget(matcher.value_entry, 
-                                              matcher.color_optmenu);
-       } else if (old_value == CRITERIA_COLORLABEL) {
-               prefs_matcher_set_value_widget(matcher.color_optmenu,
-                                              matcher.value_entry);
-       }                                              
-
-       switch (value) {
-       case CRITERIA_ALL:
-               gtk_widget_set_sensitive(matcher.header_combo, FALSE);
-               gtk_widget_set_sensitive(matcher.header_label, FALSE);
-               gtk_widget_set_sensitive(matcher.value_label, FALSE);
-               gtk_widget_set_sensitive(matcher.value_entry, FALSE);
-               gtk_widget_set_sensitive(matcher.predicate_label, FALSE);
-               gtk_widget_set_sensitive(matcher.predicate_combo, FALSE);
-               gtk_widget_set_sensitive(matcher.predicate_flag_combo, FALSE);
-               gtk_widget_hide(matcher.predicate_combo);
-               gtk_widget_show(matcher.predicate_flag_combo);
-               gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
-               gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
-               gtk_widget_set_sensitive(matcher.test_btn, FALSE);
-               break;
-
-       case CRITERIA_UNREAD:
-       case CRITERIA_NEW:
-       case CRITERIA_MARKED:
-       case CRITERIA_DELETED:
-       case CRITERIA_REPLIED:
-       case CRITERIA_FORWARDED:
-       case CRITERIA_LOCKED:
-       case CRITERIA_PARTIAL:
-       case CRITERIA_IGNORE_THREAD:
-               gtk_widget_set_sensitive(matcher.header_combo, FALSE);
-               gtk_widget_set_sensitive(matcher.header_label, FALSE);
-               gtk_widget_set_sensitive(matcher.value_label, FALSE);
-               gtk_widget_set_sensitive(matcher.value_entry, FALSE);
-               gtk_widget_set_sensitive(matcher.predicate_label, TRUE);
-               gtk_widget_set_sensitive(matcher.predicate_combo, FALSE);
-               gtk_widget_set_sensitive(matcher.predicate_flag_combo, TRUE);
-               gtk_widget_hide(matcher.predicate_combo);
-               gtk_widget_show(matcher.predicate_flag_combo);
-               gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
-               gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
-               gtk_widget_set_sensitive(matcher.test_btn, FALSE);
-               break;
-               
-       case CRITERIA_COLORLABEL:
-               gtk_widget_set_sensitive(matcher.header_combo, FALSE);
-               gtk_widget_set_sensitive(matcher.header_label, FALSE);
-               gtk_widget_set_sensitive(matcher.value_label, TRUE);
-               gtk_widget_set_sensitive(matcher.predicate_label, TRUE);
-               gtk_widget_set_sensitive(matcher.predicate_combo, FALSE);
-               gtk_widget_set_sensitive(matcher.predicate_flag_combo, TRUE);
-               gtk_widget_hide(matcher.predicate_combo);
-               gtk_widget_show(matcher.predicate_flag_combo);
-               gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
-               gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
-               gtk_widget_set_sensitive(matcher.test_btn, FALSE);
-               break;
-
-       case CRITERIA_SUBJECT:
-       case CRITERIA_FROM:
-       case CRITERIA_TO:
-       case CRITERIA_CC:
-       case CRITERIA_TO_OR_CC:
-       case CRITERIA_NEWSGROUPS:
-       case CRITERIA_INREPLYTO:
-       case CRITERIA_REFERENCES:
-       case CRITERIA_HEADERS_PART:
-       case CRITERIA_BODY_PART:
-       case CRITERIA_MESSAGE:
-               gtk_widget_set_sensitive(matcher.header_combo, FALSE);
-               gtk_widget_set_sensitive(matcher.header_label, FALSE);
-               gtk_widget_set_sensitive(matcher.value_label, TRUE);
-               gtk_widget_set_sensitive(matcher.value_entry, TRUE);
-               gtk_widget_set_sensitive(matcher.predicate_label, TRUE);
-               gtk_widget_set_sensitive(matcher.predicate_combo, TRUE);
-               gtk_widget_set_sensitive(matcher.predicate_flag_combo, FALSE);
-               gtk_widget_show(matcher.predicate_combo);
-               gtk_widget_hide(matcher.predicate_flag_combo);
-               gtk_widget_set_sensitive(matcher.case_chkbtn, TRUE);
-               gtk_widget_set_sensitive(matcher.regexp_chkbtn, TRUE);
-               gtk_widget_set_sensitive(matcher.test_btn, FALSE);
-               break;
-
-       case CRITERIA_TEST:
-               gtk_widget_set_sensitive(matcher.header_combo, FALSE);
-               gtk_widget_set_sensitive(matcher.header_label, FALSE);
-               gtk_widget_set_sensitive(matcher.value_label, TRUE);
-               gtk_widget_set_sensitive(matcher.value_entry, TRUE);
-               gtk_widget_set_sensitive(matcher.predicate_label, TRUE);
-               gtk_widget_set_sensitive(matcher.predicate_combo, FALSE);
-               gtk_widget_set_sensitive(matcher.predicate_flag_combo, TRUE);
-               gtk_widget_hide(matcher.predicate_combo);
-               gtk_widget_show(matcher.predicate_flag_combo);
-               gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
-               gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
-               gtk_widget_set_sensitive(matcher.test_btn, TRUE);
-               break;
-
-       case CRITERIA_AGE_GREATER:
-       case CRITERIA_AGE_LOWER:
-       case CRITERIA_SCORE_GREATER:
-       case CRITERIA_SCORE_LOWER:
-       case CRITERIA_SCORE_EQUAL:
-       case CRITERIA_SIZE_GREATER:
-       case CRITERIA_SIZE_SMALLER:
-       case CRITERIA_SIZE_EQUAL:
-               gtk_widget_set_sensitive(matcher.header_combo, FALSE);
-               gtk_widget_set_sensitive(matcher.header_label, FALSE);
-               gtk_widget_set_sensitive(matcher.value_label, TRUE);
-               gtk_widget_set_sensitive(matcher.value_entry, TRUE);
-               gtk_widget_set_sensitive(matcher.predicate_label, FALSE);
-               gtk_widget_set_sensitive(matcher.predicate_combo, FALSE);
-               gtk_widget_set_sensitive(matcher.predicate_flag_combo, FALSE);
-               gtk_widget_show(matcher.predicate_combo);
-               gtk_widget_hide(matcher.predicate_flag_combo);
-               gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
-               gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
-               gtk_widget_set_sensitive(matcher.test_btn, FALSE);
-               break;
-
-       case CRITERIA_HEADER:
-               gtk_widget_set_sensitive(matcher.header_combo, TRUE);
-               gtk_widget_set_sensitive(matcher.header_label, TRUE);
-               gtk_widget_set_sensitive(matcher.value_label, TRUE);
-               gtk_widget_set_sensitive(matcher.value_entry, TRUE);
-               gtk_widget_set_sensitive(matcher.predicate_label, TRUE);
-               gtk_widget_set_sensitive(matcher.predicate_combo, TRUE);
-               gtk_widget_set_sensitive(matcher.predicate_flag_combo, FALSE);
-               gtk_widget_show(matcher.predicate_combo);
-               gtk_widget_hide(matcher.predicate_flag_combo);
-               gtk_widget_set_sensitive(matcher.case_chkbtn, TRUE);
-               gtk_widget_set_sensitive(matcher.regexp_chkbtn, TRUE);
-               gtk_widget_set_sensitive(matcher.test_btn, FALSE);
-               break;
-       }
-}
-
-/*!
- *\brief       Handle key press
- *
- *\param       widget Widget receiving key press
- *\param       event Key event
- *\param       data User data
- */
-static gboolean prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
-                                    gpointer data)
-{
-       if (event && event->keyval == GDK_Escape) {
-               prefs_matcher_cancel();
-               return TRUE;            
-       }
-       return FALSE;
-}
-
-/*!
- *\brief       Cancel matcher dialog
- */
-static void prefs_matcher_cancel(void)
-{
-       gtk_widget_hide(matcher.window);
-       inc_unlock();
-}
+       gtk_widget_hide(matcher.window);
+       gtk_window_set_modal(GTK_WINDOW(matcher.window), FALSE);
+       inc_unlock();
+}
 
 /*!
  *\brief       Accept current matchers
@@ -1659,9 +2077,11 @@ static void prefs_matcher_ok(void)
        MatcherList *matchers;
        MatcherProp *matcherprop;
        AlertValue val;
-       gchar *matcher_str;
-       gchar *str;
+       gchar *matcher_str = NULL;
+       gchar *str = NULL;
        gint row = 1;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
 
        matchers = prefs_matcher_get_list();
 
@@ -1669,31 +2089,43 @@ static void prefs_matcher_ok(void)
                matcherprop = prefs_matcher_dialog_to_matcher();
                if (matcherprop != NULL) {
                        str = matcherprop_to_string(matcherprop);
-                       if(strcmp(str, "all") != 0) {
-                               while (gtk_clist_get_text(GTK_CLIST(matcher.cond_clist),
-                                                 row, 0, &matcher_str)) {
-                                       if (strcmp(matcher_str, str) == 0) break;
+                       matcherprop_free(matcherprop);
+                       if (strcmp(str, "all") != 0) {
+                               model = gtk_tree_view_get_model(GTK_TREE_VIEW
+                                               (matcher.cond_list_view));
+
+                               while (gtk_tree_model_iter_nth_child(model, &iter, NULL, row)) {
+                                       gtk_tree_model_get(model, &iter,
+                                                          PREFS_MATCHER_COND, &matcher_str,
+                                                          -1);
+                                       if (matcher_str && strcmp(matcher_str, str) == 0) 
+                                               break;
                                        row++;
+                                       g_free(matcher_str);
+                                       matcher_str = NULL;
                                }
 
-                               if (strcmp(matcher_str, str) != 0) {
+                               if (!matcher_str || strcmp(matcher_str, str) != 0) {
                                        val = alertpanel(_("Entry not saved"),
-                                                        _("The entry was not saved\nHave you really finished?"),
-                                                        _("Yes"), _("No"), NULL);
+                                                        _("The entry was not saved.\nClose anyway?"),
+                                                        GTK_STOCK_CLOSE, _("+_Continue editing"), NULL);
                                        if (G_ALERTDEFAULT != val) {
+                                               g_free(matcher_str);                                             
                                                g_free(str);
                                                return;
                                        }
                                }
+                               g_free(matcher_str);
                        }
                }
                 g_free(str);
                gtk_widget_hide(matcher.window);
-               inc_unlock();
+               gtk_window_set_modal(GTK_WINDOW(matcher.window), FALSE);
                if (matchers_callback != NULL)
                        matchers_callback(matchers);
                matcherlist_free(matchers);
        }
+       inc_unlock();
 }
 
 /*!
@@ -1718,11 +2150,7 @@ static gint prefs_matcher_deleted(GtkWidget *widget, GdkEventAny *event,
  * When adding new lines, remember to put 2 strings for each line
  */
 static gchar *test_desc_strings[] = {
-       N_("'Test' allows you to test a message or message element"), NULL,
-       N_("using an external program or script. The program will"), NULL,
-       N_("return either 0 or 1"), NULL,
-       N_("The following symbols can be used:"), NULL,
-       "%%",   "%",
+       "%%",   N_("literal %"),
        "%s",   N_("Subject"),
        "%f",   N_("From"),
        "%t",   N_("To"),
@@ -1731,7 +2159,7 @@ static gchar *test_desc_strings[] = {
        "%i",   N_("Message-ID"),
        "%n",   N_("Newsgroups"),
        "%r",   N_("References"),
-       "%F",   N_("Filename - should not be modified"),
+       "%F",   N_("filename (should not be modified)"),
        "\\n",  N_("new line"),
        "\\",   N_("escape character for quotes"),
        "\\\"", N_("quote character"),
@@ -1739,9 +2167,15 @@ static gchar *test_desc_strings[] = {
 };
 
 static DescriptionWindow test_desc_win = { 
+       NULL,
         NULL, 
+       TRUE,
         2,
         N_("Match Type: 'Test'"),
+       N_("'Test' allows you to test a message or message element "
+          "using an external program or script. The program will "
+          "return either 0 or 1.\n\n"
+          "The following symbols can be used:"),
         test_desc_strings
 };
 
@@ -1750,8 +2184,488 @@ static DescriptionWindow test_desc_win = {
 /*!
  *\brief       Show Test action's info
  */
-void prefs_matcher_test_info(void)
+static void prefs_matcher_test_info(GtkWidget *widget, GtkWidget *parent)
 {
+       test_desc_win.parent = parent;
        description_window_create(&test_desc_win);
 }
 
+#ifndef USE_NEW_ADDRBOOK
+static void prefs_matcher_addressbook_select(void)
+{
+       const gchar *folderpath = NULL;
+       gchar *new_path = NULL;
+
+       folderpath = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))));
+       new_path = addressbook_folder_selection(folderpath);
+       if (new_path) {
+               gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))), new_path);
+               g_free(new_path);
+       } 
+}
+#endif
+
+/*
+ * list view
+ */
+
+static GtkListStore* prefs_matcher_create_data_store(void)
+{
+       return gtk_list_store_new(N_PREFS_MATCHER_COLUMNS,
+                                 G_TYPE_STRING,        
+                                 G_TYPE_BOOLEAN,
+                                 -1);
+}
+
+static void prefs_matcher_list_view_insert_matcher(GtkWidget *list_view,
+                                                  GtkTreeIter *row_iter,
+                                                  const gchar *matcher,
+                                                  gboolean is_valid) 
+{
+       GtkTreeIter iter;
+       GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model
+                                       (GTK_TREE_VIEW(list_view)));
+
+       if (row_iter == NULL) {
+               /* append new */
+               gtk_list_store_append(list_store, &iter);
+       } else {
+               /* change existing */
+               iter = *row_iter;
+       }
+
+       gtk_list_store_set(list_store, &iter,
+                          PREFS_MATCHER_COND, matcher,
+                          PREFS_MATCHER_COND_VALID, is_valid,
+                          -1);
+}
+
+static GtkWidget *prefs_matcher_list_view_create(void)
+{
+       GtkTreeView *list_view;
+       GtkTreeSelection *selector;
+       GtkTreeModel *model;
+
+       model = GTK_TREE_MODEL(prefs_matcher_create_data_store());
+       list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
+       g_object_unref(model);  
+       
+       gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+       gtk_tree_view_set_reorderable(list_view, TRUE);
+       
+       selector = gtk_tree_view_get_selection(list_view);
+       gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
+       gtk_tree_selection_set_select_function(selector, prefs_matcher_selected,
+                                              NULL, NULL);
+
+       /* create the columns */
+       prefs_matcher_create_list_view_columns(GTK_WIDGET(list_view));
+
+       return GTK_WIDGET(list_view);
+}
+
+static void prefs_matcher_create_list_view_columns(GtkWidget *list_view)
+{
+       GtkTreeViewColumn *column;
+       GtkCellRenderer *renderer;
+
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Current condition rules"),
+                renderer,
+                "text", PREFS_MATCHER_COND,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
+}
+
+static void prefs_matcher_set_criteria(const gint criteria)
+{
+       gint match_criteria = 0;
+       
+       switch (criteria) {
+       case CRITERIA_FOUND_IN_ADDRESSBOOK:
+               match_criteria = MATCH_ABOOK;
+               break;  
+       case CRITERIA_ALL:
+               match_criteria = MATCH_ALL;
+               break;
+       case CRITERIA_AGE_GREATER:
+       case CRITERIA_AGE_LOWER:
+       case CRITERIA_AGE_GREATER_HOURS:
+       case CRITERIA_AGE_LOWER_HOURS:
+               match_criteria = MATCH_AGE;
+               break;
+       case CRITERIA_SCORE_GREATER:
+       case CRITERIA_SCORE_LOWER:
+       case CRITERIA_SCORE_EQUAL:
+               match_criteria = MATCH_SCORE;
+               break;
+       case CRITERIA_SIZE_GREATER:
+       case CRITERIA_SIZE_SMALLER:
+       case CRITERIA_SIZE_EQUAL:
+               match_criteria = MATCH_SIZE;
+               break;
+       case CRITERIA_SUBJECT:
+       case CRITERIA_FROM:
+       case CRITERIA_TO:
+       case CRITERIA_CC:
+       case CRITERIA_TO_OR_CC:
+       case CRITERIA_NEWSGROUPS:
+       case CRITERIA_INREPLYTO:
+       case CRITERIA_REFERENCES:
+       case CRITERIA_HEADER:
+               match_criteria = MATCH_HEADER;
+               break;
+       case CRITERIA_HEADERS_PART:
+       case CRITERIA_BODY_PART:
+       case CRITERIA_MESSAGE:
+               match_criteria = MATCH_PHRASE;
+               break;
+       case CRITERIA_TEST:
+               match_criteria = MATCH_TEST;
+               break;
+#if !GTK_CHECK_VERSION(3, 0, 0)
+       case CRITERIA_COLORLABEL:
+               match_criteria = MATCH_LABEL;
+               break;
+#endif
+       case CRITERIA_TAG:
+       case CRITERIA_TAGGED:
+               match_criteria = MATCH_TAGS;
+               break;
+       case CRITERIA_UNREAD:
+       case CRITERIA_NEW:
+       case CRITERIA_MARKED:
+       case CRITERIA_DELETED:
+       case CRITERIA_REPLIED:
+       case CRITERIA_FORWARDED:
+       case CRITERIA_LOCKED:
+       case CRITERIA_SPAM:
+       case CRITERIA_HAS_ATTACHMENT:
+       case CRITERIA_SIGNED:
+               match_criteria = MATCH_FLAG;
+               break;
+       case CRITERIA_PARTIAL:
+               match_criteria = MATCH_PARTIAL;
+               break;
+       case CRITERIA_IGNORE_THREAD:
+       case CRITERIA_WATCH_THREAD:
+               match_criteria = MATCH_THREAD;
+               break;
+       }
+       
+       gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.criteria_combo),
+                                match_criteria);
+       
+       switch(match_criteria) {
+       case MATCH_HEADER:
+               if(criteria != CRITERIA_HEADER)
+                       combobox_select_by_data(GTK_COMBO_BOX(
+                                               matcher.headers_combo),
+                                               criteria);
+               break;
+       case MATCH_AGE:
+       case MATCH_SCORE:
+       case MATCH_SIZE:
+       case MATCH_FLAG:
+               combobox_select_by_data(GTK_COMBO_BOX(
+                                       matcher.match_combo), criteria);
+               break;
+       case MATCH_PHRASE:
+       case MATCH_TAGS:
+               combobox_select_by_data(GTK_COMBO_BOX(
+                                       matcher.criteria_combo2), criteria);
+               break;
+       }
+}
+
+static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
+                                      GtkTreeModel *model, 
+                                      GtkTreePath *path,
+                                      gboolean currently_selected,
+                                      gpointer data)
+{
+       gchar *matcher_str;
+       MatcherProp *prop;
+       gboolean negative_cond;
+       gint criteria;
+       GtkWidget *menu;
+       GtkTreeIter iter;
+       gboolean is_valid;
+
+       if (currently_selected)
+               return TRUE;
+
+       if (!gtk_tree_model_get_iter(model, &iter, path))
+               return TRUE;
+
+       gtk_tree_model_get(model, &iter, 
+                          PREFS_MATCHER_COND_VALID,  &is_valid,
+                          PREFS_MATCHER_COND, &matcher_str,
+                          -1);
+       
+       if (!is_valid) {
+               g_free(matcher_str);
+               prefs_matcher_reset_condition();
+               return TRUE;
+       }
+
+       negative_cond = FALSE;
+
+       prop = matcher_parser_get_prop(matcher_str);
+       if (prop == NULL) {
+               g_free(matcher_str);
+               return TRUE;
+       }               
+
+       criteria = prefs_matcher_get_criteria_from_matching(prop->criteria);
+       prefs_matcher_set_criteria(criteria);
+
+       switch(prop->criteria) {
+       case MATCHCRITERIA_NOT_UNREAD:
+       case MATCHCRITERIA_NOT_NEW:
+       case MATCHCRITERIA_NOT_MARKED:
+       case MATCHCRITERIA_NOT_DELETED:
+       case MATCHCRITERIA_NOT_REPLIED:
+       case MATCHCRITERIA_NOT_FORWARDED:
+       case MATCHCRITERIA_NOT_LOCKED:
+       case MATCHCRITERIA_NOT_SPAM:
+       case MATCHCRITERIA_HAS_NO_ATTACHMENT:
+       case MATCHCRITERIA_NOT_SIGNED:
+       case MATCHCRITERIA_NOT_PARTIAL:
+       case MATCHCRITERIA_NOT_COLORLABEL:
+       case MATCHCRITERIA_NOT_IGNORE_THREAD:
+       case MATCHCRITERIA_NOT_WATCH_THREAD:
+       case MATCHCRITERIA_NOT_SUBJECT:
+       case MATCHCRITERIA_NOT_FROM:
+       case MATCHCRITERIA_NOT_TO:
+       case MATCHCRITERIA_NOT_CC:
+       case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
+       case MATCHCRITERIA_NOT_TAG:
+       case MATCHCRITERIA_NOT_TAGGED:
+       case MATCHCRITERIA_NOT_NEWSGROUPS:
+       case MATCHCRITERIA_NOT_INREPLYTO:
+       case MATCHCRITERIA_NOT_REFERENCES:
+       case MATCHCRITERIA_NOT_HEADER:
+       case MATCHCRITERIA_NOT_HEADERS_PART:
+       case MATCHCRITERIA_NOT_MESSAGE:
+       case MATCHCRITERIA_NOT_BODY_PART:
+       case MATCHCRITERIA_NOT_TEST:
+       case MATCHCRITERIA_NOT_FOUND_IN_ADDRESSBOOK:
+               negative_cond = TRUE;
+               break;
+       }
+       
+       switch(prop->criteria) {
+       case MATCHCRITERIA_ALL:
+               break;
+
+       case MATCHCRITERIA_NOT_SUBJECT:
+       case MATCHCRITERIA_NOT_FROM:
+       case MATCHCRITERIA_NOT_TO:
+       case MATCHCRITERIA_NOT_CC:
+       case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
+       case MATCHCRITERIA_NOT_TAG:
+       case MATCHCRITERIA_NOT_NEWSGROUPS:
+       case MATCHCRITERIA_NOT_INREPLYTO:
+       case MATCHCRITERIA_NOT_REFERENCES:
+       case MATCHCRITERIA_NOT_HEADERS_PART:
+       case MATCHCRITERIA_NOT_BODY_PART:
+       case MATCHCRITERIA_NOT_MESSAGE:
+       case MATCHCRITERIA_NOT_TEST:
+       case MATCHCRITERIA_SUBJECT:
+       case MATCHCRITERIA_FROM:
+       case MATCHCRITERIA_TO:
+       case MATCHCRITERIA_CC:
+       case MATCHCRITERIA_TO_OR_CC:
+       case MATCHCRITERIA_TAG:
+       case MATCHCRITERIA_NEWSGROUPS:
+       case MATCHCRITERIA_INREPLYTO:
+       case MATCHCRITERIA_REFERENCES:
+       case MATCHCRITERIA_HEADERS_PART:
+       case MATCHCRITERIA_BODY_PART:
+       case MATCHCRITERIA_MESSAGE:
+       case MATCHCRITERIA_TEST:
+               gtk_entry_set_text(GTK_ENTRY(matcher.string_entry), prop->expr);
+               break;
+
+       case MATCHCRITERIA_FOUND_IN_ADDRESSBOOK:
+       case MATCHCRITERIA_NOT_FOUND_IN_ADDRESSBOOK:
+       {
+               gchar *header;
+               gchar *expr;
+
+               /* matcher expressions contain UNtranslated "Any"/"All",
+                 select the relevant translated combo item */
+               if (strcasecmp(prop->header, "All") == 0)
+                       header = (gchar*)C_("Filtering Matcher Menu", "All");
+               else
+                       if (strcasecmp(prop->header, "Any") == 0)
+                               header = _("Any");
+                       else
+                               header = prop->header;
+               if (strcasecmp(prop->expr, "Any") == 0)
+                       expr = _("Any");
+               else
+                       expr = prop->expr;
+
+               gtk_entry_set_text(GTK_ENTRY(matcher.header_addr_entry), header);
+               gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))), expr);
+               break;
+       }
+
+       case MATCHCRITERIA_AGE_GREATER:
+       case MATCHCRITERIA_AGE_LOWER:
+               if(prop->value >= 7 && !(prop->value % 7)) {
+                       gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2),
+                                                AGE_WEEKS);
+                       gtk_spin_button_set_value(GTK_SPIN_BUTTON(
+                                       matcher.numeric_entry), prop->value/7);
+               } else {
+                       gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2),
+                                                AGE_DAYS);
+                       gtk_spin_button_set_value(GTK_SPIN_BUTTON(
+                                       matcher.numeric_entry), prop->value);
+               }
+               break;
+               
+       case MATCHCRITERIA_AGE_GREATER_HOURS:
+       case MATCHCRITERIA_AGE_LOWER_HOURS:
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2),
+                                        AGE_HOURS);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(
+                               matcher.numeric_entry), prop->value);
+               break;
+               
+       case MATCHCRITERIA_SCORE_GREATER:
+       case MATCHCRITERIA_SCORE_LOWER:
+       case MATCHCRITERIA_SCORE_EQUAL:
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(matcher.numeric_entry),
+                                         prop->value);
+               break;
+
+       case MATCHCRITERIA_SIZE_GREATER:
+       case MATCHCRITERIA_SIZE_SMALLER:
+       case MATCHCRITERIA_SIZE_EQUAL:
+               if(prop->value >= MB_SIZE && !(prop->value % MB_SIZE)) {
+                       gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2),
+                                                SIZE_UNIT_MBYTES);
+                       gtk_spin_button_set_value(GTK_SPIN_BUTTON(
+                                       matcher.numeric_entry), prop->value/MB_SIZE);
+               } else if(prop->value >= KB_SIZE && !(prop->value % KB_SIZE)) {
+                       gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2),
+                                                SIZE_UNIT_KBYTES);
+                       gtk_spin_button_set_value(GTK_SPIN_BUTTON(
+                                       matcher.numeric_entry), prop->value/KB_SIZE);
+               } else {
+                       gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2),
+                                                SIZE_UNIT_BYTES);
+                       gtk_spin_button_set_value(GTK_SPIN_BUTTON(
+                                       matcher.numeric_entry), prop->value);           
+               }
+               break;
+
+#if !GTK_CHECK_VERSION(3, 0, 0)
+       case MATCHCRITERIA_NOT_COLORLABEL:
+       case MATCHCRITERIA_COLORLABEL:
+               gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(matcher.color_optmenu),
+                                           prop->value + 1);
+               menu = gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU(matcher.color_optmenu));
+               g_signal_emit_by_name(G_OBJECT(menu), "selection-done", menu);
+               break;
+#endif
+
+       case MATCHCRITERIA_NOT_HEADER:
+       case MATCHCRITERIA_HEADER:
+               gtk_entry_set_text(GTK_ENTRY(matcher.header_entry), prop->header);
+               gtk_entry_set_text(GTK_ENTRY(matcher.string_entry), prop->expr);
+               break;
+       }
+
+       switch(criteria) {
+       case CRITERIA_SUBJECT:
+       case CRITERIA_FROM:
+       case CRITERIA_TO:
+       case CRITERIA_CC:
+       case CRITERIA_TO_OR_CC:
+       case CRITERIA_NEWSGROUPS:
+       case CRITERIA_INREPLYTO:
+       case CRITERIA_REFERENCES:
+       case CRITERIA_HEADER:
+       case CRITERIA_HEADERS_PART:
+       case CRITERIA_BODY_PART:
+       case CRITERIA_MESSAGE:
+       case CRITERIA_TAG:
+       case CRITERIA_TAGGED:
+       case CRITERIA_TEST:
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo),
+                                       negative_cond ? PREDICATE_DOES_NOT_CONTAIN :
+                                                       PREDICATE_CONTAINS);
+               break;
+       case CRITERIA_FOUND_IN_ADDRESSBOOK:
+       case CRITERIA_UNREAD:
+       case CRITERIA_NEW:
+       case CRITERIA_MARKED:
+       case CRITERIA_DELETED:
+       case CRITERIA_REPLIED:
+       case CRITERIA_FORWARDED:
+       case CRITERIA_LOCKED:
+       case CRITERIA_SPAM:
+       case CRITERIA_HAS_ATTACHMENT:
+       case CRITERIA_SIGNED:
+       case CRITERIA_COLORLABEL:
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2),
+                                        negative_cond ? PREDICATE_FLAG_DISABLED :
+                                                        PREDICATE_FLAG_ENABLED);
+               break;
+       case CRITERIA_WATCH_THREAD:
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.criteria_combo2),
+                                        negative_cond ? THREAD_NOT_WATCHED :
+                                                        THREAD_WATCHED);
+               break;
+       case CRITERIA_IGNORE_THREAD:
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.criteria_combo2),
+                                        negative_cond ? THREAD_NOT_IGNORED :
+                                                        THREAD_IGNORED);
+               break;  
+       case CRITERIA_PARTIAL:
+               gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.criteria_combo2),
+                                        negative_cond ? PREDICATE_FLAG_DISABLED :
+                                                        PREDICATE_FLAG_ENABLED);
+               break;
+       }
+
+       switch(prop->matchtype) {
+       case MATCHTYPE_MATCH:
+#ifndef G_OS_WIN32
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
+#endif
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), TRUE);
+               break;
+
+       case MATCHTYPE_MATCHCASE:
+#ifndef G_OS_WIN32
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
+#endif
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
+               break;
+
+       case MATCHTYPE_REGEXP:
+#ifndef G_OS_WIN32
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), TRUE);
+#endif
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), TRUE);
+               break;
+
+       case MATCHTYPE_REGEXPCASE:
+#ifndef G_OS_WIN32
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), TRUE);
+#endif
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
+               break;
+       }
+
+       g_free(matcher_str);
+       return TRUE;
+}
+