svn commit: r478889 - /spamassassin/rules/trunk/sandbox/jm/20_basic.cf

[jm...@apache.org]

Author: jm
Date: Fri Nov 24 06:19:35 2006
New Revision: 478889

URL: http://svn.apache.org/viewvc?view=rev&rev=478889
Log:
update rule to use its own copy of __HAS_OUTLOOK_IN_MAILER_NEW -- now called __XM_MS_IN_GENERAL

Modified:
    spamassassin/rules/trunk/sandbox/jm/20_basic.cf

Modified: spamassassin/rules/trunk/sandbox/jm/20_basic.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/jm/20_basic.cf?view=diff&rev=478889&r1=478888&r2=478889
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Fri Nov 24 06:19:35 2006
@@ -114,7 +114,8 @@
 meta STOCK_IMG_HTML  (__ANY_IMAGE_ATTACH&&__ENV_AND_HDR_FROM_MATCH&&__PART_STOCK_CID&&__HTML_IMG_ONLY)
 describe STOCK_IMG_HTML   Stock spam image part, with distinctive HTML
 
-meta STOCK_IMG_OUTLOOK  (__ANY_IMAGE_ATTACH&&__ENV_AND_HDR_FROM_MATCH&&__HAS_OUTLOOK_IN_MAILER_NEW&&__HTML_LENGTH_1536_2048)
+header __XM_MS_IN_GENERAL     X-Mailer =~ /\bMSCRM\b|Microsoft (?:CDO|Outlook|Office Outlook)\b/
+meta STOCK_IMG_OUTLOOK  (__ANY_IMAGE_ATTACH&&__ENV_AND_HDR_FROM_MATCH&&__XM_MS_IN_GENERAL&&__HTML_LENGTH_1536_2048)
 describe STOCK_IMG_OUTLOOK  Stock spam image part, with Outlook-like features
 
 # Spammy X-Mailer version strings; no longer seen in ham, due to MS'