diff --git a/filter/ChangeLog b/filter/ChangeLog
index 081b517d6d..f15cd145a3 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-04  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* vfoldertypes.xml: Same here.
+
+	* filtertypes.xml: For mlist matching, we only want "is" and "is
+	not" because that is all we really support anyway.
+
 2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
 
 	* Makefile.am: Use LIBFILTER_CFLAGS.
diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
index 8f891b4b10..5e2dd7bbc4 100644
--- a/filter/filtertypes.xml
+++ b/filter/filtertypes.xml
@@ -490,46 +490,14 @@
  <part name="mlist">
   <title>Mailing list</title>
    <input type="optionlist" name="mlist-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(match-all (header-contains "x-camel-mlist" ${mlist}))</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-        <code>(match-all (not (header-contains "x-camel-mlist" ${mlist})))</code>
-    </option>
     <option value="is">
         <title>is</title>
-	<code>(match-all (header-matches "x-camel-mlist" ${mlist}))</code>
+        <code>(match-all (header-matches "x-camel-mlist" ${mlist}))</code>
     </option>
     <option value="is not">
         <title>is not</title>
         <code>(match-all (not (header-matches "x-camel-mlist" ${mlist})))</code>
     </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-        (match-all (header-starts-with "x-camel-mlist" ${mlist}))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-        (match-all (not (header-starts-with "x-camel-mlist" ${mlist})))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-        (match-all (header-ends-with "x-camel-mlist" ${mlist}))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-        (match-all (not (header-ends-with "x-camel-mlist" ${mlist})))
-     </code>
-    </option>
    </input>
    <input type="string" name="mlist"/>
  </part>
diff --git a/filter/vfoldertypes.xml b/filter/vfoldertypes.xml
index acbcb5d5fe..47204cd04c 100644
--- a/filter/vfoldertypes.xml
+++ b/filter/vfoldertypes.xml
@@ -313,46 +313,14 @@
  <part name="mlist">
   <title>Mailing list</title>
    <input type="optionlist" name="mlist-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(match-all (header-contains "x-camel-mlist" ${mlist}))</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-        <code>(match-all (not (header-contains "x-camel-mlist" ${mlist})))</code>
-    </option>
     <option value="is">
         <title>is</title>
-	<code>(match-all (header-matches "x-camel-mlist" ${mlist}))</code>
+        <code>(match-all (header-matches "x-camel-mlist" ${mlist}))</code>
     </option>
     <option value="is not">
         <title>is not</title>
         <code>(match-all (not (header-matches "x-camel-mlist" ${mlist})))</code>
     </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-        (match-all (header-starts-with "x-camel-mlist" ${mlist}))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-        (match-all (not (header-starts-with "x-camel-mlist" ${mlist})))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-        (match-all (header-ends-with "x-camel-mlist" ${mlist}))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-        (match-all (not (header-ends-with "x-camel-mlist" ${mlist})))
-     </code>
-    </option>
    </input>
    <input type="string" name="mlist"/>
  </part>