diff --git a/default_user/ChangeLog b/default_user/ChangeLog
index 61c6c508f4..0c1bc8fa74 100644
--- a/default_user/ChangeLog
+++ b/default_user/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-31  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* searches.xml: Moved "Sender-contains" to the top of the list and
+	added a Recipient contains item. This fixes bugs #4888 and #5668.
+
 2001-07-30  Jason Leach  <jleach@ximian.com>
 
 	* Makefile.am (install-data-hook): Only try to make a
diff --git a/default_user/searches.xml b/default_user/searches.xml
index 2a05fb98db..6ff337bae5 100644
--- a/default_user/searches.xml
+++ b/default_user/searches.xml
@@ -1,64 +1,6 @@
 <?xml version="1.0"?>
 <filteroptions>
   <ruleset>
-    <rule grouping="any" source="demand">
-      <title>Body or subject contains</title>
-      <partset>
-        <part name="subject">
-          <value name="subject-type" type="option" value="contains"/>
-          <value name="subject" type="string">
-            <string>crap</string>
-          </value>
-        </part>
-        <part name="body">
-          <value name="body-type" type="option" value="contains"/>
-          <value name="word" type="string">
-            <string>crap</string>
-          </value>
-        </part>
-      </partset>
-      <sources/>
-    </rule>
-    <rule grouping="any" source="demand">
-      <title>Body contains</title>
-      <partset>
-        <part name="body">
-          <value name="body-type" type="option" value="contains"/>
-          <value name="word" type="string"/>
-        </part>
-      </partset>
-      <sources/>
-    </rule>
-    <rule grouping="any" source="demand">
-      <title>Subject contains</title>
-      <partset>
-        <part name="subject">
-          <value name="subject-type" type="option" value="contains"/>
-          <value name="subject" type="string"/>
-        </part>
-      </partset>
-      <sources/>
-    </rule>
-    <rule grouping="any" source="demand">
-      <title>Body does not contain</title>
-      <partset>
-        <part name="body">
-          <value name="body-type" type="option" value="not contains"/>
-          <value name="word" type="string"/>
-        </part>
-      </partset>
-      <sources/>
-    </rule>
-    <rule grouping="any" source="demand">
-      <title>Subject does not contain</title>
-      <partset>
-        <part name="subject">
-          <value name="subject-type" type="option" value="not contains"/>
-          <value name="subject" type="string"/>
-        </part>
-      </partset>
-      <sources/>
-    </rule>
     <rule grouping="any" source="demand">
       <title>Sender contains</title>
       <partset>
@@ -69,5 +11,75 @@
       </partset>
       <sources/>
     </rule>
+
+    <rule grouping="any" source="demand">
+      <title>Body or subject contains</title>
+      <partset>
+        <part name="subject">
+          <value name="subject-type" type="option" value="contains"/>
+          <value name="subject" type="string"/>
+        </part>
+        <part name="body">
+          <value name="body-type" type="option" value="contains"/>
+          <value name="word" type="string"/>
+        </part>
+      </partset>
+      <sources/>
+    </rule>
+
+    <rule grouping="any" source="demand">
+      <title>Body contains</title>
+      <partset>
+        <part name="body">
+          <value name="body-type" type="option" value="contains"/>
+          <value name="word" type="string"/>
+        </part>
+      </partset>
+      <sources/>
+    </rule>
+
+    <rule grouping="any" source="demand">
+      <title>Subject contains</title>
+      <partset>
+        <part name="subject">
+          <value name="subject-type" type="option" value="contains"/>
+          <value name="subject" type="string"/>
+        </part>
+      </partset>
+      <sources/>
+    </rule>
+
+    <rule grouping="any" source="demand">
+      <title>Body does not contain</title>
+      <partset>
+        <part name="body">
+          <value name="body-type" type="option" value="not contains"/>
+          <value name="word" type="string"/>
+        </part>
+      </partset>
+      <sources/>
+    </rule>
+
+    <rule grouping="any" source="demand">
+      <title>Subject does not contain</title>
+      <partset>
+        <part name="subject">
+          <value name="subject-type" type="option" value="not contains"/>
+          <value name="subject" type="string"/>
+        </part>
+      </partset>
+      <sources/>
+    </rule>
+
+    <rule grouping="any" source="demand">
+      <title>Recipients contain</title>
+      <partset>
+        <part name="recipients">
+          <value name="recipient-type" type="option" value="contains"/>
+          <value name="recipient" type="string"/>
+        </part>
+      </partset>
+      <sources/>
+    </rule>
   </ruleset>
 </filteroptions>