diff --git a/filter/ChangeLog b/filter/ChangeLog
index 65a15dc113..5b880e4125 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-02  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* vfoldertypes.xml: Make the date comparisons read the same as the
+	ones in filtertypes.xml
+
 2001-12-17  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* filtertypes.xml: Add new action to execute a shell command.
diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
index 1bbe1b0f3a..8f891b4b10 100644
--- a/filter/filtertypes.xml
+++ b/filter/filtertypes.xml
@@ -337,13 +337,13 @@
     </code>
    </option>
    <option value="before">
-    <title>was before</title>
+    <title>is before</title>
     <code>
        (match-all (&lt; (get-sent-date) ${versus}))
     </code>
    </option>
    <option value="after">
-    <title>was after</title>
+    <title>is after</title>
     <code>
        (match-all (&gt; (get-sent-date) ${versus}))
     </code>
@@ -368,13 +368,13 @@
     </code>
    </option>
    <option value="before">
-    <title>was before</title>
+    <title>is before</title>
     <code>
        (match-all (&lt; (get-received-date) ${versus}))
     </code>
    </option>
    <option value="after">
-    <title>was after</title>
+    <title>is after</title>
     <code>
        (match-all (&gt; (get-received-date) ${versus}))
     </code>
diff --git a/filter/vfoldertypes.xml b/filter/vfoldertypes.xml
index dfcd85bb94..acbcb5d5fe 100644
--- a/filter/vfoldertypes.xml
+++ b/filter/vfoldertypes.xml
@@ -190,70 +190,68 @@
  <part name="sexp">
    <title>Expression</title>
    <input type="code" name="code"/>
-  </part>
+ </part>
 
  <part name="sent-date">
-  <title>Message was sent</title>
+  <title>Date sent</title>
   <input type="optionlist" name="date-spec-type">
+   <option value="is">
+    <title>is</title>
+    <code>
+       (match-all (= (get-sent-date) ${versus}))
+    </code>
+   </option>
+   <option value="is-not">
+    <title>is not</title>
+    <code>
+       (match-all (not (= (get-sent-date) ${versus})))
+    </code>
+   </option>
    <option value="before">
-    <title>before</title>
+    <title>is before</title>
     <code>
        (match-all (&lt; (get-sent-date) ${versus}))
     </code>
    </option>
-   <option value="on-or-before">
-    <title>on or before</title>
-    <code>
-       (match-all (not (&gt; (get-sent-date) ${versus})))
-    </code>
-   </option>
    <option value="after">
-    <title>after</title>
+    <title>is after</title>
     <code>
        (match-all (&gt; (get-sent-date) ${versus}))
     </code>
    </option>
-   <option value="on-or-after">
-    <title>on or after</title>
-    <code>
-       (match-all (not (&lt; (get-sent-date) ${versus})))
-    </code>
-   </option>
   </input>    
-  <input type="datespec" name="versus">
-  </input>
+  <input type="datespec" name="versus"/>
  </part>
 
  <part name="recv-date">
-  <title>Message was received</title>
+  <title>Date received</title>
   <input type="optionlist" name="date-spec-type">
+   <option value="is">
+    <title>is</title>
+    <code>
+       (match-all (= (get-received-date) ${versus}))
+    </code>
+   </option>
+   <option value="is-not">
+    <title>is not</title>
+    <code>
+       (match-all (not (= (get-received-date) ${versus})))
+    </code>
+   </option>
    <option value="before">
-    <title>before</title>
+    <title>is before</title>
     <code>
        (match-all (&lt; (get-received-date) ${versus}))
     </code>
    </option>
-   <option value="on-or-before">
-    <title>on or before</title>
-    <code>
-       (match-all (not (&gt; (get-received-date) ${versus})))
-    </code>
-   </option>
    <option value="after">
-    <title>after</title>
+    <title>is after</title>
     <code>
        (match-all (&gt; (get-received-date) ${versus}))
     </code>
    </option>
-   <option value="on-or-after">
-    <title>on or after</title>
-    <code>
-       (match-all (not (&lt; (get-received-date) ${versus})))
-    </code>
-   </option>
-  </input> 
-  <input type="datespec" name="versus">
-  </input>
+  </input>    
+  <input type="datespec" name="versus"/>
  </part>
 
  <part name="status">