X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Ffilters%2Ffilters.php;h=98935f3b6861835df65f3f6565ac2554a1ce5032;hb=8a7ccd82d976b4a709e284887925d912872be13a;hp=a414573dd33f8da667ea0e1e1a40e9c7680e91f2;hpb=06342d92973cfb5abda63be550c2454694a6321f;p=squirrelmail.git

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index a414573d..98935f3b 100644
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -240,6 +240,12 @@ function user_filters($imap_stream) {
                   $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge);
             $expunge = filter_search_and_delete($imap_stream, 'CC',
                   $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge);
+        } else if ($filters[$i]['where'] == 'Header and Body') {
+            $expunge = filter_search_and_delete($imap_stream, 'TEXT',
+                  $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge);
+        } else if ($filters[$i]['where'] == 'Message Body') {
+            $expunge = filter_search_and_delete($imap_stream, 'BODY',
+                  $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge);                  
         } else {
             /*
             *  If it's a normal TO, CC, SUBJECT, or FROM, then handle it