Index: mail/ChangeLog
===================================================================
--- mail/ChangeLog	(revision 35429)
+++ mail/ChangeLog	(working copy)
@@ -1,3 +1,9 @@
+2008-04-28  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #530245
+
+	* searchtypes.xml: Let searches work with labels again.
+
 2008-04-28  Johan Euphrosine  <proppy@aminche.com>
 
 	** Fix for bug #529247
Index: mail/searchtypes.xml
===================================================================
--- mail/searchtypes.xml	(revision 35429)
+++ mail/searchtypes.xml	(working copy)
@@ -260,13 +260,13 @@
    <option value="is">
     <title>is</title>
     <code>
-       (match-all (= (user-tag "label") ${versus}))
+       (match-all (or (= (user-tag "label") ${versus}) (user-flag (+ "$Label" ${versus})) (user-flag ${versus})))
     </code>
    </option>
    <option value="is-not">
     <title>is not</title>
     <code>
-       (match-all (not (= (user-tag "label") ${versus})))
+       (match-all (not (or (= (user-tag "label") ${versus}) (user-flag (+ "$Label" ${versus})) (user-flag ${versus}))))
     </code>
    </option>
   </input>
