--- amavisd.original2 2005-12-29 11:43:35.000000000 -0500 +++ amavisd 2005-12-29 11:45:15.000000000 -0500 @@ -7802,7 +7802,9 @@ # - recipients matching bypass_spam_checks: even though spam checking # may have been done for other reasons, these recipients do not # expect such headers, so let's pretend the check has not been done - # and not insert spam-related headers for them + # and not insert spam-related headers for them; + # - everyone when the spam level (+ boost if applicable) is below the + # tag level or the sender was whitelisted and tag level is below -10. $do_tag = $is_local && !$bypassed && ( $blacklisted || !defined $tag_level || (defined $spam_level ? $spam_level+$boost >= $tag_level