X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fmoney_spam;h=2f08e10ce2611900826383a4957b5ebc9104c8e6;hp=04b8599a7bb217eccd4e9f9f7a7130a144712a55;hb=1a58e10c4c2cf88bb10f3374f65d57f7abc3b6ac;hpb=f7dc9fe44d9934f943761b46bbbcc687fb7be41c

diff --git a/common/money_spam b/common/money_spam
index 04b8599..2f08e10 100644
--- a/common/money_spam
+++ b/common/money_spam
@@ -257,11 +257,11 @@ body DMXC               /Look at D-M-X-C!/
 describe DMXC           stock spam
 score DMXC              4
 
-body MONEY		/(\$\s*[\d\.]+|[\d\.]+\s*(usd|yen|euro|dollar|\$))/i
-describe MONEY		Some amount of money
+body MONEY		/((usd|yen|eur?o?|dollar|\$)\s*[\d\.\, ]+|[\d\.\, ]+\s*(usd|yen|eur?o?|dollar|\$))/i
+describe MONEY		Some amount of money in body
 score MONEY		1.5
 
-header SUBJMONEY	subject =~ /(\$\s*[\d\.]+|[\d\.]+\s*(usd|yen|euro|dollar|\$))/i
+header SUBJMONEY	subject =~ /((usd|yen|eur?o?|dollar|\$)\s*[\d\.\, ]+|[\d\.\, ]+\s*(usd|yen|eur?o?|dollar|\$))/i
 describe SUBJMONEY	Some amount of money in subject
 score SUBJMONEY		3