1 files changed, 16 insertions, 8 deletions
diff --git a/mail/searchtypes.xml b/mail/searchtypes.xml
index c74f58cbf7..6357bfdb06 100644
--- a/mail/searchtypes.xml
+++ b/mail/searchtypes.xml
@@ -55,7 +55,8 @@
      <title>contains</title>
      <code>
        (match-all (or (header-contains "To" ${recipient})
-                      (header-contains "Cc" ${recipient})))
+                   	(header-contains "Cc" ${recipient})
+   		   	(header-contains "Bcc" ${recipient})))
      </code>
     </option>
     <option value="not contains">
@@ -63,14 +64,16 @@
      <code>
        (match-all (not (or
                           (header-contains "To" ${recipient})
-                         (header-contains "Cc" ${recipient}))))
+                   	 (header-contains "Cc" ${recipient})
+                         (header-contains "Bcc" ${recipient}))))
      </code>
     </option>
     <option value="is">
      <title>is</title>
      <code>
        (match-all (or (header-matches "To" ${recipient})
-                         (header-matches "Cc" ${recipient})))
+                   	 (header-contains "Cc" ${recipient})
+                         (header-matches "Bcc" ${recipient})))
      </code>
     </option>
     <option value="is not">
@@ -78,14 +81,16 @@
      <code>
        (match-all (not (or
                (header-matches "To" ${recipient})
-              (header-matches "Cc" ${recipient}))))
+               (header-contains "Cc" ${recipient})
+              (header-matches "Bcc" ${recipient}))))
      </code>
     </option>
     <option value="starts with">
      <title>starts with</title>
      <code>
         (match-all (or (header-starts-with "To" ${recipient})
-                         (header-starts-with "Cc" ${recipient})))
+                	(header-contains "Cc" ${recipient})
+                         (header-starts-with "Bcc" ${recipient})))
      </code>
     </option>
     <option value="not starts with">
@@ -93,14 +98,16 @@
      <code>
         (match-all (not (or
                (header-starts-with "To" ${recipient})
-              (header-starts-with "Cc" ${recipient}))))
+               (header-contains "Cc" ${recipient})
+              (header-starts-with "Bcc" ${recipient}))))
      </code>
     </option>
     <option value="ends with">
      <title>ends with</title>
      <code>
         (match-all (or (header-ends-with "To" ${recipient})
-                         (header-ends-with "Cc" ${recipient})))
+                   	 (header-contains "Cc" ${recipient})
+                         (header-ends-with "Bcc" ${recipient})))
      </code>
     </option>
     <option value="not ends with">
@@ -108,7 +115,8 @@
      <code>
         (match-all (not (or
                (header-ends-with "To" ${recipient})
-              (header-ends-with "Cc" ${recipient}))))
+               (header-contains "Cc" ${recipient})
+              (header-ends-with "Bcc" ${recipient}))))
      </code>
     </option>
    </input>