updated scores for revision 1889557 active rules added since last mass-check
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1889582 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index d3a0a8f..c50941c 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf
@@ -1,8 +1,8 @@
-score ACCT_PHISHING_MANY 2.999 0.467 2.999 0.467
+score ACCT_PHISHING_MANY 2.999 0.504 2.999 0.504
score AC_BR_BONANZA 0.001 0.001 0.001 0.001
score AC_DIV_BONANZA 0.001 0.001 0.001 0.001
-score AC_FROM_MANY_DOTS 2.999 2.996 2.999 2.996
-score AC_HTML_NONSENSE_TAGS 1.999 1.997 1.999 1.997
+score AC_FROM_MANY_DOTS 2.999 2.999 2.999 2.999
+score AC_HTML_NONSENSE_TAGS 1.999 1.999 1.999 1.999
score AC_POST_EXTRAS 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000 1.000 1.000 1.000
@@ -13,46 +13,45 @@
score AC_SPAMMY_URI_PATTERNS4 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS8 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS9 1.000 1.000 1.000 1.000
-score ADMITS_SPAM 3.899 3.895 3.899 3.895
+score ADMITS_SPAM 3.899 3.899 3.899 3.899
score ADULT_DATING_COMPANY 10.001 10.001 10.001 10.001
score ADVANCE_FEE_2_NEW_FORM 1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_FRM_MNY 1.986 0.001 1.986 0.001
-score ADVANCE_FEE_2_NEW_MONEY 1.276 0.001 1.276 0.001
-score ADVANCE_FEE_3_NEW 2.469 3.496 2.469 3.496
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.001 2.497 0.001 2.497
+score ADVANCE_FEE_2_NEW_FRM_MNY 2.499 0.001 2.499 0.001
+score ADVANCE_FEE_2_NEW_MONEY 1.273 0.001 1.273 0.001
+score ADVANCE_FEE_3_NEW 2.502 3.499 2.502 3.499
+score ADVANCE_FEE_3_NEW_FRM_MNY 0.001 2.499 0.001 2.499
score ADVANCE_FEE_3_NEW_MONEY 0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW 2.499 2.497 2.499 2.497
+score ADVANCE_FEE_4_NEW 1.397 2.499 1.397 2.499
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW_MONEY 2.899 2.091 2.899 2.091
-score ADVANCE_FEE_5_NEW 2.297 2.497 2.297 2.497
-score ADVANCE_FEE_5_NEW_FRM_MNY 2.799 2.796 2.799 2.796
-score ADVANCE_FEE_5_NEW_MONEY 1.993 3.196 1.993 3.196
-score AD_PREFS 0.499 0.498 0.499 0.498
-score ALIBABA_IMG_NOT_RCVD_ALI 2.499 2.490 2.499 2.490
+score ADVANCE_FEE_4_NEW_MONEY 2.487 2.093 2.487 2.093
+score ADVANCE_FEE_5_NEW 2.999 2.494 2.999 2.494
+score ADVANCE_FEE_5_NEW_FRM_MNY 2.403 2.799 2.403 2.799
+score ADVANCE_FEE_5_NEW_MONEY 1.991 3.199 1.991 3.199
+score AD_PREFS 0.499 0.499 0.499 0.499
+score ALIBABA_IMG_NOT_RCVD_ALI 2.499 2.496 2.499 2.496
score AMAZON_IMG_NOT_RCVD_AMZN 2.499 0.001 2.499 0.001
score APP_DEVELOPMENT_FREEM 1.000 1.000 1.000 1.000
-score APP_DEVELOPMENT_NORDNS 1.219 0.823 1.219 0.823
+score APP_DEVELOPMENT_NORDNS 1.220 0.824 1.220 0.824
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 0.001 0.001 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.545 2.350 1.545 2.350
-score BIGNUM_EMAILS_FREEM 2.859 2.302 2.859 2.302
+score BIGNUM_EMAILS_FREEM 2.619 2.886 2.619 2.886
score BIGNUM_EMAILS_MANY 1.000 1.000 1.000 1.000
score BITCOIN_BOMB 1.000 1.000 1.000 1.000
-score BITCOIN_DEADLINE 2.470 1.848 2.470 1.848
-score BITCOIN_EXTORT_01 1.000 2.558 1.000 2.558
+score BITCOIN_DEADLINE 2.062 2.755 2.062 2.755
+score BITCOIN_EXTORT_01 1.000 2.484 1.000 2.484
score BITCOIN_EXTORT_02 1.000 1.000 1.000 1.000
-score BITCOIN_IMGUR 3.492 3.496 3.492 3.496
-score BITCOIN_MALF_HTML 3.499 3.496 3.499 3.496
-score BITCOIN_MALWARE 2.101 1.498 2.101 1.498
+score BITCOIN_IMGUR 3.231 3.499 3.231 3.499
+score BITCOIN_MALF_HTML 3.499 3.499 3.499 3.499
+score BITCOIN_MALWARE 2.437 1.513 2.437 1.513
score BITCOIN_OBFU_SUBJ 1.000 1.000 1.000 1.000
-score BITCOIN_ONAN 2.620 2.996 2.620 2.996
+score BITCOIN_ONAN 2.207 2.999 2.207 2.999
score BITCOIN_PAY_ME 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_01 1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_02 2.151 2.497 2.151 2.497
+score BITCOIN_SPAM_02 1.676 2.500 1.676 2.500
score BITCOIN_SPAM_03 0.001 0.001 0.001 0.001
score BITCOIN_SPAM_04 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_05 0.001 0.001 0.001 0.001
score BITCOIN_SPAM_06 1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_07 2.137 1.000 2.137 1.000
+score BITCOIN_SPAM_07 3.119 1.000 3.119 1.000
score BITCOIN_SPAM_08 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_09 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_10 1.000 1.000 1.000 1.000
@@ -60,246 +59,246 @@
score BITCOIN_SPAM_12 1.000 1.000 1.000 1.000
score BITCOIN_SPF_ONLYALL 0.001 1.000 0.001 1.000
score BITCOIN_XPRIO 0.001 0.001 0.001 0.001
-score BITCOIN_YOUR_INFO 2.032 2.647 2.032 2.647
-score BODY_SINGLE_URI 0.800 2.497 0.800 2.497
+score BITCOIN_YOUR_INFO 2.439 1.759 2.439 1.759
+score BODY_SINGLE_URI 0.895 2.499 0.895 2.499
score BODY_SINGLE_WORD 0.001 0.001 0.001 0.001
-score BODY_URI_ONLY 2.252 1.528 2.252 1.528
-score BOGUS_MIME_VERSION 3.500 1.913 3.500 1.913
+score BODY_URI_ONLY 2.341 1.918 2.341 1.918
+score BOGUS_MIME_VERSION 3.499 1.913 3.499 1.913
score BOGUS_MSM_HDRS 1.000 1.000 1.000 1.000
score BOMB_FREEM 1.000 1.000 1.000 1.000
score BOMB_MONEY 1.000 1.000 1.000 1.000
score BTC_ORG 1.000 1.000 1.000 1.000
score BULK_RE_SUSP_NTLD 1.000 1.000 1.000 1.000
score CANT_SEE_AD 1.000 1.000 1.000 1.000
-score CK_HELO_GENERIC 0.250 0.001 0.250 0.001
+score CK_HELO_GENERIC 0.249 0.001 0.249 0.001
score COMMENT_GIBBERISH 1.000 1.000 1.000 1.000
-score COMPENSATION 1.500 1.000 1.500 1.000
-score CONTENT_AFTER_HTML 2.499 2.497 2.499 2.497
-score CTE_8BIT_MISMATCH 0.999 0.835 0.999 0.835
-score DATE_IN_FUTURE_96_Q 2.597 2.599 2.597 2.599
+score COMPENSATION 1.137 1.000 1.137 1.000
+score CONTENT_AFTER_HTML 2.499 2.499 2.499 2.499
+score CTE_8BIT_MISMATCH 0.999 0.838 0.999 0.838
+score DATE_IN_FUTURE_96_Q 0.256 1.475 0.256 1.475
score DAY_I_EARNED 1.000 1.000 1.000 1.000
-score DEAR_BENEFICIARY 0.258 3.296 0.258 3.296
-score DKIMWL_BL 0.001 2.996 0.001 2.996
+score DEAR_BENEFICIARY 0.720 3.299 0.720 3.299
+score DKIMWL_BL 0.001 2.999 0.001 2.999
score DKIMWL_BLOCKED 0.001 0.001 0.001 0.001
-score DKIMWL_WL_HIGH 0.001 -0.690 0.001 -0.690
+score DKIMWL_WL_HIGH 0.001 -0.699 0.001 -0.699
score DKIMWL_WL_MED 0.001 -0.001 0.001 -0.001
score DKIMWL_WL_MEDHI 0.001 -0.001 0.001 -0.001
score DOTGOV_IMAGE 1.000 1.000 1.000 1.000
-score DSN_NO_MIMEVERSION 1.999 1.997 1.999 1.997
+score DSN_NO_MIMEVERSION 1.999 1.999 1.999 1.999
score DYNAMIC_IMGUR 1.000 1.000 1.000 1.000
-score EBAY_IMG_NOT_RCVD_EBAY 2.753 2.999 2.753 2.999
+score EBAY_IMG_NOT_RCVD_EBAY 1.483 1.958 1.483 1.958
score ENCRYPTED_MESSAGE -1.000 -1.000 -1.000 -1.000
-score END_FUTURE_EMAILS 2.499 1.000 2.499 1.000
+score END_FUTURE_EMAILS 2.500 1.000 2.500 1.000
score ENVFROM_GOOG_TRIX 1.000 1.000 1.000 1.000
-score FAKE_REPLY_A1 2.569 2.904 2.569 2.904
-score FBI_MONEY 1.983 1.237 1.983 1.237
-score FBI_SPOOF 0.562 1.095 0.562 1.095
+score FAKE_REPLY_A1 2.661 3.016 2.661 3.016
+score FBI_MONEY 0.001 1.159 0.001 1.159
+score FBI_SPOOF 0.250 1.899 0.250 1.899
score FILL_THIS_FORM 1.199 0.001 1.199 0.001
-score FONT_INVIS_DIRECT 0.001 1.141 0.001 1.141
+score FONT_INVIS_DIRECT 0.001 1.640 0.001 1.640
score FONT_INVIS_DOTGOV 1.000 1.000 1.000 1.000
-score FONT_INVIS_HTML_NOHTML 2.999 2.953 2.999 2.953
-score FONT_INVIS_LONG_LINE 2.159 2.997 2.159 2.997
-score FONT_INVIS_MSGID 2.499 1.984 2.499 1.984
-score FONT_INVIS_NORDNS 0.850 2.498 0.850 2.498
+score FONT_INVIS_HTML_NOHTML 2.999 1.984 2.999 1.984
+score FONT_INVIS_LONG_LINE 1.273 2.999 1.273 2.999
+score FONT_INVIS_MSGID 2.499 1.978 2.499 1.978
+score FONT_INVIS_NORDNS 1.134 2.499 1.134 2.499
score FONT_INVIS_POSTEXTRAS 1.000 1.000 1.000 1.000
score FORM_FRAUD 0.001 0.001 0.001 0.001
-score FORM_FRAUD_3 3.099 0.933 3.099 0.933
-score FORM_FRAUD_5 2.077 1.522 2.077 1.522
+score FORM_FRAUD_3 3.099 2.328 3.099 2.328
+score FORM_FRAUD_5 1.722 1.564 1.722 1.564
score FORM_LOW_CONTRAST 1.000 1.000 1.000 1.000
-score FOUND_YOU 3.249 0.680 3.249 0.680
-score FREEMAIL_FORGED_FROMDOMAIN 0.249 0.248 0.249 0.248
+score FOUND_YOU 3.249 0.689 3.249 0.689
+score FREEMAIL_FORGED_FROMDOMAIN 0.249 0.249 0.249 0.249
score FREEM_FRNUM_UNICD_EMPTY 1.000 1.000 1.000 1.000
score FRNAME_IN_MSG_XPRIO_NO_SUB 1.000 1.000 1.000 1.000
-score FROMSPACE 3.299 3.296 3.299 3.296
-score FROM_2_EMAILS_SHORT 2.999 2.996 2.999 2.996
+score FROMSPACE 3.199 3.299 3.199 3.299
+score FROM_2_EMAILS_SHORT 2.999 2.999 2.999 2.999
score FROM_ADDR_WS 1.000 1.000 1.000 1.000
score FROM_BANK_NOAUTH 0.001 1.000 0.001 1.000
score FROM_FMBLA_NDBLOCKED 0.001 0.001 0.001 0.001
-score FROM_FMBLA_NEWDOM 0.001 1.498 0.001 1.498
-score FROM_FMBLA_NEWDOM14 0.001 0.998 0.001 0.998
-score FROM_FMBLA_NEWDOM28 0.001 0.798 0.001 0.798
+score FROM_FMBLA_NEWDOM 0.001 1.499 0.001 1.499
+score FROM_FMBLA_NEWDOM14 0.001 1.000 0.001 1.000
+score FROM_FMBLA_NEWDOM28 0.001 0.799 0.001 0.799
score FROM_GOV_DKIM_AU 0.001 -0.001 0.001 -0.001
score FROM_GOV_REPLYTO_FREEMAIL 0.001 1.000 0.001 1.000
-score FROM_GOV_SPOOF 0.001 0.998 0.001 0.998
-score FROM_IN_TO_AND_SUBJ 2.499 2.497 2.499 2.497
+score FROM_GOV_SPOOF 0.001 0.999 0.001 0.999
+score FROM_IN_TO_AND_SUBJ 2.250 2.499 2.250 2.499
score FROM_MISSPACED 0.001 0.001 0.001 0.001
-score FROM_MISSP_DYNIP 0.001 1.611 0.001 1.611
+score FROM_MISSP_DYNIP 0.001 2.151 0.001 2.151
score FROM_MISSP_EH_MATCH 0.001 0.001 0.001 0.001
-score FROM_MISSP_FREEMAIL 2.898 0.001 2.898 0.001
-score FROM_MISSP_MSFT 2.233 0.001 2.233 0.001
+score FROM_MISSP_FREEMAIL 2.896 0.001 2.896 0.001
+score FROM_MISSP_MSFT 2.249 0.001 2.249 0.001
score FROM_MISSP_PHISH 3.499 0.001 3.499 0.001
-score FROM_MISSP_REPLYTO 2.093 2.497 2.093 2.497
-score FROM_MISSP_SPF_FAIL 0.001 0.877 0.001 0.877
+score FROM_MISSP_REPLYTO 2.400 2.499 2.400 2.499
+score FROM_MISSP_SPF_FAIL 0.001 0.879 0.001 0.879
score FROM_MISSP_TO_UNDISC 0.001 0.001 0.001 0.001
score FROM_MISSP_USER 0.001 0.001 0.001 0.001
-score FROM_MULTI_NORDNS 0.002 3.995 0.002 3.995
-score FROM_NEWDOM_BTC 0.001 0.626 0.001 0.626
+score FROM_MULTI_NORDNS 0.001 3.999 0.001 3.999
+score FROM_NEWDOM_BTC 0.001 1.126 0.001 1.126
score FROM_NTLD_LINKBAIT 1.000 1.000 1.000 1.000
-score FROM_NTLD_REPLY_FREEMAIL 1.421 1.258 1.421 1.258
+score FROM_NTLD_REPLY_FREEMAIL 1.825 0.714 1.825 0.714
score FROM_NUMBERO_NEWDOMAIN 0.001 1.000 0.001 1.000
score FROM_NUMERIC_TLD 1.000 1.000 1.000 1.000
-score FROM_PAYPAL_SPOOF 0.001 0.880 0.001 0.880
+score FROM_PAYPAL_SPOOF 0.001 0.558 0.001 0.558
score FROM_SUSPICIOUS_NTLD 0.499 0.499 0.499 0.499
-score FROM_SUSPICIOUS_NTLD_FP 1.999 1.998 1.999 1.998
-score FROM_WSP_TRAIL 2.699 0.001 2.699 0.001
+score FROM_SUSPICIOUS_NTLD_FP 1.999 1.999 1.999 1.999
+score FROM_WSP_TRAIL 2.799 0.001 2.799 0.001
score FSL_BULK_SIG 0.001 0.001 0.001 0.001
score FSL_CTYPE_WIN1251 0.001 0.001 0.001 0.001
score FSL_NEW_HELO_USER 0.001 0.001 0.001 0.001
-score FUZZY_AMAZON 2.699 2.697 2.699 2.697
+score FUZZY_AMAZON 2.799 2.699 2.799 2.699
score GAPPY_SALES_LEADS_FREEM 1.000 1.000 1.000 1.000
-score GB_FAKE_RF_SHORT 1.999 1.997 1.999 1.997
+score GB_FAKE_RF_SHORT 1.999 1.999 1.999 1.999
score GB_FORGED_MUA_POSTFIX 1.000 1.000 1.000 1.000
-score GB_FREEMAIL_DISPTO 0.499 0.498 0.499 0.498
+score GB_FREEMAIL_DISPTO 0.500 0.499 0.500 0.499
score GB_FREEMAIL_DISPTO_NOTFREEM 0.500 0.500 0.500 0.500
score GB_GOOGLE_OBFUR 0.750 0.750 0.750 0.750
score GOOGLE_DOCS_PHISH 1.000 1.000 1.000 1.000
score GOOGLE_DOCS_PHISH_MANY 1.000 1.000 1.000 1.000
-score GOOGLE_DOC_SUSP 2.999 2.996 2.999 2.996
+score GOOGLE_DOC_SUSP 2.999 2.999 2.999 2.999
score GOOGLE_DRIVE_REPLY_BAD_NTLD 1.000 1.000 1.000 1.000
score GOOG_MALWARE_DNLD 1.000 1.000 1.000 1.000
-score GOOG_REDIR_NORDNS 2.494 1.810 2.494 1.810
-score GOOG_STO_EMAIL_PHISH 2.331 1.000 2.331 1.000
-score GOOG_STO_HTML_PHISH 2.969 1.221 2.969 1.221
-score GOOG_STO_HTML_PHISH_MANY 3.999 1.000 3.999 1.000
-score GOOG_STO_IMG_HTML 2.999 2.996 2.999 2.996
+score GOOG_REDIR_NORDNS 2.498 1.818 2.498 1.818
+score GOOG_STO_EMAIL_PHISH 1.906 1.000 1.906 1.000
+score GOOG_STO_HTML_PHISH 2.917 1.788 2.917 1.788
+score GOOG_STO_HTML_PHISH_MANY 1.000 1.000 1.000 1.000
+score GOOG_STO_IMG_HTML 2.999 2.999 2.999 2.999
score GOOG_STO_IMG_NOHTML 1.000 1.000 1.000 1.000
-score GOOG_STO_NOIMG_HTML 2.999 2.996 2.999 2.996
+score GOOG_STO_NOIMG_HTML 2.999 2.999 2.999 2.999
score HAS_X_NO_RELAY 1.000 1.000 1.000 1.000
-score HAS_X_OUTGOING_SPAM_STAT 1.702 1.997 1.702 1.997
-score HDRS_LCASE 0.100 0.098 0.100 0.098
-score HDRS_LCASE_IMGONLY 0.099 0.098 0.099 0.098
-score HDRS_MISSP 2.499 2.497 2.499 2.497
-score HDR_ORDER_FTSDMCXX_DIRECT 1.999 1.807 1.999 1.807
+score HAS_X_OUTGOING_SPAM_STAT 1.611 1.999 1.611 1.999
+score HDRS_LCASE 0.099 0.100 0.099 0.100
+score HDRS_LCASE_IMGONLY 0.100 0.100 0.100 0.100
+score HDRS_MISSP 2.499 2.499 2.499 2.499
+score HDR_ORDER_FTSDMCXX_DIRECT 2.000 1.813 2.000 1.813
score HDR_ORDER_FTSDMCXX_NORDNS 0.001 0.001 0.001 0.001
-score HEADER_FROM_DIFFERENT_DOMAINS 0.249 0.248 0.249 0.248
+score HEADER_FROM_DIFFERENT_DOMAINS 0.250 0.249 0.250 0.249
score HELO_NO_DOMAIN 0.001 0.001 0.001 0.001
score HEXHASH_WORD 1.000 1.000 1.000 1.000
score HK_CTE_RAW 1.000 1.000 1.000 1.000
-score HK_LOTTO 0.999 0.998 0.999 0.998
-score HK_NAME_FM_MR_MRS 0.274 1.498 0.274 1.498
-score HK_NAME_MR_MRS 1.000 0.998 1.000 0.998
-score HK_RANDOM_ENVFROM 1.000 0.998 1.000 0.998
-score HK_RANDOM_FROM 0.999 0.999 0.999 0.999
-score HK_RANDOM_REPLYTO 0.999 0.976 0.999 0.976
+score HK_LOTTO 0.999 0.999 0.999 0.999
+score HK_NAME_FM_MR_MRS 0.241 1.499 0.241 1.499
+score HK_NAME_MR_MRS 0.999 0.999 0.999 0.999
+score HK_RANDOM_ENVFROM 0.999 0.999 0.999 0.999
+score HK_RANDOM_FROM 1.000 0.999 1.000 0.999
+score HK_RANDOM_REPLYTO 0.999 0.979 0.999 0.979
score HK_RCVD_IP_MULTICAST 1.000 1.000 1.000 1.000
-score HK_SCAM 1.334 0.741 1.334 0.741
+score HK_SCAM 2.000 0.741 2.000 0.741
score HK_WIN 1.000 1.000 1.000 1.000
-score HOSTED_IMG_DIRECT_MX 2.662 1.980 2.662 1.980
+score HOSTED_IMG_DIRECT_MX 2.483 2.281 2.483 2.281
score HOSTED_IMG_DQ_UNSUB 1.000 1.000 1.000 1.000
-score HOSTED_IMG_FREEM 3.499 3.496 3.499 3.496
-score HOSTED_IMG_MULTI 2.999 0.064 2.999 0.064
-score HOSTED_IMG_MULTI_PUB_01 2.999 2.996 2.999 2.996
-score HTML_ENTITY_ASCII 2.999 2.946 2.999 2.946
+score HOSTED_IMG_FREEM 3.499 3.499 3.499 3.499
+score HOSTED_IMG_MULTI 2.723 0.991 2.723 0.991
+score HOSTED_IMG_MULTI_PUB_01 2.999 2.999 2.999 2.999
+score HTML_ENTITY_ASCII 2.999 2.950 2.999 2.950
score HTML_ENTITY_ASCII_TINY 1.000 1.000 1.000 1.000
-score HTML_OFF_PAGE 2.999 2.996 2.999 2.996
+score HTML_OFF_PAGE 2.999 2.999 2.999 2.999
score HTML_SHRT_CMNT_OBFU_MANY 1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY 0.001 1.417 0.001 1.417
-score HTML_TAG_BALANCE_CENTER 3.599 2.952 3.599 2.952
-score HTML_TEXT_INVISIBLE_FONT 1.185 0.464 1.185 0.464
-score HTML_TEXT_INVISIBLE_STYLE 1.750 1.932 1.750 1.932
-score IMG_ONLY_FM_DOM_INFO 0.001 1.000 0.001 1.000
-score JH_SPAMMY_HEADERS 3.499 3.496 3.499 3.496
+score HTML_SINGLET_MANY 0.001 1.410 0.001 1.410
+score HTML_TAG_BALANCE_CENTER 2.720 2.961 2.720 2.961
+score HTML_TEXT_INVISIBLE_FONT 1.187 0.469 1.187 0.469
+score HTML_TEXT_INVISIBLE_STYLE 1.466 1.929 1.466 1.929
+score IMG_ONLY_FM_DOM_INFO 1.000 1.000 1.000 1.000
+score JH_SPAMMY_HEADERS 3.499 3.500 3.499 3.500
score JH_SPAMMY_PATTERN01 1.000 1.000 1.000 1.000
score JH_SPAMMY_PATTERN02 1.000 1.000 1.000 1.000
-score KHOP_FAKE_EBAY 0.073 1.198 0.073 1.198
-score KHOP_HELO_FCRDNS 0.400 0.398 0.400 0.398
+score KHOP_FAKE_EBAY 0.071 1.199 0.071 1.199
+score KHOP_HELO_FCRDNS 0.399 0.399 0.399 0.399
score LIST_PRTL_PUMPDUMP 1.000 1.000 1.000 1.000
-score LIST_PRTL_SAME_USER 0.001 0.930 0.001 0.930
-score LONG_HEX_URI 2.999 0.001 2.999 0.001
-score LONG_IMG_URI 0.491 0.898 0.491 0.898
-score LONG_INVISIBLE_TEXT 2.031 2.494 2.031 2.494
-score LOTS_OF_MONEY 0.010 0.010 0.010 0.010
-score LOTTO_AGENT 0.561 1.498 0.561 1.498
+score LIST_PRTL_SAME_USER 0.001 1.346 0.001 1.346
+score LONG_HEX_URI 2.599 0.001 2.599 0.001
+score LONG_IMG_URI 1.684 0.912 1.684 0.912
+score LONG_INVISIBLE_TEXT 3.000 2.482 3.000 2.482
+score LOTS_OF_MONEY 0.010 0.009 0.010 0.009
+score LOTTO_AGENT 1.499 1.499 1.499 1.499
score LOTTO_DEPT 0.001 0.001 0.001 0.001
score LUCRATIVE 1.000 1.000 1.000 1.000
-score MALFORMED_FREEMAIL 3.399 0.001 3.399 0.001
+score MALFORMED_FREEMAIL 3.186 0.001 3.186 0.001
score MALF_HTML_B64 1.000 1.000 1.000 1.000
score MALWARE_NORDNS 0.001 0.001 0.001 0.001
score MALWARE_PASSWORD 1.000 1.000 1.000 1.000
score MANY_HDRS_LCASE 0.100 0.100 0.100 0.100
-score MANY_SPAN_IN_TEXT 2.699 2.688 2.699 2.688
-score MAY_BE_FORGED 2.099 1.022 2.099 1.022
+score MANY_SPAN_IN_TEXT 2.699 2.698 2.699 2.698
+score MAY_BE_FORGED 2.093 1.015 2.093 1.015
score MILLION_HUNDRED 0.001 0.001 0.001 0.001
-score MILLION_USD 0.001 0.001 0.001 0.001
+score MILLION_USD 0.236 0.001 0.236 0.001
score MIMEOLE_DIRECT_TO_MX 0.001 0.001 0.001 0.001
score MIME_NO_TEXT 1.000 1.000 1.000 1.000
-score MIXED_AREA_CASE 0.867 2.429 0.867 2.429
-score MIXED_CENTER_CASE 1.410 1.391 1.410 1.391
-score MIXED_CTYPE_CASE 1.791 2.057 1.791 2.057
-score MIXED_ES 3.199 2.595 3.199 2.595
-score MIXED_FONT_CASE 0.001 0.588 0.001 0.588
-score MIXED_HREF_CASE 1.999 1.997 1.999 1.997
-score MIXED_IMG_CASE 2.999 2.996 2.999 2.996
+score MIXED_AREA_CASE 1.409 2.047 1.409 2.047
+score MIXED_CENTER_CASE 1.715 2.002 1.715 2.002
+score MIXED_CTYPE_CASE 0.693 2.872 0.693 2.872
+score MIXED_ES 3.099 2.599 3.099 2.599
+score MIXED_FONT_CASE 0.001 0.735 0.001 0.735
+score MIXED_HREF_CASE 1.999 1.999 1.999 1.999
+score MIXED_IMG_CASE 2.999 2.999 2.999 2.999
score MONERO_DEADLINE 1.000 1.000 1.000 1.000
score MONERO_EXTORT_01 1.000 1.000 1.000 1.000
score MONERO_MALWARE 1.000 1.000 1.000 1.000
score MONERO_PAY_ME 1.000 1.000 1.000 1.000
score MONEY_ATM_CARD 0.001 0.001 0.001 0.001
score MONEY_FORM 0.001 0.001 0.001 0.001
-score MONEY_FORM_SHORT 2.499 1.429 2.499 1.429
-score MONEY_FRAUD_3 2.449 2.668 2.449 2.668
-score MONEY_FRAUD_5 0.001 0.001 0.001 0.001
-score MONEY_FRAUD_8 1.424 1.680 1.424 1.680
-score MONEY_FREEMAIL_REPTO 3.000 1.085 3.000 1.085
-score MONEY_FROM_41 1.999 1.997 1.999 1.997
+score MONEY_FORM_SHORT 1.948 1.424 1.948 1.424
+score MONEY_FRAUD_3 3.099 2.721 3.099 2.721
+score MONEY_FRAUD_5 2.712 0.001 2.712 0.001
+score MONEY_FRAUD_8 2.063 0.980 2.063 0.980
+score MONEY_FREEMAIL_REPTO 2.999 1.085 2.999 1.085
+score MONEY_FROM_41 1.999 1.999 1.999 1.999
score MONEY_FROM_MISSP 0.001 0.001 0.001 0.001
-score MONEY_NOHTML 2.499 2.497 2.499 2.497
+score MONEY_NOHTML 2.499 2.499 2.499 2.499
score MSGID_DOLLARS_URI_IMG 1.000 1.000 1.000 1.000
-score MSGID_HDR_MALF 1.701 3.496 1.701 3.496
-score MSGID_NOFQDN1 0.501 1.649 0.501 1.649
-score MSMAIL_PRI_ABNORMAL 0.290 1.499 0.290 1.499
+score MSGID_HDR_MALF 2.696 3.499 2.696 3.499
+score MSGID_NOFQDN1 0.496 1.639 0.496 1.639
+score MSMAIL_PRI_ABNORMAL 0.908 0.001 0.908 0.001
score MSM_PRIO_REPTO 0.001 0.001 0.001 0.001
-score NA_DOLLARS 1.499 1.498 1.499 1.498
+score NA_DOLLARS 1.499 1.499 1.499 1.499
score NEWEGG_IMG_NOT_RCVD_NEGG 1.000 1.000 1.000 1.000
-score NICE_REPLY_A -0.242 -0.001 -0.242 -0.001
-score NORDNS_LOW_CONTRAST 1.885 2.200 1.885 2.200
-score NO_FM_NAME_IP_HOSTN 0.001 0.001 0.001 0.001
+score NICE_REPLY_A -0.243 -0.001 -0.243 -0.001
+score NORDNS_LOW_CONTRAST 1.885 2.202 1.885 2.202
+score NO_FM_NAME_IP_HOSTN 0.202 0.001 0.202 0.001
score NSL_RCVD_FROM_USER 0.001 0.001 0.001 0.001
score NSL_RCVD_HELO_USER 0.001 0.001 0.001 0.001
-score NUMBEREND_LINKBAIT 0.267 0.738 0.267 0.738
+score NUMBEREND_LINKBAIT 0.714 0.757 0.714 0.757
score OBFU_BITCOIN 1.000 1.000 1.000 1.000
-score ODD_FREEM_REPTO 3.000 2.938 3.000 2.938
-score OFFER_ONLY_AMERICA 1.564 1.214 1.564 1.214
-score ONLINE_MKTG_CNSLT 2.599 2.696 2.599 2.696
-score PDS_BAD_THREAD_QP_64 1.000 0.998 1.000 0.998
-score PDS_BTC_ID 0.499 0.498 0.499 0.498
+score ODD_FREEM_REPTO 3.000 2.946 3.000 2.946
+score OFFER_ONLY_AMERICA 1.999 0.770 1.999 0.770
+score ONLINE_MKTG_CNSLT 2.599 2.699 2.599 2.699
+score PDS_BAD_THREAD_QP_64 0.999 0.999 0.999 0.999
+score PDS_BTC_ID 0.500 0.487 0.500 0.487
score PDS_BTC_MSGID 0.001 0.001 0.001 0.001
score PDS_DBL_URL_TNB_RUNON 0.001 0.001 0.001 0.001
-score PDS_EMPTYSUBJ_URISHRT 1.247 0.001 1.247 0.001
-score PDS_FRNOM_TODOM_DBL_URL 1.499 1.498 1.499 1.498
-score PDS_FRNOM_TODOM_NAKED_TO 1.499 1.149 1.499 1.149
-score PDS_FROM_2_EMAILS 3.499 2.683 3.499 2.683
-score PDS_FROM_2_EMAILS_SHRTNER 0.470 1.499 0.470 1.499
-score PDS_FROM_NAME_TO_DOMAIN 1.999 1.387 1.999 1.387
+score PDS_EMPTYSUBJ_URISHRT 0.947 0.001 0.947 0.001
+score PDS_FRNOM_TODOM_DBL_URL 1.499 1.499 1.499 1.499
+score PDS_FRNOM_TODOM_NAKED_TO 1.499 0.520 1.499 0.520
+score PDS_FROM_2_EMAILS 3.139 2.687 3.139 2.687
+score PDS_FROM_2_EMAILS_SHRTNER 0.440 0.680 0.440 0.680
+score PDS_FROM_NAME_TO_DOMAIN 1.999 1.925 1.999 1.925
score PDS_HELO_SPF_FAIL 0.001 1.000 0.001 1.000
-score PDS_NO_FULL_NAME_SPOOFED_URL 0.246 0.749 0.246 0.749
-score PDS_OTHER_BAD_TLD 1.999 1.997 1.999 1.997
-score PDS_PRO_TLD 0.999 0.998 0.999 0.998
-score PDS_SHORT_SPOOFED_URL 1.023 0.431 1.023 0.431
-score PDS_TINYSUBJ_URISHRT 0.750 0.001 0.750 0.001
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 2.000 0.001 2.000 0.001
-score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999 1.997 1.999 1.997
-score PDS_TONAME_EQ_TOLOCAL_SHORT 1.999 1.997 1.999 1.997
+score PDS_NO_FULL_NAME_SPOOFED_URL 0.321 0.035 0.321 0.035
+score PDS_OTHER_BAD_TLD 1.999 1.999 1.999 1.999
+score PDS_PRO_TLD 0.999 1.000 0.999 1.000
+score PDS_SHORT_SPOOFED_URL 0.945 1.827 0.945 1.827
+score PDS_TINYSUBJ_URISHRT 0.853 0.001 0.853 0.001
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999 0.001 1.999 0.001
+score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999 1.999 1.999 1.999
+score PDS_TONAME_EQ_TOLOCAL_SHORT 1.999 1.999 1.999 1.999
score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999 0.999 0.999 0.999
score PHISH_AZURE_CLOUDAPP 3.500 3.500 3.500 3.500
score PHISH_FBASEAPP 1.000 1.000 1.000 1.000
score PHOTO_EDITING_DIRECT 1.000 1.000 1.000 1.000
score PHOTO_EDITING_FREEM 1.000 1.000 1.000 1.000
score PHP_NOVER_MUA 1.000 1.000 1.000 1.000
-score PHP_ORIG_SCRIPT 2.250 0.001 2.250 0.001
-score PHP_SCRIPT 2.499 0.834 2.499 0.834
+score PHP_ORIG_SCRIPT 2.251 0.001 2.251 0.001
+score PHP_SCRIPT 2.496 0.826 2.496 0.826
score PHP_SCRIPT_MUA 1.000 1.000 1.000 1.000
-score PP_MIME_FAKE_ASCII_TEXT 0.999 0.842 0.999 0.842
+score PP_MIME_FAKE_ASCII_TEXT 0.999 0.843 0.999 0.843
score PP_TOO_MUCH_UNICODE02 0.500 0.500 0.500 0.500
score PP_TOO_MUCH_UNICODE05 1.000 1.000 1.000 1.000
score PUMPDUMP 1.000 1.000 1.000 1.000
score PUMPDUMP_MULTI 1.000 1.000 1.000 1.000
-score RAND_HEADER_LIST_SPOOF 2.999 2.996 2.999 2.996
+score RAND_HEADER_LIST_SPOOF 2.999 2.999 2.999 2.999
score RAND_HEADER_MANY 1.000 1.000 1.000 1.000
-score RAND_MKTG_HEADER 2.000 1.997 2.000 1.997
-score RATWARE_NO_RDNS 2.448 0.001 2.448 0.001
+score RAND_MKTG_HEADER 1.999 1.999 1.999 1.999
+score RATWARE_NO_RDNS 0.842 2.321 0.842 2.321
score RCVD_DOTEDU_SHORT 1.000 1.000 1.000 1.000
-score RCVD_DOTEDU_SUSP_URI 2.999 2.996 2.999 2.996
+score RCVD_DOTEDU_SUSP_URI 2.999 2.999 2.999 2.999
score RCVD_IN_MSPIKE_BL 0.001 0.001 0.001 0.001
score RCVD_IN_MSPIKE_H2 0.001 -0.001 0.001 -0.001
score RCVD_IN_MSPIKE_H3 0.001 0.001 0.001 0.001
@@ -312,116 +311,115 @@
score RCVD_IN_MSPIKE_WL 0.001 0.001 0.001 0.001
score RCVD_IN_MSPIKE_ZBI 0.001 0.001 0.001 0.001
score RDNS_NUM_TLD_ATCHNX 1.000 1.000 1.000 1.000
-score RDNS_NUM_TLD_XM 1.883 1.000 1.883 1.000
-score READY_TO_SHIP 1.249 1.248 1.249 1.248
-score REPLYTO_EMPTY 1.935 0.001 1.935 0.001
-score REPTO_419_FRAUD 2.673 2.996 2.673 2.996
+score RDNS_NUM_TLD_XM 1.978 1.000 1.978 1.000
+score READY_TO_SHIP 1.250 1.249 1.250 1.249
+score REPLYTO_EMPTY 3.894 0.001 3.894 0.001
+score REPTO_419_FRAUD 2.900 2.999 2.900 2.999
score REPTO_419_FRAUD_AOL 1.000 1.000 1.000 1.000
score REPTO_419_FRAUD_AOL_LOOSE 1.000 1.000 1.000 1.000
score REPTO_419_FRAUD_CNS 1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD_GM 2.999 2.901 2.999 2.901
+score REPTO_419_FRAUD_GM 2.999 2.500 2.999 2.500
score REPTO_419_FRAUD_GM_LOOSE 1.000 1.000 1.000 1.000
score REPTO_419_FRAUD_HM 1.000 1.000 1.000 1.000
score REPTO_419_FRAUD_OL 1.000 1.000 1.000 1.000
score REPTO_419_FRAUD_PM 1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD_QQ 2.999 2.794 2.999 2.794
+score REPTO_419_FRAUD_QQ 2.999 2.191 2.999 2.191
score REPTO_419_FRAUD_YH 1.000 1.000 1.000 1.000
score REPTO_419_FRAUD_YH_LOOSE 1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD_YJ 2.400 2.996 2.400 2.996
+score REPTO_419_FRAUD_YJ 1.000 2.999 1.000 2.999
score REPTO_419_FRAUD_YN 1.000 1.000 1.000 1.000
-score RISK_FREE 1.997 1.836 1.997 1.836
-score SENDGRID_REDIR 1.499 0.782 1.499 0.782
+score RISK_FREE 1.994 1.822 1.994 1.822
+score SENDGRID_REDIR 1.500 0.783 1.500 0.783
score SENDGRID_REDIR_PHISH 1.000 1.000 1.000 1.000
-score SEO_SUSP_NTLD 1.199 0.001 1.199 0.001
-score SERGIO_SUBJECT_VIAGRA01 3.643 4.195 3.643 4.195
-score SHOPIFY_IMG_NOT_RCVD_SFY 2.499 2.497 2.499 2.497
-score SHORTENER_SHORT_IMG 0.262 1.000 0.262 1.000
-score SHORTENER_SHORT_SUBJ 2.999 2.702 2.999 2.702
-score SHORT_IMG_SUSP_NTLD 0.054 1.000 0.054 1.000
-score SHORT_SHORTNER 1.999 1.291 1.999 1.291
+score SEO_SUSP_NTLD 1.000 0.495 1.000 0.495
+score SERGIO_SUBJECT_VIAGRA01 3.529 4.199 3.529 4.199
+score SHOPIFY_IMG_NOT_RCVD_SFY 2.499 2.499 2.499 2.499
+score SHORTENER_SHORT_IMG 1.000 1.000 1.000 1.000
+score SHORTENER_SHORT_SUBJ 2.999 2.713 2.999 2.713
+score SHORT_IMG_SUSP_NTLD 1.411 1.000 1.411 1.000
+score SHORT_SHORTNER 1.999 1.058 1.999 1.058
score SINGLETS_LOW_CONTRAST 0.001 0.001 0.001 0.001
-score SPOOFED_FREEMAIL 0.001 1.497 0.001 1.497
+score SPOOFED_FREEMAIL 0.001 1.498 0.001 1.498
score SPOOFED_FREEMAIL_NO_RDNS 1.499 0.001 1.499 0.001
-score SPOOFED_FREEM_REPTO 0.001 2.497 0.001 2.497
+score SPOOFED_FREEM_REPTO 0.001 2.499 0.001 2.499
score SPOOFED_FREEM_REPTO_CHN 0.001 1.000 0.001 1.000
score SPOOFED_FREEM_REPTO_RUS 0.001 1.000 0.001 1.000
-score SPOOF_GMAIL_MID 1.499 1.498 1.499 1.498
-score STATIC_XPRIO_OLE 1.997 0.001 1.997 0.001
-score STOCK_LOW_CONTRAST 1.944 0.001 1.944 0.001
+score SPOOF_GMAIL_MID 1.500 1.499 1.500 1.499
+score STATIC_XPRIO_OLE 1.795 0.001 1.795 0.001
+score STOCK_LOW_CONTRAST 1.935 0.001 1.935 0.001
score STOCK_TIP 1.000 1.000 1.000 1.000
score SURBL_BLOCKED 0.001 0.001 0.001 0.001
-score SUSP_UTF8_WORD_SUBJ 1.999 1.997 1.999 1.997
+score SUSP_UTF8_WORD_SUBJ 2.000 1.999 2.000 1.999
score SYSADMIN 1.000 1.000 1.000 1.000
-score THIS_AD 1.299 0.903 1.299 0.903
-score THIS_IS_ADV_SUSP_NTLD 1.499 0.482 1.499 0.482
+score THIS_AD 1.299 0.904 1.299 0.904
+score THIS_IS_ADV_SUSP_NTLD 1.499 1.434 1.499 1.434
score TONLINE_FAKE_DKIM 1.000 1.000 1.000 1.000
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499 1.498 1.499 1.498
-score TO_EQ_FM_DIRECT_MX 1.118 2.452 1.118 2.452
-score TO_EQ_FM_DOM_HTML_IMG 0.001 0.323 0.001 0.323
-score TO_EQ_FM_DOM_HTML_ONLY 1.750 0.881 1.750 0.881
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499 1.499 1.499 1.499
+score TO_EQ_FM_DIRECT_MX 0.001 2.203 0.001 2.203
+score TO_EQ_FM_DOM_HTML_IMG 0.001 0.001 0.001 0.001
+score TO_EQ_FM_DOM_HTML_ONLY 1.202 0.882 1.202 0.882
score TO_EQ_FM_DOM_SPF_FAIL 0.001 0.001 0.001 0.001
-score TO_EQ_FM_HTML_DIRECT 0.884 1.377 0.884 1.377
-score TO_EQ_FM_HTML_ONLY 1.912 1.485 1.912 1.485
-score TO_EQ_FM_SPF_FAIL 0.001 0.084 0.001 0.084
-score TO_IN_SUBJ 0.099 0.098 0.099 0.098
-score TO_NAME_SUBJ_NO_RDNS 2.497 2.238 2.497 2.238
-score TO_NO_BRKTS_FROM_MSSP 2.499 1.038 2.499 1.038
-score TO_NO_BRKTS_HTML_IMG 1.999 1.779 1.999 1.779
-score TO_NO_BRKTS_HTML_ONLY 1.999 1.997 1.999 1.997
-score TO_NO_BRKTS_MSFT 2.499 1.004 2.499 1.004
-score TO_NO_BRKTS_NORDNS_HTML 0.303 0.048 0.303 0.048
-score TO_NO_BRKTS_PCNT 2.499 2.497 2.499 2.497
-score TVD_RCVD_SPACE_BRACKET 2.799 1.928 2.799 1.928
-score TVD_SPACE_ENCODED 0.561 0.001 0.561 0.001
-score TVD_SPACE_RATIO_MINFP 2.499 2.397 2.499 2.397
+score TO_EQ_FM_HTML_DIRECT 3.099 1.626 3.099 1.626
+score TO_EQ_FM_HTML_ONLY 1.706 1.398 1.706 1.398
+score TO_EQ_FM_SPF_FAIL 0.001 0.082 0.001 0.082
+score TO_IN_SUBJ 0.099 0.099 0.099 0.099
+score TO_NAME_SUBJ_NO_RDNS 0.608 2.233 0.608 2.233
+score TO_NO_BRKTS_FROM_MSSP 2.499 1.077 2.499 1.077
+score TO_NO_BRKTS_HTML_IMG 1.999 1.783 1.999 1.783
+score TO_NO_BRKTS_HTML_ONLY 1.999 1.999 1.999 1.999
+score TO_NO_BRKTS_MSFT 2.500 1.003 2.500 1.003
+score TO_NO_BRKTS_NORDNS_HTML 0.252 0.043 0.252 0.043
+score TO_NO_BRKTS_PCNT 2.499 2.499 2.499 2.499
+score TVD_PH_BODY_META 2.500 0.001 2.500 0.001
+score TVD_RCVD_SPACE_BRACKET 2.744 0.147 2.744 0.147
+score TVD_SPACE_ENCODED 0.549 0.001 0.549 0.001
+score TVD_SPACE_RATIO_MINFP 2.499 2.402 2.499 2.402
score TW_GIBBERISH_MANY 1.000 1.000 1.000 1.000
score UC_GIBBERISH_OBFU 1.000 1.000 1.000 1.000
-score UNDISC_FREEM 3.100 3.096 3.100 3.096
-score UNDISC_MONEY 3.499 3.396 3.499 3.396
+score UNDISC_FREEM 3.199 3.099 3.199 3.099
+score UNDISC_MONEY 3.499 3.399 3.499 3.399
score UNICODE_OBFU_ASC 2.499 1.000 2.499 1.000
score UNICODE_OBFU_ZW 1.000 1.000 1.000 1.000
score UPGRADE_MAILBOX 1.199 0.001 1.199 0.001
score URI_ADOBESPARK 1.000 1.000 1.000 1.000
score URI_AZURE_CLOUDAPP 1.000 1.000 1.000 1.000
-score URI_BUFFLY 1.932 1.915 1.932 1.915
score URI_DASHGOVEDU 1.000 1.000 1.000 1.000
score URI_DATA 1.000 1.000 1.000 1.000
-score URI_DEOBFU_INSTR 3.599 3.595 3.599 3.595
-score URI_DOTDOT_LOW_CNTRST 2.499 1.834 2.499 1.834
-score URI_DOTEDU 1.938 1.160 1.938 1.160
+score URI_DEOBFU_INSTR 3.599 3.599 3.599 3.599
+score URI_DOTDOT_LOW_CNTRST 2.499 1.904 2.499 1.904
+score URI_DOTEDU 1.549 1.164 1.549 1.164
score URI_DOTEDU_ENTITY 1.000 1.000 1.000 1.000
-score URI_DQ_UNSUB 2.299 2.397 2.299 2.397
-score URI_FIREBASEAPP 2.999 2.996 2.999 2.996
+score URI_FIREBASEAPP 2.999 2.999 2.999 2.999
score URI_GOOGLE_PROXY 2.899 2.045 2.899 2.045
-score URI_GOOG_STO_SPAMMY 2.366 2.310 2.366 2.310
+score URI_GOOG_STO_SPAMMY 2.729 2.810 2.729 2.810
score URI_HEX_IP 1.000 1.000 1.000 1.000
score URI_IMG_WP_REDIR 1.000 1.000 1.000 1.000
-score URI_LONG_REPEAT 2.411 1.047 2.411 1.047
+score URI_LONG_REPEAT 2.404 1.102 2.404 1.102
score URI_ONLY_MSGID_MALF 0.001 0.001 0.001 0.001
score URI_OPTOUT_3LD 1.000 1.000 1.000 1.000
-score URI_PHISH 3.752 1.993 3.752 1.993
-score URI_PHP_REDIR 3.499 3.496 3.499 3.496
-score URI_TRY_3LD 1.999 1.997 1.999 1.997
+score URI_PHISH 3.637 2.058 3.637 2.058
+score URI_PHP_REDIR 3.499 3.499 3.499 3.499
+score URI_TRY_3LD 1.999 1.999 1.999 1.999
score URI_TRY_USME 1.000 1.000 1.000 1.000
-score URI_WPADMIN 2.599 2.596 2.599 2.596
-score URI_WP_DIRINDEX 2.500 3.496 2.500 3.496
-score URI_WP_HACKED 3.499 3.496 3.499 3.496
-score URI_WP_HACKED_2 2.500 2.497 2.500 2.497
+score URI_WPADMIN 2.499 2.599 2.499 2.599
+score URI_WP_DIRINDEX 2.500 3.499 2.500 3.499
+score URI_WP_HACKED 3.499 3.499 3.499 3.499
+score URI_WP_HACKED_2 2.499 2.499 2.499 2.499
score USB_DRIVES 1.000 1.000 1.000 1.000
-score VFY_ACCT_NORDNS 2.005 2.996 2.005 2.996
+score VFY_ACCT_NORDNS 2.003 2.999 2.003 2.999
score VPS_NO_NTLD 1.000 1.000 1.000 1.000
score WALMART_IMG_NOT_RCVD_WAL 1.000 1.000 1.000 1.000
-score WANT_TO_ORDER 1.437 2.440 1.437 2.440
-score WIKI_IMG 3.001 3.024 3.001 3.024
+score WANT_TO_ORDER 1.466 1.959 1.466 1.959
+score WIKI_IMG 3.002 3.021 3.002 3.021
score WORD_INVIS 1.000 1.000 1.000 1.000
-score WORD_INVIS_MANY 2.999 2.996 2.999 2.996
+score WORD_INVIS_MANY 2.999 2.999 2.999 2.999
score XFER_LOTSA_MONEY 0.999 0.001 0.999 0.001
-score XM_DIGITS_ONLY 2.999 2.907 2.999 2.907
-score XM_LIGHT_HEAVY 2.403 2.497 2.403 2.497
-score XM_LONG_DUP_TO 3.799 3.628 3.799 3.628
-score XM_RANDOM 2.499 2.497 2.499 2.497
-score XM_RECPTID 3.000 2.997 3.000 2.997
+score XM_DIGITS_ONLY 2.999 2.919 2.999 2.919
+score XM_LIGHT_HEAVY 2.392 2.499 2.392 2.499
+score XM_LONG_DUP_TO 3.899 3.433 3.899 3.433
+score XM_RANDOM 2.499 2.499 2.499 2.499
+score XM_RECPTID 2.999 2.999 2.999 2.999
score XPRIO 0.001 1.000 0.001 1.000
score XPRIO_SHORT_SUBJ 1.000 1.000 1.000 1.000
-score YOUR_DELIVERY_ADDRESS 0.268 1.248 0.268 1.248
-score YOU_INHERIT 2.399 1.528 2.399 1.528
+score YOUR_DELIVERY_ADDRESS 0.345 1.249 0.345 1.249
+score YOU_INHERIT 1.553 1.470 1.553 1.470
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index 43da24d..9026670 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -1,5 +1,5 @@
-# Using score set 0 logs for revision 1889515 from:
-# ham-axb-coi-bulk.r1889515.log ham-axb-generic.r1889515.log ham-axb-ham-misc.r1889515.log ham-darxus.r1889515.log ham-ena-week0.r1889515.log ham-ena-week1.r1889515.log ham-ena-week2.r1889515.log ham-ena-week3.r1889515.log ham-ena-week4.r1889515.log ham-giovanni-ham.r1889515.log ham-giovanni-spammy.r1889515.log ham-giovanni-spam.r1889515.log ham-grenier.r1889515.log ham-hege.r1889515.log ham-jhardin.r1889515.log ham-llanga.r1889515.log ham-mmiroslaw-mails-ham.r1889515.log ham-mmiroslaw-mails-spam.r1889515.log ham-pds.r1889515.log ham-sihde.r1889515.log ham-spamsponge.r1889515.log ham-thendrikx.r1889515.log spam-axb-coi-bulk.r1889515.log spam-axb-generic.r1889515.log spam-axb-ham-misc.r1889515.log spam-darxus.r1889515.log spam-ena-week0.r1889515.log spam-ena-week1.r1889515.log spam-ena-week2.r1889515.log spam-ena-week3.r1889515.log spam-ena-week4.r1889515.log spam-giovanni-ham.r1889515.log spam-giovanni-spammy.r1889515.log spam-giovanni-spam.r1889515.log spam-grenier.r1889515.log spam-hege.r1889515.log spam-jhardin.r1889515.log spam-llanga.r1889515.log spam-mmiroslaw-mails-ham.r1889515.log spam-mmiroslaw-mails-spam.r1889515.log spam-pds.r1889515.log spam-sihde.r1889515.log spam-spamsponge.r1889515.log spam-thendrikx.r1889515.log
+# Using score set 0 logs for revision 1889557 from:
+# ham-axb-coi-bulk.r1889557.log ham-axb-generic.r1889557.log ham-axb-ham-misc.r1889557.log ham-darxus.r1889557.log ham-ena-week0.r1889557.log ham-ena-week1.r1889557.log ham-ena-week2.r1889557.log ham-ena-week3.r1889557.log ham-ena-week4.r1889557.log ham-giovanni-ham.r1889557.log ham-giovanni-spammy.r1889557.log ham-giovanni-spam.r1889557.log ham-grenier.r1889557.log ham-hege.r1889557.log ham-jhardin.r1889557.log ham-llanga.r1889557.log ham-mmiroslaw-mails-ham.r1889557.log ham-mmiroslaw-mails-spam.r1889557.log ham-pds.r1889557.log ham-sihde.r1889557.log ham-spamsponge.r1889557.log ham-thendrikx.r1889557.log spam-axb-coi-bulk.r1889557.log spam-axb-generic.r1889557.log spam-axb-ham-misc.r1889557.log spam-darxus.r1889557.log spam-ena-week0.r1889557.log spam-ena-week1.r1889557.log spam-ena-week2.r1889557.log spam-ena-week3.r1889557.log spam-ena-week4.r1889557.log spam-giovanni-ham.r1889557.log spam-giovanni-spammy.r1889557.log spam-giovanni-spam.r1889557.log spam-grenier.r1889557.log spam-hege.r1889557.log spam-jhardin.r1889557.log spam-llanga.r1889557.log spam-mmiroslaw-mails-ham.r1889557.log spam-mmiroslaw-mails-spam.r1889557.log spam-pds.r1889557.log spam-sihde.r1889557.log spam-spamsponge.r1889557.log spam-thendrikx.r1889557.log
score ACCT_PHISHING_MANY 2.999
score AC_BR_BONANZA 0.001
@@ -7,265 +7,259 @@
score AC_FROM_MANY_DOTS 2.999
score AC_HTML_NONSENSE_TAGS 1.999
score ADMITS_SPAM 3.899
-score ADVANCE_FEE_2_NEW_FRM_MNY 1.986
-score ADVANCE_FEE_2_NEW_MONEY 1.276
-score ADVANCE_FEE_3_NEW 2.469
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.001
+score ADVANCE_FEE_2_NEW_FRM_MNY 2.499
+score ADVANCE_FEE_2_NEW_MONEY 1.273
+score ADVANCE_FEE_3_NEW 2.502
+score ADVANCE_FEE_3_NEW_FRM_MNY 0.001 # force non-zero
score ADVANCE_FEE_3_NEW_MONEY 0.001
-score ADVANCE_FEE_4_NEW 2.499
+score ADVANCE_FEE_4_NEW 1.397
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 2.899
-score ADVANCE_FEE_5_NEW 2.297
-score ADVANCE_FEE_5_NEW_FRM_MNY 2.799
-score ADVANCE_FEE_5_NEW_MONEY 1.993
+score ADVANCE_FEE_4_NEW_MONEY 2.487
+score ADVANCE_FEE_5_NEW 2.999
+score ADVANCE_FEE_5_NEW_FRM_MNY 2.403
+score ADVANCE_FEE_5_NEW_MONEY 1.991
score AD_PREFS 0.499
score ALIBABA_IMG_NOT_RCVD_ALI 2.499
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
-score APP_DEVELOPMENT_NORDNS 1.219
+score APP_DEVELOPMENT_NORDNS 1.220
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.545
-score BIGNUM_EMAILS_FREEM 2.859
-score BITCOIN_DEADLINE 2.470
-score BITCOIN_IMGUR 3.492
+score BIGNUM_EMAILS_FREEM 2.619
+score BITCOIN_DEADLINE 2.062
+score BITCOIN_IMGUR 3.231
score BITCOIN_MALF_HTML 3.499
-score BITCOIN_MALWARE 2.101
-score BITCOIN_ONAN 2.620
-score BITCOIN_SPAM_02 2.151
+score BITCOIN_MALWARE 2.437
+score BITCOIN_ONAN 2.207
+score BITCOIN_SPAM_02 1.676
score BITCOIN_SPAM_03 0.001
-score BITCOIN_SPAM_07 2.137
-score BITCOIN_XPRIO 0.001 # force non-zero
-score BITCOIN_YOUR_INFO 2.032
-score BODY_SINGLE_URI 0.800
+score BITCOIN_SPAM_07 3.119
+score BITCOIN_XPRIO 0.001
+score BITCOIN_YOUR_INFO 2.439
+score BODY_SINGLE_URI 0.895
score BODY_SINGLE_WORD 0.001
-score BODY_URI_ONLY 2.252
-score BOGUS_MIME_VERSION 3.500
-score CK_HELO_GENERIC 0.250
-score COMPENSATION 1.500
+score BODY_URI_ONLY 2.341
+score BOGUS_MIME_VERSION 3.499
+score CK_HELO_GENERIC 0.249
+score COMPENSATION 1.137
score CONTENT_AFTER_HTML 2.499
score CTE_8BIT_MISMATCH 0.999
-score DATE_IN_FUTURE_96_Q 2.597
-score DEAR_BENEFICIARY 0.258
+score DATE_IN_FUTURE_96_Q 0.256
+score DEAR_BENEFICIARY 0.720
score DSN_NO_MIMEVERSION 1.999
-score EBAY_IMG_NOT_RCVD_EBAY 2.753
-score END_FUTURE_EMAILS 2.499
-score FAKE_REPLY_A1 2.569
-score FBI_MONEY 1.983
-score FBI_SPOOF 0.562
+score EBAY_IMG_NOT_RCVD_EBAY 1.483
+score END_FUTURE_EMAILS 2.500
+score FAKE_REPLY_A1 2.661
+score FBI_MONEY 0.001
+score FBI_SPOOF 0.250
score FILL_THIS_FORM 1.199
-score FONT_INVIS_DIRECT 0.001 # force non-zero
+score FONT_INVIS_DIRECT 0.001
score FONT_INVIS_HTML_NOHTML 2.999
-score FONT_INVIS_LONG_LINE 2.159
+score FONT_INVIS_LONG_LINE 1.273
score FONT_INVIS_MSGID 2.499
-score FONT_INVIS_NORDNS 0.850
+score FONT_INVIS_NORDNS 1.134
score FORM_FRAUD 0.001
score FORM_FRAUD_3 3.099
-score FORM_FRAUD_5 2.077
+score FORM_FRAUD_5 1.722
score FOUND_YOU 3.249
score FREEMAIL_FORGED_FROMDOMAIN 0.249
-score FROMSPACE 3.299
+score FROMSPACE 3.199
score FROM_2_EMAILS_SHORT 2.999
-score FROM_IN_TO_AND_SUBJ 2.499
+score FROM_IN_TO_AND_SUBJ 2.250
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 0.001 # force non-zero
+score FROM_MISSP_DYNIP 0.001
score FROM_MISSP_EH_MATCH 0.001
-score FROM_MISSP_FREEMAIL 2.898
-score FROM_MISSP_MSFT 2.233
+score FROM_MISSP_FREEMAIL 2.896
+score FROM_MISSP_MSFT 2.249
score FROM_MISSP_PHISH 3.499
-score FROM_MISSP_REPLYTO 2.093
+score FROM_MISSP_REPLYTO 2.400
score FROM_MISSP_TO_UNDISC 0.001
-score FROM_MISSP_USER 0.001
-score FROM_MULTI_NORDNS 0.002
-score FROM_NTLD_REPLY_FREEMAIL 1.421
+score FROM_MISSP_USER 0.001 # force non-zero
+score FROM_MULTI_NORDNS 0.001
+score FROM_NTLD_REPLY_FREEMAIL 1.825
score FROM_SUSPICIOUS_NTLD 0.499
score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_WSP_TRAIL 2.699
+score FROM_WSP_TRAIL 2.799
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FUZZY_AMAZON 2.699
+score FUZZY_AMAZON 2.799
score GB_FAKE_RF_SHORT 1.999
-score GB_FREEMAIL_DISPTO 0.499
+score GB_FREEMAIL_DISPTO 0.500
score GOOGLE_DOC_SUSP 2.999
-score GOOG_REDIR_NORDNS 2.494
-score GOOG_STO_EMAIL_PHISH 2.331
-score GOOG_STO_HTML_PHISH 2.969
-score GOOG_STO_HTML_PHISH_MANY 3.999
+score GOOG_REDIR_NORDNS 2.498
+score GOOG_STO_EMAIL_PHISH 1.906
+score GOOG_STO_HTML_PHISH 2.917
score GOOG_STO_IMG_HTML 2.999
score GOOG_STO_NOIMG_HTML 2.999
-score HAS_X_OUTGOING_SPAM_STAT 1.702
-score HDRS_LCASE 0.100
-score HDRS_LCASE_IMGONLY 0.099
+score HAS_X_OUTGOING_SPAM_STAT 1.611
+score HDRS_LCASE 0.099
+score HDRS_LCASE_IMGONLY 0.100
score HDRS_MISSP 2.499
-score HDR_ORDER_FTSDMCXX_DIRECT 1.999
+score HDR_ORDER_FTSDMCXX_DIRECT 2.000
score HDR_ORDER_FTSDMCXX_NORDNS 0.001
-score HEADER_FROM_DIFFERENT_DOMAINS 0.249
+score HEADER_FROM_DIFFERENT_DOMAINS 0.250
score HELO_NO_DOMAIN 0.001
score HK_LOTTO 0.999
-score HK_NAME_FM_MR_MRS 0.274
-score HK_NAME_MR_MRS 1.000
-score HK_RANDOM_ENVFROM 1.000
-score HK_RANDOM_FROM 0.999
+score HK_NAME_FM_MR_MRS 0.241
+score HK_NAME_MR_MRS 0.999
+score HK_RANDOM_ENVFROM 0.999
+score HK_RANDOM_FROM 1.000
score HK_RANDOM_REPLYTO 0.999
-score HK_SCAM 1.334
-score HOSTED_IMG_DIRECT_MX 2.662
+score HK_SCAM 2.000
+score HOSTED_IMG_DIRECT_MX 2.483
score HOSTED_IMG_FREEM 3.499
-score HOSTED_IMG_MULTI 2.999
+score HOSTED_IMG_MULTI 2.723
score HOSTED_IMG_MULTI_PUB_01 2.999
score HTML_ENTITY_ASCII 2.999
score HTML_OFF_PAGE 2.999
score HTML_SINGLET_MANY 0.001
-score HTML_TAG_BALANCE_CENTER 3.599
-score HTML_TEXT_INVISIBLE_FONT 1.185
-score HTML_TEXT_INVISIBLE_STYLE 1.750
-score IMG_ONLY_FM_DOM_INFO 0.001
+score HTML_TAG_BALANCE_CENTER 2.720
+score HTML_TEXT_INVISIBLE_FONT 1.187
+score HTML_TEXT_INVISIBLE_STYLE 1.466
score JH_SPAMMY_HEADERS 3.499
-score KHOP_FAKE_EBAY 0.073
-score KHOP_HELO_FCRDNS 0.400
+score KHOP_FAKE_EBAY 0.071
+score KHOP_HELO_FCRDNS 0.399
score LIST_PRTL_SAME_USER 0.001
-score LONG_HEX_URI 2.999
-score LONG_IMG_URI 0.491
-score LONG_INVISIBLE_TEXT 2.031
+score LONG_HEX_URI 2.599
+score LONG_IMG_URI 1.684
+score LONG_INVISIBLE_TEXT 3.000
score LOTS_OF_MONEY 0.010
-score LOTTO_AGENT 0.561
+score LOTTO_AGENT 1.499
score LOTTO_DEPT 0.001
-score MALFORMED_FREEMAIL 3.399
+score MALFORMED_FREEMAIL 3.186
score MALWARE_NORDNS 0.001
score MANY_SPAN_IN_TEXT 2.699
-score MAY_BE_FORGED 2.099
+score MAY_BE_FORGED 2.093
score MILLION_HUNDRED 0.001
-score MILLION_USD 0.001
+score MILLION_USD 0.236
score MIMEOLE_DIRECT_TO_MX 0.001
-score MIXED_AREA_CASE 0.867
-score MIXED_CENTER_CASE 1.410
-score MIXED_CTYPE_CASE 1.791
-score MIXED_ES 3.199
+score MIXED_AREA_CASE 1.409
+score MIXED_CENTER_CASE 1.715
+score MIXED_CTYPE_CASE 0.693
+score MIXED_ES 3.099
score MIXED_FONT_CASE 0.001
score MIXED_HREF_CASE 1.999
score MIXED_IMG_CASE 2.999
score MONEY_ATM_CARD 0.001
-score MONEY_FORM 0.001 # force non-zero
-score MONEY_FORM_SHORT 2.499
-score MONEY_FRAUD_3 2.449
-score MONEY_FRAUD_5 0.001
-score MONEY_FRAUD_8 1.424
-score MONEY_FREEMAIL_REPTO 3.000
+score MONEY_FORM 0.001
+score MONEY_FORM_SHORT 1.948
+score MONEY_FRAUD_3 3.099
+score MONEY_FRAUD_5 2.712
+score MONEY_FRAUD_8 2.063
+score MONEY_FREEMAIL_REPTO 2.999
score MONEY_FROM_41 1.999
score MONEY_FROM_MISSP 0.001
score MONEY_NOHTML 2.499
-score MSGID_HDR_MALF 1.701
-score MSGID_NOFQDN1 0.501
-score MSMAIL_PRI_ABNORMAL 0.290
+score MSGID_HDR_MALF 2.696
+score MSGID_NOFQDN1 0.496
+score MSMAIL_PRI_ABNORMAL 0.908
score MSM_PRIO_REPTO 0.001
score NA_DOLLARS 1.499
-score NICE_REPLY_A -0.242
+score NICE_REPLY_A -0.243
score NORDNS_LOW_CONTRAST 1.885
-score NO_FM_NAME_IP_HOSTN 0.001
+score NO_FM_NAME_IP_HOSTN 0.202
score NSL_RCVD_FROM_USER 0.001
score NSL_RCVD_HELO_USER 0.001
-score NUMBEREND_LINKBAIT 0.267
+score NUMBEREND_LINKBAIT 0.714
score ODD_FREEM_REPTO 3.000
-score OFFER_ONLY_AMERICA 1.564
+score OFFER_ONLY_AMERICA 1.999
score ONLINE_MKTG_CNSLT 2.599
-score PDS_BAD_THREAD_QP_64 1.000
-score PDS_BTC_ID 0.499
+score PDS_BAD_THREAD_QP_64 0.999
+score PDS_BTC_ID 0.500
score PDS_BTC_MSGID 0.001
score PDS_DBL_URL_TNB_RUNON 0.001
-score PDS_EMPTYSUBJ_URISHRT 1.247
+score PDS_EMPTYSUBJ_URISHRT 0.947
score PDS_FRNOM_TODOM_DBL_URL 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 3.499
-score PDS_FROM_2_EMAILS_SHRTNER 0.470
+score PDS_FROM_2_EMAILS 3.139
+score PDS_FROM_2_EMAILS_SHRTNER 0.440
score PDS_FROM_NAME_TO_DOMAIN 1.999
-score PDS_NO_FULL_NAME_SPOOFED_URL 0.246
+score PDS_NO_FULL_NAME_SPOOFED_URL 0.321
score PDS_OTHER_BAD_TLD 1.999
score PDS_PRO_TLD 0.999
-score PDS_SHORT_SPOOFED_URL 1.023
-score PDS_TINYSUBJ_URISHRT 0.750
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 2.000
+score PDS_SHORT_SPOOFED_URL 0.945
+score PDS_TINYSUBJ_URISHRT 0.853
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
score PDS_TONAME_EQ_TOLOCAL_SHORT 1.999
score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
-score PHP_ORIG_SCRIPT 2.250
-score PHP_SCRIPT 2.499
+score PHP_ORIG_SCRIPT 2.251
+score PHP_SCRIPT 2.496
score PP_MIME_FAKE_ASCII_TEXT 0.999
score RAND_HEADER_LIST_SPOOF 2.999
-score RAND_MKTG_HEADER 2.000
-score RATWARE_NO_RDNS 2.448
+score RAND_MKTG_HEADER 1.999
+score RATWARE_NO_RDNS 0.842
score RCVD_DOTEDU_SUSP_URI 2.999
-score RDNS_NUM_TLD_XM 1.883
-score READY_TO_SHIP 1.249
-score REPLYTO_EMPTY 1.935
-score REPTO_419_FRAUD 2.673
+score RDNS_NUM_TLD_XM 1.978
+score READY_TO_SHIP 1.250
+score REPLYTO_EMPTY 3.894
+score REPTO_419_FRAUD 2.900
score REPTO_419_FRAUD_GM 2.999
+score REPTO_419_FRAUD_GM_LOOSE 1.000
score REPTO_419_FRAUD_QQ 2.999
-score REPTO_419_FRAUD_YJ 2.400
-score RISK_FREE 1.997
-score SENDGRID_REDIR 1.499
-score SEO_SUSP_NTLD 1.199
-score SERGIO_SUBJECT_VIAGRA01 3.643
+score RISK_FREE 1.994
+score SENDGRID_REDIR 1.500
+score SERGIO_SUBJECT_VIAGRA01 3.529
score SHOPIFY_IMG_NOT_RCVD_SFY 2.499
-score SHORTENER_SHORT_IMG 0.262
score SHORTENER_SHORT_SUBJ 2.999
-score SHORT_IMG_SUSP_NTLD 0.054
+score SHORT_IMG_SUSP_NTLD 1.411
score SHORT_SHORTNER 1.999
-score SINGLETS_LOW_CONTRAST 0.001
+score SINGLETS_LOW_CONTRAST 0.001 # force non-zero
score SPOOFED_FREEMAIL_NO_RDNS 1.499
-score SPOOF_GMAIL_MID 1.499
-score STATIC_XPRIO_OLE 1.997
-score STOCK_LOW_CONTRAST 1.944
-score SUSP_UTF8_WORD_SUBJ 1.999
+score SPOOF_GMAIL_MID 1.500
+score STATIC_XPRIO_OLE 1.795
+score STOCK_LOW_CONTRAST 1.935
+score SUSP_UTF8_WORD_SUBJ 2.000
score THIS_AD 1.299
score THIS_IS_ADV_SUSP_NTLD 1.499
score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
-score TO_EQ_FM_DIRECT_MX 1.118
+score TO_EQ_FM_DIRECT_MX 0.001
score TO_EQ_FM_DOM_HTML_IMG 0.001
-score TO_EQ_FM_DOM_HTML_ONLY 1.750
-score TO_EQ_FM_HTML_DIRECT 0.884
-score TO_EQ_FM_HTML_ONLY 1.912
+score TO_EQ_FM_DOM_HTML_ONLY 1.202
+score TO_EQ_FM_HTML_DIRECT 3.099
+score TO_EQ_FM_HTML_ONLY 1.706
score TO_IN_SUBJ 0.099
-score TO_NAME_SUBJ_NO_RDNS 2.497
+score TO_NAME_SUBJ_NO_RDNS 0.608
score TO_NO_BRKTS_FROM_MSSP 2.499
score TO_NO_BRKTS_HTML_IMG 1.999
score TO_NO_BRKTS_HTML_ONLY 1.999
-score TO_NO_BRKTS_MSFT 2.499
-score TO_NO_BRKTS_NORDNS_HTML 0.303
+score TO_NO_BRKTS_MSFT 2.500
+score TO_NO_BRKTS_NORDNS_HTML 0.252
score TO_NO_BRKTS_PCNT 2.499
-score TVD_RCVD_SPACE_BRACKET 2.799
-score TVD_SPACE_ENCODED 0.561
+score TVD_PH_BODY_META 2.500
+score TVD_RCVD_SPACE_BRACKET 2.744
+score TVD_SPACE_ENCODED 0.549
score TVD_SPACE_RATIO_MINFP 2.499
-score UNDISC_FREEM 3.100
+score UNDISC_FREEM 3.199
score UNDISC_MONEY 3.499
score UNICODE_OBFU_ASC 2.499
score UPGRADE_MAILBOX 1.199
-score URI_BUFFLY 1.932
score URI_DEOBFU_INSTR 3.599
score URI_DOTDOT_LOW_CNTRST 2.499
-score URI_DOTEDU 1.938
-score URI_DQ_UNSUB 2.299
+score URI_DOTEDU 1.549
score URI_FIREBASEAPP 2.999
score URI_GOOGLE_PROXY 2.899
-score URI_GOOG_STO_SPAMMY 2.366
-score URI_LONG_REPEAT 2.411
+score URI_GOOG_STO_SPAMMY 2.729
+score URI_LONG_REPEAT 2.404
score URI_ONLY_MSGID_MALF 0.001
-score URI_PHISH 3.752
+score URI_PHISH 3.637
score URI_PHP_REDIR 3.499
score URI_TRY_3LD 1.999
-score URI_WPADMIN 2.599
+score URI_WPADMIN 2.499
score URI_WP_DIRINDEX 2.500
score URI_WP_HACKED 3.499
-score URI_WP_HACKED_2 2.500
-score VFY_ACCT_NORDNS 2.005
-score WANT_TO_ORDER 1.437
-score WIKI_IMG 3.001
+score URI_WP_HACKED_2 2.499
+score VFY_ACCT_NORDNS 2.003
+score WANT_TO_ORDER 1.466
+score WIKI_IMG 3.002
score WORD_INVIS_MANY 2.999
score XFER_LOTSA_MONEY 0.999
score XM_DIGITS_ONLY 2.999
-score XM_LIGHT_HEAVY 2.403
-score XM_LONG_DUP_TO 3.799
+score XM_LIGHT_HEAVY 2.392
+score XM_LONG_DUP_TO 3.899
score XM_RANDOM 2.499
-score XM_RECPTID 3.000
+score XM_RECPTID 2.999
score XPRIO 0.001
-score YOUR_DELIVERY_ADDRESS 0.268
-score YOU_INHERIT 2.399
+score YOUR_DELIVERY_ADDRESS 0.345
+score YOU_INHERIT 1.553
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
@@ -321,6 +315,7 @@
score GOOGLE_DOCS_PHISH_MANY 1.000
score GOOGLE_DRIVE_REPLY_BAD_NTLD 1.000
score GOOG_MALWARE_DNLD 1.000
+score GOOG_STO_HTML_PHISH_MANY 1.000
score GOOG_STO_IMG_NOHTML 1.000
score HAS_X_NO_RELAY 1.000
score HEXHASH_WORD 1.000
@@ -330,6 +325,7 @@
score HOSTED_IMG_DQ_UNSUB 1.000
score HTML_ENTITY_ASCII_TINY 1.000
score HTML_SHRT_CMNT_OBFU_MANY 1.000
+score IMG_ONLY_FM_DOM_INFO 1.000
score JH_SPAMMY_PATTERN01 1.000
score JH_SPAMMY_PATTERN02 1.000
score LIST_PRTL_PUMPDUMP 1.000
@@ -361,14 +357,16 @@
score REPTO_419_FRAUD_AOL 1.000
score REPTO_419_FRAUD_AOL_LOOSE 1.000
score REPTO_419_FRAUD_CNS 1.000
-score REPTO_419_FRAUD_GM_LOOSE 1.000
score REPTO_419_FRAUD_HM 1.000
score REPTO_419_FRAUD_OL 1.000
score REPTO_419_FRAUD_PM 1.000
score REPTO_419_FRAUD_YH 1.000
score REPTO_419_FRAUD_YH_LOOSE 1.000
+score REPTO_419_FRAUD_YJ 1.000
score REPTO_419_FRAUD_YN 1.000
score SENDGRID_REDIR_PHISH 1.000
+score SEO_SUSP_NTLD 1.000
+score SHORTENER_SHORT_IMG 1.000
score STOCK_TIP 1.000
score SYSADMIN 1.000
score TONLINE_FAKE_DKIM 1.000
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index b2ef759..f2eb4e7 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -1,280 +1,279 @@
# Using score set 1 logs for revision 1889355 from:
# ham-net-axb-coi-bulk.r1889355.log ham-net-axb-generic.r1889355.log ham-net-axb-ham-misc.r1889355.log ham-net-darxus.r1889355.log ham-net-ena-week0.r1889355.log ham-net-ena-week1.r1889355.log ham-net-ena-week2.r1889355.log ham-net-ena-week3.r1889355.log ham-net-ena-week4.r1889355.log ham-net-grenier.r1889355.log ham-net-hege.r1889355.log ham-net-jhardin.r1889355.log ham-net-llanga.r1889355.log ham-net-mmiroslaw-mails-ham.r1889355.log ham-net-mmiroslaw-mails-spam.r1889355.log ham-net-pds.r1889355.log ham-net-sihde.r1889355.log ham-net-spamsponge.r1889355.log ham-net-thendrikx.r1889355.log spam-net-axb-coi-bulk.r1889355.log spam-net-axb-generic.r1889355.log spam-net-axb-ham-misc.r1889355.log spam-net-darxus.r1889355.log spam-net-ena-week0.r1889355.log spam-net-ena-week1.r1889355.log spam-net-ena-week2.r1889355.log spam-net-ena-week3.r1889355.log spam-net-ena-week4.r1889355.log spam-net-grenier.r1889355.log spam-net-hege.r1889355.log spam-net-jhardin.r1889355.log spam-net-llanga.r1889355.log spam-net-mmiroslaw-mails-ham.r1889355.log spam-net-mmiroslaw-mails-spam.r1889355.log spam-net-pds.r1889355.log spam-net-sihde.r1889355.log spam-net-spamsponge.r1889355.log spam-net-thendrikx.r1889355.log
-score ACCT_PHISHING_MANY 0.467
+score ACCT_PHISHING_MANY 0.504
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001 # force non-zero
-score AC_FROM_MANY_DOTS 2.996
-score AC_HTML_NONSENSE_TAGS 1.997
-score ADMITS_SPAM 3.895
+score AC_FROM_MANY_DOTS 2.999
+score AC_HTML_NONSENSE_TAGS 1.999
+score ADMITS_SPAM 3.899
score ADVANCE_FEE_2_NEW_FRM_MNY 0.001
score ADVANCE_FEE_2_NEW_MONEY 0.001
-score ADVANCE_FEE_3_NEW 3.496
-score ADVANCE_FEE_3_NEW_FRM_MNY 2.497
+score ADVANCE_FEE_3_NEW 3.499
+score ADVANCE_FEE_3_NEW_FRM_MNY 2.499
score ADVANCE_FEE_3_NEW_MONEY 0.001
-score ADVANCE_FEE_4_NEW 2.497
+score ADVANCE_FEE_4_NEW 2.499
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 2.091
-score ADVANCE_FEE_5_NEW 2.497
-score ADVANCE_FEE_5_NEW_FRM_MNY 2.796
-score ADVANCE_FEE_5_NEW_MONEY 3.196
-score AD_PREFS 0.498
-score ALIBABA_IMG_NOT_RCVD_ALI 2.490
+score ADVANCE_FEE_4_NEW_MONEY 2.093
+score ADVANCE_FEE_5_NEW 2.494
+score ADVANCE_FEE_5_NEW_FRM_MNY 2.799
+score ADVANCE_FEE_5_NEW_MONEY 3.199
+score AD_PREFS 0.499
+score ALIBABA_IMG_NOT_RCVD_ALI 2.496
score AMAZON_IMG_NOT_RCVD_AMZN 0.001
-score APP_DEVELOPMENT_NORDNS 0.823
+score APP_DEVELOPMENT_NORDNS 0.824
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.350
-score BIGNUM_EMAILS_FREEM 2.302
-score BITCOIN_DEADLINE 1.848
-score BITCOIN_EXTORT_01 2.558
-score BITCOIN_IMGUR 3.496
-score BITCOIN_MALF_HTML 3.496
-score BITCOIN_MALWARE 1.498
-score BITCOIN_ONAN 2.996
-score BITCOIN_SPAM_02 2.497
-score BITCOIN_SPAM_03 0.001
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.021
+score BIGNUM_EMAILS_FREEM 2.886
+score BITCOIN_DEADLINE 2.755
+score BITCOIN_EXTORT_01 2.484
+score BITCOIN_IMGUR 3.499
+score BITCOIN_MALF_HTML 3.499
+score BITCOIN_MALWARE 1.513
+score BITCOIN_ONAN 2.999
+score BITCOIN_SPAM_02 2.500
+score BITCOIN_SPAM_03 0.001 # force non-zero
score BITCOIN_SPAM_05 0.001
score BITCOIN_XPRIO 0.001
-score BITCOIN_YOUR_INFO 2.647
-score BODY_SINGLE_URI 2.497
-score BODY_SINGLE_WORD 0.001 # force non-zero
-score BODY_URI_ONLY 1.528
+score BITCOIN_YOUR_INFO 1.759
+score BODY_SINGLE_URI 2.499
+score BODY_SINGLE_WORD 0.001
+score BODY_URI_ONLY 1.918
score BOGUS_MIME_VERSION 1.913
score CK_HELO_GENERIC 0.001
-score CONTENT_AFTER_HTML 2.497
-score CTE_8BIT_MISMATCH 0.835
-score DATE_IN_FUTURE_96_Q 2.599
-score DEAR_BENEFICIARY 3.296
-score DKIMWL_BL 2.996
-score DKIMWL_WL_HIGH -0.690
-score DKIMWL_WL_MED -0.001 # force non-zero
+score CONTENT_AFTER_HTML 2.499
+score CTE_8BIT_MISMATCH 0.838
+score DATE_IN_FUTURE_96_Q 1.475
+score DEAR_BENEFICIARY 3.299
+score DKIMWL_BL 2.999
+score DKIMWL_WL_HIGH -0.699
+score DKIMWL_WL_MED -0.001
score DKIMWL_WL_MEDHI -0.001
-score DSN_NO_MIMEVERSION 1.997
-score EBAY_IMG_NOT_RCVD_EBAY 2.999
-score FAKE_REPLY_A1 2.904
-score FAKE_REPLY_B 1.417
-score FBI_MONEY 1.237
-score FBI_SPOOF 1.095
-score FILL_THIS_FORM 0.001 # force non-zero
-score FONT_INVIS_DIRECT 1.141
-score FONT_INVIS_HTML_NOHTML 2.953
-score FONT_INVIS_LONG_LINE 2.997
-score FONT_INVIS_MSGID 1.984
-score FONT_INVIS_NORDNS 2.498
-score FORGED_SPF_HELO 2.696
+score DSN_NO_MIMEVERSION 1.999
+score EBAY_IMG_NOT_RCVD_EBAY 1.958
+score FAKE_REPLY_A1 3.016
+score FAKE_REPLY_B 1.079
+score FBI_MONEY 1.159
+score FBI_SPOOF 1.899
+score FILL_THIS_FORM 0.001
+score FONT_INVIS_DIRECT 1.640
+score FONT_INVIS_HTML_NOHTML 1.984
+score FONT_INVIS_LONG_LINE 2.999
+score FONT_INVIS_MSGID 1.978
+score FONT_INVIS_NORDNS 2.499
+score FORGED_SPF_HELO 2.700
score FORM_FRAUD 0.001
-score FORM_FRAUD_3 0.933
-score FORM_FRAUD_5 1.522
-score FOUND_YOU 0.680
-score FREEMAIL_FORGED_FROMDOMAIN 0.248
-score FROMSPACE 3.296
-score FROM_2_EMAILS_SHORT 2.996
-score FROM_FMBLA_NEWDOM 1.498
-score FROM_FMBLA_NEWDOM14 0.998
-score FROM_FMBLA_NEWDOM28 0.798
+score FORM_FRAUD_3 2.328
+score FORM_FRAUD_5 1.564
+score FOUND_YOU 0.689
+score FREEMAIL_FORGED_FROMDOMAIN 0.249
+score FROMSPACE 3.299
+score FROM_2_EMAILS_SHORT 2.999
+score FROM_FMBLA_NEWDOM 1.499
+score FROM_FMBLA_NEWDOM14 1.000
+score FROM_FMBLA_NEWDOM28 0.799
score FROM_GOV_DKIM_AU -0.001
-score FROM_GOV_SPOOF 0.998
-score FROM_IN_TO_AND_SUBJ 2.497
+score FROM_GOV_SPOOF 0.999
+score FROM_IN_TO_AND_SUBJ 2.499
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 1.611
+score FROM_MISSP_DYNIP 2.151
score FROM_MISSP_EH_MATCH 0.001
-score FROM_MISSP_FREEMAIL 0.001 # force non-zero
+score FROM_MISSP_FREEMAIL 0.001
score FROM_MISSP_MSFT 0.001
score FROM_MISSP_PHISH 0.001
-score FROM_MISSP_REPLYTO 2.497
-score FROM_MISSP_SPF_FAIL 0.877
+score FROM_MISSP_REPLYTO 2.499
+score FROM_MISSP_SPF_FAIL 0.879
score FROM_MISSP_TO_UNDISC 0.001
score FROM_MISSP_USER 0.001
-score FROM_MULTI_NORDNS 3.995
-score FROM_NEWDOM_BTC 0.626
-score FROM_NTLD_REPLY_FREEMAIL 1.258
-score FROM_PAYPAL_SPOOF 0.880
+score FROM_MULTI_NORDNS 3.999
+score FROM_NEWDOM_BTC 1.126
+score FROM_NTLD_REPLY_FREEMAIL 0.714
+score FROM_PAYPAL_SPOOF 0.558
score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 1.998
+score FROM_SUSPICIOUS_NTLD_FP 1.999
score FSL_BULK_SIG 0.001
score FSL_CTYPE_WIN1251 0.001
-score FSL_NEW_HELO_USER 0.001
-score FUZZY_AMAZON 2.697
-score FUZZY_BITCOIN 0.610
-score GB_FAKE_RF_SHORT 1.997
-score GB_FREEMAIL_DISPTO 0.498
-score GOOGLE_DOC_SUSP 2.996
-score GOOG_REDIR_NORDNS 1.810
-score GOOG_STO_HTML_PHISH 1.221
-score GOOG_STO_IMG_HTML 2.996
-score GOOG_STO_NOIMG_HTML 2.996
-score HAS_X_OUTGOING_SPAM_STAT 1.997
-score HDRS_LCASE 0.098
-score HDRS_LCASE_IMGONLY 0.098
-score HDRS_MISSP 2.497
-score HDR_ORDER_FTSDMCXX_DIRECT 1.807
+score FSL_NEW_HELO_USER 0.001 # force non-zero
+score FUZZY_AMAZON 2.699
+score FUZZY_BITCOIN 0.696
+score GB_FAKE_RF_SHORT 1.999
+score GB_FREEMAIL_DISPTO 0.499
+score GOOGLE_DOC_SUSP 2.999
+score GOOG_REDIR_NORDNS 1.818
+score GOOG_STO_HTML_PHISH 1.788
+score GOOG_STO_IMG_HTML 2.999
+score GOOG_STO_NOIMG_HTML 2.999
+score HAS_X_OUTGOING_SPAM_STAT 1.999
+score HDRS_LCASE 0.100
+score HDRS_LCASE_IMGONLY 0.100
+score HDRS_MISSP 2.499
+score HDR_ORDER_FTSDMCXX_DIRECT 1.813
score HDR_ORDER_FTSDMCXX_NORDNS 0.001
-score HEADER_FROM_DIFFERENT_DOMAINS 0.248
-score HELO_NO_DOMAIN 0.001
-score HK_LOTTO 0.998
-score HK_NAME_FM_MR_MRS 1.498
-score HK_NAME_MR_MRS 0.998
-score HK_RANDOM_ENVFROM 0.998
+score HEADER_FROM_DIFFERENT_DOMAINS 0.249
+score HELO_NO_DOMAIN 0.001 # force non-zero
+score HK_LOTTO 0.999
+score HK_NAME_FM_MR_MRS 1.499
+score HK_NAME_MR_MRS 0.999
+score HK_RANDOM_ENVFROM 0.999
score HK_RANDOM_FROM 0.999
-score HK_RANDOM_REPLYTO 0.976
+score HK_RANDOM_REPLYTO 0.979
score HK_SCAM 0.741
-score HOSTED_IMG_DIRECT_MX 1.980
-score HOSTED_IMG_FREEM 3.496
-score HOSTED_IMG_MULTI 0.064
-score HOSTED_IMG_MULTI_PUB_01 2.996
-score HTML_ENTITY_ASCII 2.946
-score HTML_OFF_PAGE 2.996
-score HTML_SINGLET_MANY 1.417
-score HTML_TAG_BALANCE_CENTER 2.952
-score HTML_TEXT_INVISIBLE_FONT 0.464
-score HTML_TEXT_INVISIBLE_STYLE 1.932
-score JH_SPAMMY_HEADERS 3.496
-score KHOP_FAKE_EBAY 1.198
-score KHOP_HELO_FCRDNS 0.398
-score LIST_PRTL_SAME_USER 0.930
+score HOSTED_IMG_DIRECT_MX 2.281
+score HOSTED_IMG_FREEM 3.499
+score HOSTED_IMG_MULTI 0.991
+score HOSTED_IMG_MULTI_PUB_01 2.999
+score HTML_ENTITY_ASCII 2.950
+score HTML_OFF_PAGE 2.999
+score HTML_SINGLET_MANY 1.410
+score HTML_TAG_BALANCE_CENTER 2.961
+score HTML_TEXT_INVISIBLE_FONT 0.469
+score HTML_TEXT_INVISIBLE_STYLE 1.929
+score JH_SPAMMY_HEADERS 3.500
+score KHOP_FAKE_EBAY 1.199
+score KHOP_HELO_FCRDNS 0.399
+score LIST_PRTL_SAME_USER 1.346
score LONG_HEX_URI 0.001
-score LONG_IMG_URI 0.898
-score LONG_INVISIBLE_TEXT 2.494
-score LOTS_OF_MONEY 0.010
-score LOTTO_AGENT 1.498
+score LONG_IMG_URI 0.912
+score LONG_INVISIBLE_TEXT 2.482
+score LOTS_OF_MONEY 0.009
+score LOTTO_AGENT 1.499
score LOTTO_DEPT 0.001
-score MALWARE_NORDNS 0.001 # force non-zero
-score MANY_SPAN_IN_TEXT 2.688
-score MAY_BE_FORGED 1.022
+score MALWARE_NORDNS 0.001
+score MANY_SPAN_IN_TEXT 2.698
+score MAY_BE_FORGED 1.015
score MILLION_HUNDRED 0.001
score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 0.001
-score MIXED_AREA_CASE 2.429
-score MIXED_CENTER_CASE 1.391
-score MIXED_CTYPE_CASE 2.057
-score MIXED_ES 2.595
-score MIXED_FONT_CASE 0.588
-score MIXED_HREF_CASE 1.997
-score MIXED_IMG_CASE 2.996
+score MIXED_AREA_CASE 2.047
+score MIXED_CENTER_CASE 2.002
+score MIXED_CTYPE_CASE 2.872
+score MIXED_ES 2.599
+score MIXED_FONT_CASE 0.735
+score MIXED_HREF_CASE 1.999
+score MIXED_IMG_CASE 2.999
score MONEY_ATM_CARD 0.001
-score MONEY_FORM 0.001 # force non-zero
-score MONEY_FORM_SHORT 1.429
-score MONEY_FRAUD_3 2.668
+score MONEY_FORM 0.001
+score MONEY_FORM_SHORT 1.424
+score MONEY_FRAUD_3 2.721
score MONEY_FRAUD_5 0.001
-score MONEY_FRAUD_8 1.680
+score MONEY_FRAUD_8 0.980
score MONEY_FREEMAIL_REPTO 1.085
-score MONEY_FROM_41 1.997
+score MONEY_FROM_41 1.999
score MONEY_FROM_MISSP 0.001
-score MONEY_NOHTML 2.497
-score MSGID_HDR_MALF 3.496
-score MSGID_NOFQDN1 1.649
-score MSMAIL_PRI_ABNORMAL 1.499
+score MONEY_NOHTML 2.499
+score MSGID_HDR_MALF 3.499
+score MSGID_NOFQDN1 1.639
+score MSMAIL_PRI_ABNORMAL 0.001
score MSM_PRIO_REPTO 0.001
-score NA_DOLLARS 1.498
+score NA_DOLLARS 1.499
score NICE_REPLY_A -0.001
-score NORDNS_LOW_CONTRAST 2.200
-score NO_FM_NAME_IP_HOSTN 0.001
+score NORDNS_LOW_CONTRAST 2.202
+score NO_FM_NAME_IP_HOSTN 0.001 # force non-zero
score NSL_RCVD_FROM_USER 0.001
score NSL_RCVD_HELO_USER 0.001
-score NUMBEREND_LINKBAIT 0.738
-score ODD_FREEM_REPTO 2.938
-score OFFER_ONLY_AMERICA 1.214
-score ONLINE_MKTG_CNSLT 2.696
-score PDS_BAD_THREAD_QP_64 0.998
-score PDS_BTC_ID 0.498
+score NUMBEREND_LINKBAIT 0.757
+score ODD_FREEM_REPTO 2.946
+score OFFER_ONLY_AMERICA 0.770
+score ONLINE_MKTG_CNSLT 2.699
+score PDS_BAD_THREAD_QP_64 0.999
+score PDS_BTC_ID 0.487
score PDS_BTC_MSGID 0.001
score PDS_DBL_URL_TNB_RUNON 0.001
score PDS_EMPTYSUBJ_URISHRT 0.001
-score PDS_FRNOM_TODOM_DBL_URL 1.498
-score PDS_FRNOM_TODOM_NAKED_TO 1.149
-score PDS_FROM_2_EMAILS 2.683
-score PDS_FROM_2_EMAILS_SHRTNER 1.499
-score PDS_FROM_NAME_TO_DOMAIN 1.387
-score PDS_NO_FULL_NAME_SPOOFED_URL 0.749
-score PDS_OTHER_BAD_TLD 1.997
-score PDS_PRO_TLD 0.998
-score PDS_SHORT_SPOOFED_URL 0.431
+score PDS_FRNOM_TODOM_DBL_URL 1.499
+score PDS_FRNOM_TODOM_NAKED_TO 0.520
+score PDS_FROM_2_EMAILS 2.687
+score PDS_FROM_2_EMAILS_SHRTNER 0.680
+score PDS_FROM_NAME_TO_DOMAIN 1.925
+score PDS_NO_FULL_NAME_SPOOFED_URL 0.035
+score PDS_OTHER_BAD_TLD 1.999
+score PDS_PRO_TLD 1.000
+score PDS_SHORT_SPOOFED_URL 1.827
score PDS_TINYSUBJ_URISHRT 0.001
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.001
-score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.997
-score PDS_TONAME_EQ_TOLOCAL_SHORT 1.997
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.001 # force non-zero
+score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
+score PDS_TONAME_EQ_TOLOCAL_SHORT 1.999
score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
-score PHP_ORIG_SCRIPT 0.001 # force non-zero
-score PHP_SCRIPT 0.834
-score PP_MIME_FAKE_ASCII_TEXT 0.842
-score RAND_HEADER_LIST_SPOOF 2.996
-score RAND_MKTG_HEADER 1.997
-score RATWARE_NO_RDNS 0.001
-score RCVD_DOTEDU_SUSP_URI 2.996
+score PHP_ORIG_SCRIPT 0.001
+score PHP_SCRIPT 0.826
+score PP_MIME_FAKE_ASCII_TEXT 0.843
+score RAND_HEADER_LIST_SPOOF 2.999
+score RAND_MKTG_HEADER 1.999
+score RATWARE_NO_RDNS 2.321
+score RCVD_DOTEDU_SUSP_URI 2.999
score RCVD_IN_MSPIKE_H2 -0.001
-score READY_TO_SHIP 1.248
-score REPTO_419_FRAUD 2.996
-score REPTO_419_FRAUD_GM 2.901
-score REPTO_419_FRAUD_QQ 2.794
-score REPTO_419_FRAUD_YJ 2.996
-score RISK_FREE 1.836
-score SENDGRID_REDIR 0.782
-score SEO_SUSP_NTLD 0.001
-score SERGIO_SUBJECT_VIAGRA01 4.195
-score SHOPIFY_IMG_NOT_RCVD_SFY 2.497
-score SHORTENER_SHORT_SUBJ 2.702
-score SHORT_SHORTNER 1.291
+score READY_TO_SHIP 1.249
+score REPTO_419_FRAUD 2.999
+score REPTO_419_FRAUD_GM 2.500
+score REPTO_419_FRAUD_QQ 2.191
+score REPTO_419_FRAUD_YJ 2.999
+score RISK_FREE 1.822
+score SENDGRID_REDIR 0.783
+score SEO_SUSP_NTLD 0.495
+score SERGIO_SUBJECT_VIAGRA01 4.199
+score SHOPIFY_IMG_NOT_RCVD_SFY 2.499
+score SHORTENER_SHORT_SUBJ 2.713
+score SHORT_SHORTNER 1.058
score SINGLETS_LOW_CONTRAST 0.001
-score SPOOFED_FREEMAIL 1.497
-score SPOOFED_FREEMAIL_NO_RDNS 0.001
-score SPOOFED_FREEM_REPTO 2.497
-score SPOOF_GMAIL_MID 1.498
+score SPOOFED_FREEMAIL 1.498
+score SPOOFED_FREEMAIL_NO_RDNS 0.001 # force non-zero
+score SPOOFED_FREEM_REPTO 2.499
+score SPOOF_GMAIL_MID 1.499
score STATIC_XPRIO_OLE 0.001
score STOCK_LOW_CONTRAST 0.001
-score SUSP_UTF8_WORD_SUBJ 1.997
-score THIS_AD 0.903
-score THIS_IS_ADV_SUSP_NTLD 0.482
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.498
-score TO_EQ_FM_DIRECT_MX 2.452
-score TO_EQ_FM_DOM_HTML_IMG 0.323
-score TO_EQ_FM_DOM_HTML_ONLY 0.881
+score SUSP_UTF8_WORD_SUBJ 1.999
+score THIS_AD 0.904
+score THIS_IS_ADV_SUSP_NTLD 1.434
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
+score TO_EQ_FM_DIRECT_MX 2.203
+score TO_EQ_FM_DOM_HTML_IMG 0.001
+score TO_EQ_FM_DOM_HTML_ONLY 0.882
score TO_EQ_FM_DOM_SPF_FAIL 0.001
-score TO_EQ_FM_HTML_DIRECT 1.377
-score TO_EQ_FM_HTML_ONLY 1.485
-score TO_EQ_FM_SPF_FAIL 0.084
-score TO_IN_SUBJ 0.098
-score TO_NAME_SUBJ_NO_RDNS 2.238
-score TO_NO_BRKTS_FROM_MSSP 1.038
-score TO_NO_BRKTS_HTML_IMG 1.779
-score TO_NO_BRKTS_HTML_ONLY 1.997
-score TO_NO_BRKTS_MSFT 1.004
-score TO_NO_BRKTS_NORDNS_HTML 0.048
-score TO_NO_BRKTS_PCNT 2.497
-score TVD_RCVD_SPACE_BRACKET 1.928
+score TO_EQ_FM_HTML_DIRECT 1.626
+score TO_EQ_FM_HTML_ONLY 1.398
+score TO_EQ_FM_SPF_FAIL 0.082
+score TO_IN_SUBJ 0.099
+score TO_NAME_SUBJ_NO_RDNS 2.233
+score TO_NO_BRKTS_FROM_MSSP 1.077
+score TO_NO_BRKTS_HTML_IMG 1.783
+score TO_NO_BRKTS_HTML_ONLY 1.999
+score TO_NO_BRKTS_MSFT 1.003
+score TO_NO_BRKTS_NORDNS_HTML 0.043
+score TO_NO_BRKTS_PCNT 2.499
+score TVD_RCVD_SPACE_BRACKET 0.147
score TVD_SPACE_ENCODED 0.001
-score TVD_SPACE_RATIO_MINFP 2.397
-score UNDISC_FREEM 3.096
-score UNDISC_MONEY 3.396
+score TVD_SPACE_RATIO_MINFP 2.402
+score UNDISC_FREEM 3.099
+score UNDISC_MONEY 3.399
score UPGRADE_MAILBOX 0.001
-score URI_BUFFLY 1.915
-score URI_DEOBFU_INSTR 3.595
-score URI_DOTDOT_LOW_CNTRST 1.834
-score URI_DOTEDU 1.160
-score URI_DQ_UNSUB 2.397
-score URI_FIREBASEAPP 2.996
+score URI_DEOBFU_INSTR 3.599
+score URI_DOTDOT_LOW_CNTRST 1.904
+score URI_DOTEDU 1.164
+score URI_DQ_UNSUB 2.399
+score URI_FIREBASEAPP 2.999
score URI_GOOGLE_PROXY 2.045
-score URI_GOOG_STO_SPAMMY 2.310
-score URI_LONG_REPEAT 1.047
-score URI_ONLY_MSGID_MALF 0.001
-score URI_PHISH 1.993
-score URI_PHP_REDIR 3.496
-score URI_TRY_3LD 1.997
-score URI_WPADMIN 2.596
-score URI_WP_DIRINDEX 3.496
-score URI_WP_HACKED 3.496
-score URI_WP_HACKED_2 2.497
-score VFY_ACCT_NORDNS 2.996
-score WANT_TO_ORDER 2.440
-score WIKI_IMG 3.024
-score WORD_INVIS_MANY 2.996
+score URI_GOOG_STO_SPAMMY 2.810
+score URI_LONG_REPEAT 1.102
+score URI_ONLY_MSGID_MALF 0.001 # force non-zero
+score URI_PHISH 2.058
+score URI_PHP_REDIR 3.499
+score URI_TRY_3LD 1.999
+score URI_WPADMIN 2.599
+score URI_WP_DIRINDEX 3.499
+score URI_WP_HACKED 3.499
+score URI_WP_HACKED_2 2.499
+score VFY_ACCT_NORDNS 2.999
+score WANT_TO_ORDER 1.959
+score WIKI_IMG 3.021
+score WORD_INVIS_MANY 2.999
score XFER_LOTSA_MONEY 0.001
-score XM_DIGITS_ONLY 2.907
-score XM_LIGHT_HEAVY 2.497
-score XM_LONG_DUP_TO 3.628
-score XM_RANDOM 2.497
-score XM_RECPTID 2.997
-score YOUR_DELIVERY_ADDRESS 1.248
-score YOU_INHERIT 1.528
+score XM_DIGITS_ONLY 2.919
+score XM_LIGHT_HEAVY 2.499
+score XM_LONG_DUP_TO 3.433
+score XM_RANDOM 2.499
+score XM_RECPTID 2.999
+score YOUR_DELIVERY_ADDRESS 1.249
+score YOU_INHERIT 1.470
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index 43da24d..9026670 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -1,5 +1,5 @@
-# Using score set 0 logs for revision 1889515 from:
-# ham-axb-coi-bulk.r1889515.log ham-axb-generic.r1889515.log ham-axb-ham-misc.r1889515.log ham-darxus.r1889515.log ham-ena-week0.r1889515.log ham-ena-week1.r1889515.log ham-ena-week2.r1889515.log ham-ena-week3.r1889515.log ham-ena-week4.r1889515.log ham-giovanni-ham.r1889515.log ham-giovanni-spammy.r1889515.log ham-giovanni-spam.r1889515.log ham-grenier.r1889515.log ham-hege.r1889515.log ham-jhardin.r1889515.log ham-llanga.r1889515.log ham-mmiroslaw-mails-ham.r1889515.log ham-mmiroslaw-mails-spam.r1889515.log ham-pds.r1889515.log ham-sihde.r1889515.log ham-spamsponge.r1889515.log ham-thendrikx.r1889515.log spam-axb-coi-bulk.r1889515.log spam-axb-generic.r1889515.log spam-axb-ham-misc.r1889515.log spam-darxus.r1889515.log spam-ena-week0.r1889515.log spam-ena-week1.r1889515.log spam-ena-week2.r1889515.log spam-ena-week3.r1889515.log spam-ena-week4.r1889515.log spam-giovanni-ham.r1889515.log spam-giovanni-spammy.r1889515.log spam-giovanni-spam.r1889515.log spam-grenier.r1889515.log spam-hege.r1889515.log spam-jhardin.r1889515.log spam-llanga.r1889515.log spam-mmiroslaw-mails-ham.r1889515.log spam-mmiroslaw-mails-spam.r1889515.log spam-pds.r1889515.log spam-sihde.r1889515.log spam-spamsponge.r1889515.log spam-thendrikx.r1889515.log
+# Using score set 0 logs for revision 1889557 from:
+# ham-axb-coi-bulk.r1889557.log ham-axb-generic.r1889557.log ham-axb-ham-misc.r1889557.log ham-darxus.r1889557.log ham-ena-week0.r1889557.log ham-ena-week1.r1889557.log ham-ena-week2.r1889557.log ham-ena-week3.r1889557.log ham-ena-week4.r1889557.log ham-giovanni-ham.r1889557.log ham-giovanni-spammy.r1889557.log ham-giovanni-spam.r1889557.log ham-grenier.r1889557.log ham-hege.r1889557.log ham-jhardin.r1889557.log ham-llanga.r1889557.log ham-mmiroslaw-mails-ham.r1889557.log ham-mmiroslaw-mails-spam.r1889557.log ham-pds.r1889557.log ham-sihde.r1889557.log ham-spamsponge.r1889557.log ham-thendrikx.r1889557.log spam-axb-coi-bulk.r1889557.log spam-axb-generic.r1889557.log spam-axb-ham-misc.r1889557.log spam-darxus.r1889557.log spam-ena-week0.r1889557.log spam-ena-week1.r1889557.log spam-ena-week2.r1889557.log spam-ena-week3.r1889557.log spam-ena-week4.r1889557.log spam-giovanni-ham.r1889557.log spam-giovanni-spammy.r1889557.log spam-giovanni-spam.r1889557.log spam-grenier.r1889557.log spam-hege.r1889557.log spam-jhardin.r1889557.log spam-llanga.r1889557.log spam-mmiroslaw-mails-ham.r1889557.log spam-mmiroslaw-mails-spam.r1889557.log spam-pds.r1889557.log spam-sihde.r1889557.log spam-spamsponge.r1889557.log spam-thendrikx.r1889557.log
score ACCT_PHISHING_MANY 2.999
score AC_BR_BONANZA 0.001
@@ -7,265 +7,259 @@
score AC_FROM_MANY_DOTS 2.999
score AC_HTML_NONSENSE_TAGS 1.999
score ADMITS_SPAM 3.899
-score ADVANCE_FEE_2_NEW_FRM_MNY 1.986
-score ADVANCE_FEE_2_NEW_MONEY 1.276
-score ADVANCE_FEE_3_NEW 2.469
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.001
+score ADVANCE_FEE_2_NEW_FRM_MNY 2.499
+score ADVANCE_FEE_2_NEW_MONEY 1.273
+score ADVANCE_FEE_3_NEW 2.502
+score ADVANCE_FEE_3_NEW_FRM_MNY 0.001 # force non-zero
score ADVANCE_FEE_3_NEW_MONEY 0.001
-score ADVANCE_FEE_4_NEW 2.499
+score ADVANCE_FEE_4_NEW 1.397
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 2.899
-score ADVANCE_FEE_5_NEW 2.297
-score ADVANCE_FEE_5_NEW_FRM_MNY 2.799
-score ADVANCE_FEE_5_NEW_MONEY 1.993
+score ADVANCE_FEE_4_NEW_MONEY 2.487
+score ADVANCE_FEE_5_NEW 2.999
+score ADVANCE_FEE_5_NEW_FRM_MNY 2.403
+score ADVANCE_FEE_5_NEW_MONEY 1.991
score AD_PREFS 0.499
score ALIBABA_IMG_NOT_RCVD_ALI 2.499
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
-score APP_DEVELOPMENT_NORDNS 1.219
+score APP_DEVELOPMENT_NORDNS 1.220
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.545
-score BIGNUM_EMAILS_FREEM 2.859
-score BITCOIN_DEADLINE 2.470
-score BITCOIN_IMGUR 3.492
+score BIGNUM_EMAILS_FREEM 2.619
+score BITCOIN_DEADLINE 2.062
+score BITCOIN_IMGUR 3.231
score BITCOIN_MALF_HTML 3.499
-score BITCOIN_MALWARE 2.101
-score BITCOIN_ONAN 2.620
-score BITCOIN_SPAM_02 2.151
+score BITCOIN_MALWARE 2.437
+score BITCOIN_ONAN 2.207
+score BITCOIN_SPAM_02 1.676
score BITCOIN_SPAM_03 0.001
-score BITCOIN_SPAM_07 2.137
-score BITCOIN_XPRIO 0.001 # force non-zero
-score BITCOIN_YOUR_INFO 2.032
-score BODY_SINGLE_URI 0.800
+score BITCOIN_SPAM_07 3.119
+score BITCOIN_XPRIO 0.001
+score BITCOIN_YOUR_INFO 2.439
+score BODY_SINGLE_URI 0.895
score BODY_SINGLE_WORD 0.001
-score BODY_URI_ONLY 2.252
-score BOGUS_MIME_VERSION 3.500
-score CK_HELO_GENERIC 0.250
-score COMPENSATION 1.500
+score BODY_URI_ONLY 2.341
+score BOGUS_MIME_VERSION 3.499
+score CK_HELO_GENERIC 0.249
+score COMPENSATION 1.137
score CONTENT_AFTER_HTML 2.499
score CTE_8BIT_MISMATCH 0.999
-score DATE_IN_FUTURE_96_Q 2.597
-score DEAR_BENEFICIARY 0.258
+score DATE_IN_FUTURE_96_Q 0.256
+score DEAR_BENEFICIARY 0.720
score DSN_NO_MIMEVERSION 1.999
-score EBAY_IMG_NOT_RCVD_EBAY 2.753
-score END_FUTURE_EMAILS 2.499
-score FAKE_REPLY_A1 2.569
-score FBI_MONEY 1.983
-score FBI_SPOOF 0.562
+score EBAY_IMG_NOT_RCVD_EBAY 1.483
+score END_FUTURE_EMAILS 2.500
+score FAKE_REPLY_A1 2.661
+score FBI_MONEY 0.001
+score FBI_SPOOF 0.250
score FILL_THIS_FORM 1.199
-score FONT_INVIS_DIRECT 0.001 # force non-zero
+score FONT_INVIS_DIRECT 0.001
score FONT_INVIS_HTML_NOHTML 2.999
-score FONT_INVIS_LONG_LINE 2.159
+score FONT_INVIS_LONG_LINE 1.273
score FONT_INVIS_MSGID 2.499
-score FONT_INVIS_NORDNS 0.850
+score FONT_INVIS_NORDNS 1.134
score FORM_FRAUD 0.001
score FORM_FRAUD_3 3.099
-score FORM_FRAUD_5 2.077
+score FORM_FRAUD_5 1.722
score FOUND_YOU 3.249
score FREEMAIL_FORGED_FROMDOMAIN 0.249
-score FROMSPACE 3.299
+score FROMSPACE 3.199
score FROM_2_EMAILS_SHORT 2.999
-score FROM_IN_TO_AND_SUBJ 2.499
+score FROM_IN_TO_AND_SUBJ 2.250
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 0.001 # force non-zero
+score FROM_MISSP_DYNIP 0.001
score FROM_MISSP_EH_MATCH 0.001
-score FROM_MISSP_FREEMAIL 2.898
-score FROM_MISSP_MSFT 2.233
+score FROM_MISSP_FREEMAIL 2.896
+score FROM_MISSP_MSFT 2.249
score FROM_MISSP_PHISH 3.499
-score FROM_MISSP_REPLYTO 2.093
+score FROM_MISSP_REPLYTO 2.400
score FROM_MISSP_TO_UNDISC 0.001
-score FROM_MISSP_USER 0.001
-score FROM_MULTI_NORDNS 0.002
-score FROM_NTLD_REPLY_FREEMAIL 1.421
+score FROM_MISSP_USER 0.001 # force non-zero
+score FROM_MULTI_NORDNS 0.001
+score FROM_NTLD_REPLY_FREEMAIL 1.825
score FROM_SUSPICIOUS_NTLD 0.499
score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_WSP_TRAIL 2.699
+score FROM_WSP_TRAIL 2.799
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FUZZY_AMAZON 2.699
+score FUZZY_AMAZON 2.799
score GB_FAKE_RF_SHORT 1.999
-score GB_FREEMAIL_DISPTO 0.499
+score GB_FREEMAIL_DISPTO 0.500
score GOOGLE_DOC_SUSP 2.999
-score GOOG_REDIR_NORDNS 2.494
-score GOOG_STO_EMAIL_PHISH 2.331
-score GOOG_STO_HTML_PHISH 2.969
-score GOOG_STO_HTML_PHISH_MANY 3.999
+score GOOG_REDIR_NORDNS 2.498
+score GOOG_STO_EMAIL_PHISH 1.906
+score GOOG_STO_HTML_PHISH 2.917
score GOOG_STO_IMG_HTML 2.999
score GOOG_STO_NOIMG_HTML 2.999
-score HAS_X_OUTGOING_SPAM_STAT 1.702
-score HDRS_LCASE 0.100
-score HDRS_LCASE_IMGONLY 0.099
+score HAS_X_OUTGOING_SPAM_STAT 1.611
+score HDRS_LCASE 0.099
+score HDRS_LCASE_IMGONLY 0.100
score HDRS_MISSP 2.499
-score HDR_ORDER_FTSDMCXX_DIRECT 1.999
+score HDR_ORDER_FTSDMCXX_DIRECT 2.000
score HDR_ORDER_FTSDMCXX_NORDNS 0.001
-score HEADER_FROM_DIFFERENT_DOMAINS 0.249
+score HEADER_FROM_DIFFERENT_DOMAINS 0.250
score HELO_NO_DOMAIN 0.001
score HK_LOTTO 0.999
-score HK_NAME_FM_MR_MRS 0.274
-score HK_NAME_MR_MRS 1.000
-score HK_RANDOM_ENVFROM 1.000
-score HK_RANDOM_FROM 0.999
+score HK_NAME_FM_MR_MRS 0.241
+score HK_NAME_MR_MRS 0.999
+score HK_RANDOM_ENVFROM 0.999
+score HK_RANDOM_FROM 1.000
score HK_RANDOM_REPLYTO 0.999
-score HK_SCAM 1.334
-score HOSTED_IMG_DIRECT_MX 2.662
+score HK_SCAM 2.000
+score HOSTED_IMG_DIRECT_MX 2.483
score HOSTED_IMG_FREEM 3.499
-score HOSTED_IMG_MULTI 2.999
+score HOSTED_IMG_MULTI 2.723
score HOSTED_IMG_MULTI_PUB_01 2.999
score HTML_ENTITY_ASCII 2.999
score HTML_OFF_PAGE 2.999
score HTML_SINGLET_MANY 0.001
-score HTML_TAG_BALANCE_CENTER 3.599
-score HTML_TEXT_INVISIBLE_FONT 1.185
-score HTML_TEXT_INVISIBLE_STYLE 1.750
-score IMG_ONLY_FM_DOM_INFO 0.001
+score HTML_TAG_BALANCE_CENTER 2.720
+score HTML_TEXT_INVISIBLE_FONT 1.187
+score HTML_TEXT_INVISIBLE_STYLE 1.466
score JH_SPAMMY_HEADERS 3.499
-score KHOP_FAKE_EBAY 0.073
-score KHOP_HELO_FCRDNS 0.400
+score KHOP_FAKE_EBAY 0.071
+score KHOP_HELO_FCRDNS 0.399
score LIST_PRTL_SAME_USER 0.001
-score LONG_HEX_URI 2.999
-score LONG_IMG_URI 0.491
-score LONG_INVISIBLE_TEXT 2.031
+score LONG_HEX_URI 2.599
+score LONG_IMG_URI 1.684
+score LONG_INVISIBLE_TEXT 3.000
score LOTS_OF_MONEY 0.010
-score LOTTO_AGENT 0.561
+score LOTTO_AGENT 1.499
score LOTTO_DEPT 0.001
-score MALFORMED_FREEMAIL 3.399
+score MALFORMED_FREEMAIL 3.186
score MALWARE_NORDNS 0.001
score MANY_SPAN_IN_TEXT 2.699
-score MAY_BE_FORGED 2.099
+score MAY_BE_FORGED 2.093
score MILLION_HUNDRED 0.001
-score MILLION_USD 0.001
+score MILLION_USD 0.236
score MIMEOLE_DIRECT_TO_MX 0.001
-score MIXED_AREA_CASE 0.867
-score MIXED_CENTER_CASE 1.410
-score MIXED_CTYPE_CASE 1.791
-score MIXED_ES 3.199
+score MIXED_AREA_CASE 1.409
+score MIXED_CENTER_CASE 1.715
+score MIXED_CTYPE_CASE 0.693
+score MIXED_ES 3.099
score MIXED_FONT_CASE 0.001
score MIXED_HREF_CASE 1.999
score MIXED_IMG_CASE 2.999
score MONEY_ATM_CARD 0.001
-score MONEY_FORM 0.001 # force non-zero
-score MONEY_FORM_SHORT 2.499
-score MONEY_FRAUD_3 2.449
-score MONEY_FRAUD_5 0.001
-score MONEY_FRAUD_8 1.424
-score MONEY_FREEMAIL_REPTO 3.000
+score MONEY_FORM 0.001
+score MONEY_FORM_SHORT 1.948
+score MONEY_FRAUD_3 3.099
+score MONEY_FRAUD_5 2.712
+score MONEY_FRAUD_8 2.063
+score MONEY_FREEMAIL_REPTO 2.999
score MONEY_FROM_41 1.999
score MONEY_FROM_MISSP 0.001
score MONEY_NOHTML 2.499
-score MSGID_HDR_MALF 1.701
-score MSGID_NOFQDN1 0.501
-score MSMAIL_PRI_ABNORMAL 0.290
+score MSGID_HDR_MALF 2.696
+score MSGID_NOFQDN1 0.496
+score MSMAIL_PRI_ABNORMAL 0.908
score MSM_PRIO_REPTO 0.001
score NA_DOLLARS 1.499
-score NICE_REPLY_A -0.242
+score NICE_REPLY_A -0.243
score NORDNS_LOW_CONTRAST 1.885
-score NO_FM_NAME_IP_HOSTN 0.001
+score NO_FM_NAME_IP_HOSTN 0.202
score NSL_RCVD_FROM_USER 0.001
score NSL_RCVD_HELO_USER 0.001
-score NUMBEREND_LINKBAIT 0.267
+score NUMBEREND_LINKBAIT 0.714
score ODD_FREEM_REPTO 3.000
-score OFFER_ONLY_AMERICA 1.564
+score OFFER_ONLY_AMERICA 1.999
score ONLINE_MKTG_CNSLT 2.599
-score PDS_BAD_THREAD_QP_64 1.000
-score PDS_BTC_ID 0.499
+score PDS_BAD_THREAD_QP_64 0.999
+score PDS_BTC_ID 0.500
score PDS_BTC_MSGID 0.001
score PDS_DBL_URL_TNB_RUNON 0.001
-score PDS_EMPTYSUBJ_URISHRT 1.247
+score PDS_EMPTYSUBJ_URISHRT 0.947
score PDS_FRNOM_TODOM_DBL_URL 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 3.499
-score PDS_FROM_2_EMAILS_SHRTNER 0.470
+score PDS_FROM_2_EMAILS 3.139
+score PDS_FROM_2_EMAILS_SHRTNER 0.440
score PDS_FROM_NAME_TO_DOMAIN 1.999
-score PDS_NO_FULL_NAME_SPOOFED_URL 0.246
+score PDS_NO_FULL_NAME_SPOOFED_URL 0.321
score PDS_OTHER_BAD_TLD 1.999
score PDS_PRO_TLD 0.999
-score PDS_SHORT_SPOOFED_URL 1.023
-score PDS_TINYSUBJ_URISHRT 0.750
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 2.000
+score PDS_SHORT_SPOOFED_URL 0.945
+score PDS_TINYSUBJ_URISHRT 0.853
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
score PDS_TONAME_EQ_TOLOCAL_SHORT 1.999
score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
-score PHP_ORIG_SCRIPT 2.250
-score PHP_SCRIPT 2.499
+score PHP_ORIG_SCRIPT 2.251
+score PHP_SCRIPT 2.496
score PP_MIME_FAKE_ASCII_TEXT 0.999
score RAND_HEADER_LIST_SPOOF 2.999
-score RAND_MKTG_HEADER 2.000
-score RATWARE_NO_RDNS 2.448
+score RAND_MKTG_HEADER 1.999
+score RATWARE_NO_RDNS 0.842
score RCVD_DOTEDU_SUSP_URI 2.999
-score RDNS_NUM_TLD_XM 1.883
-score READY_TO_SHIP 1.249
-score REPLYTO_EMPTY 1.935
-score REPTO_419_FRAUD 2.673
+score RDNS_NUM_TLD_XM 1.978
+score READY_TO_SHIP 1.250
+score REPLYTO_EMPTY 3.894
+score REPTO_419_FRAUD 2.900
score REPTO_419_FRAUD_GM 2.999
+score REPTO_419_FRAUD_GM_LOOSE 1.000
score REPTO_419_FRAUD_QQ 2.999
-score REPTO_419_FRAUD_YJ 2.400
-score RISK_FREE 1.997
-score SENDGRID_REDIR 1.499
-score SEO_SUSP_NTLD 1.199
-score SERGIO_SUBJECT_VIAGRA01 3.643
+score RISK_FREE 1.994
+score SENDGRID_REDIR 1.500
+score SERGIO_SUBJECT_VIAGRA01 3.529
score SHOPIFY_IMG_NOT_RCVD_SFY 2.499
-score SHORTENER_SHORT_IMG 0.262
score SHORTENER_SHORT_SUBJ 2.999
-score SHORT_IMG_SUSP_NTLD 0.054
+score SHORT_IMG_SUSP_NTLD 1.411
score SHORT_SHORTNER 1.999
-score SINGLETS_LOW_CONTRAST 0.001
+score SINGLETS_LOW_CONTRAST 0.001 # force non-zero
score SPOOFED_FREEMAIL_NO_RDNS 1.499
-score SPOOF_GMAIL_MID 1.499
-score STATIC_XPRIO_OLE 1.997
-score STOCK_LOW_CONTRAST 1.944
-score SUSP_UTF8_WORD_SUBJ 1.999
+score SPOOF_GMAIL_MID 1.500
+score STATIC_XPRIO_OLE 1.795
+score STOCK_LOW_CONTRAST 1.935
+score SUSP_UTF8_WORD_SUBJ 2.000
score THIS_AD 1.299
score THIS_IS_ADV_SUSP_NTLD 1.499
score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
-score TO_EQ_FM_DIRECT_MX 1.118
+score TO_EQ_FM_DIRECT_MX 0.001
score TO_EQ_FM_DOM_HTML_IMG 0.001
-score TO_EQ_FM_DOM_HTML_ONLY 1.750
-score TO_EQ_FM_HTML_DIRECT 0.884
-score TO_EQ_FM_HTML_ONLY 1.912
+score TO_EQ_FM_DOM_HTML_ONLY 1.202
+score TO_EQ_FM_HTML_DIRECT 3.099
+score TO_EQ_FM_HTML_ONLY 1.706
score TO_IN_SUBJ 0.099
-score TO_NAME_SUBJ_NO_RDNS 2.497
+score TO_NAME_SUBJ_NO_RDNS 0.608
score TO_NO_BRKTS_FROM_MSSP 2.499
score TO_NO_BRKTS_HTML_IMG 1.999
score TO_NO_BRKTS_HTML_ONLY 1.999
-score TO_NO_BRKTS_MSFT 2.499
-score TO_NO_BRKTS_NORDNS_HTML 0.303
+score TO_NO_BRKTS_MSFT 2.500
+score TO_NO_BRKTS_NORDNS_HTML 0.252
score TO_NO_BRKTS_PCNT 2.499
-score TVD_RCVD_SPACE_BRACKET 2.799
-score TVD_SPACE_ENCODED 0.561
+score TVD_PH_BODY_META 2.500
+score TVD_RCVD_SPACE_BRACKET 2.744
+score TVD_SPACE_ENCODED 0.549
score TVD_SPACE_RATIO_MINFP 2.499
-score UNDISC_FREEM 3.100
+score UNDISC_FREEM 3.199
score UNDISC_MONEY 3.499
score UNICODE_OBFU_ASC 2.499
score UPGRADE_MAILBOX 1.199
-score URI_BUFFLY 1.932
score URI_DEOBFU_INSTR 3.599
score URI_DOTDOT_LOW_CNTRST 2.499
-score URI_DOTEDU 1.938
-score URI_DQ_UNSUB 2.299
+score URI_DOTEDU 1.549
score URI_FIREBASEAPP 2.999
score URI_GOOGLE_PROXY 2.899
-score URI_GOOG_STO_SPAMMY 2.366
-score URI_LONG_REPEAT 2.411
+score URI_GOOG_STO_SPAMMY 2.729
+score URI_LONG_REPEAT 2.404
score URI_ONLY_MSGID_MALF 0.001
-score URI_PHISH 3.752
+score URI_PHISH 3.637
score URI_PHP_REDIR 3.499
score URI_TRY_3LD 1.999
-score URI_WPADMIN 2.599
+score URI_WPADMIN 2.499
score URI_WP_DIRINDEX 2.500
score URI_WP_HACKED 3.499
-score URI_WP_HACKED_2 2.500
-score VFY_ACCT_NORDNS 2.005
-score WANT_TO_ORDER 1.437
-score WIKI_IMG 3.001
+score URI_WP_HACKED_2 2.499
+score VFY_ACCT_NORDNS 2.003
+score WANT_TO_ORDER 1.466
+score WIKI_IMG 3.002
score WORD_INVIS_MANY 2.999
score XFER_LOTSA_MONEY 0.999
score XM_DIGITS_ONLY 2.999
-score XM_LIGHT_HEAVY 2.403
-score XM_LONG_DUP_TO 3.799
+score XM_LIGHT_HEAVY 2.392
+score XM_LONG_DUP_TO 3.899
score XM_RANDOM 2.499
-score XM_RECPTID 3.000
+score XM_RECPTID 2.999
score XPRIO 0.001
-score YOUR_DELIVERY_ADDRESS 0.268
-score YOU_INHERIT 2.399
+score YOUR_DELIVERY_ADDRESS 0.345
+score YOU_INHERIT 1.553
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
@@ -321,6 +315,7 @@
score GOOGLE_DOCS_PHISH_MANY 1.000
score GOOGLE_DRIVE_REPLY_BAD_NTLD 1.000
score GOOG_MALWARE_DNLD 1.000
+score GOOG_STO_HTML_PHISH_MANY 1.000
score GOOG_STO_IMG_NOHTML 1.000
score HAS_X_NO_RELAY 1.000
score HEXHASH_WORD 1.000
@@ -330,6 +325,7 @@
score HOSTED_IMG_DQ_UNSUB 1.000
score HTML_ENTITY_ASCII_TINY 1.000
score HTML_SHRT_CMNT_OBFU_MANY 1.000
+score IMG_ONLY_FM_DOM_INFO 1.000
score JH_SPAMMY_PATTERN01 1.000
score JH_SPAMMY_PATTERN02 1.000
score LIST_PRTL_PUMPDUMP 1.000
@@ -361,14 +357,16 @@
score REPTO_419_FRAUD_AOL 1.000
score REPTO_419_FRAUD_AOL_LOOSE 1.000
score REPTO_419_FRAUD_CNS 1.000
-score REPTO_419_FRAUD_GM_LOOSE 1.000
score REPTO_419_FRAUD_HM 1.000
score REPTO_419_FRAUD_OL 1.000
score REPTO_419_FRAUD_PM 1.000
score REPTO_419_FRAUD_YH 1.000
score REPTO_419_FRAUD_YH_LOOSE 1.000
+score REPTO_419_FRAUD_YJ 1.000
score REPTO_419_FRAUD_YN 1.000
score SENDGRID_REDIR_PHISH 1.000
+score SEO_SUSP_NTLD 1.000
+score SHORTENER_SHORT_IMG 1.000
score STOCK_TIP 1.000
score SYSADMIN 1.000
score TONLINE_FAKE_DKIM 1.000
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index b2ef759..f2eb4e7 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -1,280 +1,279 @@
# Using score set 1 logs for revision 1889355 from:
# ham-net-axb-coi-bulk.r1889355.log ham-net-axb-generic.r1889355.log ham-net-axb-ham-misc.r1889355.log ham-net-darxus.r1889355.log ham-net-ena-week0.r1889355.log ham-net-ena-week1.r1889355.log ham-net-ena-week2.r1889355.log ham-net-ena-week3.r1889355.log ham-net-ena-week4.r1889355.log ham-net-grenier.r1889355.log ham-net-hege.r1889355.log ham-net-jhardin.r1889355.log ham-net-llanga.r1889355.log ham-net-mmiroslaw-mails-ham.r1889355.log ham-net-mmiroslaw-mails-spam.r1889355.log ham-net-pds.r1889355.log ham-net-sihde.r1889355.log ham-net-spamsponge.r1889355.log ham-net-thendrikx.r1889355.log spam-net-axb-coi-bulk.r1889355.log spam-net-axb-generic.r1889355.log spam-net-axb-ham-misc.r1889355.log spam-net-darxus.r1889355.log spam-net-ena-week0.r1889355.log spam-net-ena-week1.r1889355.log spam-net-ena-week2.r1889355.log spam-net-ena-week3.r1889355.log spam-net-ena-week4.r1889355.log spam-net-grenier.r1889355.log spam-net-hege.r1889355.log spam-net-jhardin.r1889355.log spam-net-llanga.r1889355.log spam-net-mmiroslaw-mails-ham.r1889355.log spam-net-mmiroslaw-mails-spam.r1889355.log spam-net-pds.r1889355.log spam-net-sihde.r1889355.log spam-net-spamsponge.r1889355.log spam-net-thendrikx.r1889355.log
-score ACCT_PHISHING_MANY 0.467
+score ACCT_PHISHING_MANY 0.504
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001 # force non-zero
-score AC_FROM_MANY_DOTS 2.996
-score AC_HTML_NONSENSE_TAGS 1.997
-score ADMITS_SPAM 3.895
+score AC_FROM_MANY_DOTS 2.999
+score AC_HTML_NONSENSE_TAGS 1.999
+score ADMITS_SPAM 3.899
score ADVANCE_FEE_2_NEW_FRM_MNY 0.001
score ADVANCE_FEE_2_NEW_MONEY 0.001
-score ADVANCE_FEE_3_NEW 3.496
-score ADVANCE_FEE_3_NEW_FRM_MNY 2.497
+score ADVANCE_FEE_3_NEW 3.499
+score ADVANCE_FEE_3_NEW_FRM_MNY 2.499
score ADVANCE_FEE_3_NEW_MONEY 0.001
-score ADVANCE_FEE_4_NEW 2.497
+score ADVANCE_FEE_4_NEW 2.499
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 2.091
-score ADVANCE_FEE_5_NEW 2.497
-score ADVANCE_FEE_5_NEW_FRM_MNY 2.796
-score ADVANCE_FEE_5_NEW_MONEY 3.196
-score AD_PREFS 0.498
-score ALIBABA_IMG_NOT_RCVD_ALI 2.490
+score ADVANCE_FEE_4_NEW_MONEY 2.093
+score ADVANCE_FEE_5_NEW 2.494
+score ADVANCE_FEE_5_NEW_FRM_MNY 2.799
+score ADVANCE_FEE_5_NEW_MONEY 3.199
+score AD_PREFS 0.499
+score ALIBABA_IMG_NOT_RCVD_ALI 2.496
score AMAZON_IMG_NOT_RCVD_AMZN 0.001
-score APP_DEVELOPMENT_NORDNS 0.823
+score APP_DEVELOPMENT_NORDNS 0.824
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.350
-score BIGNUM_EMAILS_FREEM 2.302
-score BITCOIN_DEADLINE 1.848
-score BITCOIN_EXTORT_01 2.558
-score BITCOIN_IMGUR 3.496
-score BITCOIN_MALF_HTML 3.496
-score BITCOIN_MALWARE 1.498
-score BITCOIN_ONAN 2.996
-score BITCOIN_SPAM_02 2.497
-score BITCOIN_SPAM_03 0.001
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.021
+score BIGNUM_EMAILS_FREEM 2.886
+score BITCOIN_DEADLINE 2.755
+score BITCOIN_EXTORT_01 2.484
+score BITCOIN_IMGUR 3.499
+score BITCOIN_MALF_HTML 3.499
+score BITCOIN_MALWARE 1.513
+score BITCOIN_ONAN 2.999
+score BITCOIN_SPAM_02 2.500
+score BITCOIN_SPAM_03 0.001 # force non-zero
score BITCOIN_SPAM_05 0.001
score BITCOIN_XPRIO 0.001
-score BITCOIN_YOUR_INFO 2.647
-score BODY_SINGLE_URI 2.497
-score BODY_SINGLE_WORD 0.001 # force non-zero
-score BODY_URI_ONLY 1.528
+score BITCOIN_YOUR_INFO 1.759
+score BODY_SINGLE_URI 2.499
+score BODY_SINGLE_WORD 0.001
+score BODY_URI_ONLY 1.918
score BOGUS_MIME_VERSION 1.913
score CK_HELO_GENERIC 0.001
-score CONTENT_AFTER_HTML 2.497
-score CTE_8BIT_MISMATCH 0.835
-score DATE_IN_FUTURE_96_Q 2.599
-score DEAR_BENEFICIARY 3.296
-score DKIMWL_BL 2.996
-score DKIMWL_WL_HIGH -0.690
-score DKIMWL_WL_MED -0.001 # force non-zero
+score CONTENT_AFTER_HTML 2.499
+score CTE_8BIT_MISMATCH 0.838
+score DATE_IN_FUTURE_96_Q 1.475
+score DEAR_BENEFICIARY 3.299
+score DKIMWL_BL 2.999
+score DKIMWL_WL_HIGH -0.699
+score DKIMWL_WL_MED -0.001
score DKIMWL_WL_MEDHI -0.001
-score DSN_NO_MIMEVERSION 1.997
-score EBAY_IMG_NOT_RCVD_EBAY 2.999
-score FAKE_REPLY_A1 2.904
-score FAKE_REPLY_B 1.417
-score FBI_MONEY 1.237
-score FBI_SPOOF 1.095
-score FILL_THIS_FORM 0.001 # force non-zero
-score FONT_INVIS_DIRECT 1.141
-score FONT_INVIS_HTML_NOHTML 2.953
-score FONT_INVIS_LONG_LINE 2.997
-score FONT_INVIS_MSGID 1.984
-score FONT_INVIS_NORDNS 2.498
-score FORGED_SPF_HELO 2.696
+score DSN_NO_MIMEVERSION 1.999
+score EBAY_IMG_NOT_RCVD_EBAY 1.958
+score FAKE_REPLY_A1 3.016
+score FAKE_REPLY_B 1.079
+score FBI_MONEY 1.159
+score FBI_SPOOF 1.899
+score FILL_THIS_FORM 0.001
+score FONT_INVIS_DIRECT 1.640
+score FONT_INVIS_HTML_NOHTML 1.984
+score FONT_INVIS_LONG_LINE 2.999
+score FONT_INVIS_MSGID 1.978
+score FONT_INVIS_NORDNS 2.499
+score FORGED_SPF_HELO 2.700
score FORM_FRAUD 0.001
-score FORM_FRAUD_3 0.933
-score FORM_FRAUD_5 1.522
-score FOUND_YOU 0.680
-score FREEMAIL_FORGED_FROMDOMAIN 0.248
-score FROMSPACE 3.296
-score FROM_2_EMAILS_SHORT 2.996
-score FROM_FMBLA_NEWDOM 1.498
-score FROM_FMBLA_NEWDOM14 0.998
-score FROM_FMBLA_NEWDOM28 0.798
+score FORM_FRAUD_3 2.328
+score FORM_FRAUD_5 1.564
+score FOUND_YOU 0.689
+score FREEMAIL_FORGED_FROMDOMAIN 0.249
+score FROMSPACE 3.299
+score FROM_2_EMAILS_SHORT 2.999
+score FROM_FMBLA_NEWDOM 1.499
+score FROM_FMBLA_NEWDOM14 1.000
+score FROM_FMBLA_NEWDOM28 0.799
score FROM_GOV_DKIM_AU -0.001
-score FROM_GOV_SPOOF 0.998
-score FROM_IN_TO_AND_SUBJ 2.497
+score FROM_GOV_SPOOF 0.999
+score FROM_IN_TO_AND_SUBJ 2.499
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 1.611
+score FROM_MISSP_DYNIP 2.151
score FROM_MISSP_EH_MATCH 0.001
-score FROM_MISSP_FREEMAIL 0.001 # force non-zero
+score FROM_MISSP_FREEMAIL 0.001
score FROM_MISSP_MSFT 0.001
score FROM_MISSP_PHISH 0.001
-score FROM_MISSP_REPLYTO 2.497
-score FROM_MISSP_SPF_FAIL 0.877
+score FROM_MISSP_REPLYTO 2.499
+score FROM_MISSP_SPF_FAIL 0.879
score FROM_MISSP_TO_UNDISC 0.001
score FROM_MISSP_USER 0.001
-score FROM_MULTI_NORDNS 3.995
-score FROM_NEWDOM_BTC 0.626
-score FROM_NTLD_REPLY_FREEMAIL 1.258
-score FROM_PAYPAL_SPOOF 0.880
+score FROM_MULTI_NORDNS 3.999
+score FROM_NEWDOM_BTC 1.126
+score FROM_NTLD_REPLY_FREEMAIL 0.714
+score FROM_PAYPAL_SPOOF 0.558
score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 1.998
+score FROM_SUSPICIOUS_NTLD_FP 1.999
score FSL_BULK_SIG 0.001
score FSL_CTYPE_WIN1251 0.001
-score FSL_NEW_HELO_USER 0.001
-score FUZZY_AMAZON 2.697
-score FUZZY_BITCOIN 0.610
-score GB_FAKE_RF_SHORT 1.997
-score GB_FREEMAIL_DISPTO 0.498
-score GOOGLE_DOC_SUSP 2.996
-score GOOG_REDIR_NORDNS 1.810
-score GOOG_STO_HTML_PHISH 1.221
-score GOOG_STO_IMG_HTML 2.996
-score GOOG_STO_NOIMG_HTML 2.996
-score HAS_X_OUTGOING_SPAM_STAT 1.997
-score HDRS_LCASE 0.098
-score HDRS_LCASE_IMGONLY 0.098
-score HDRS_MISSP 2.497
-score HDR_ORDER_FTSDMCXX_DIRECT 1.807
+score FSL_NEW_HELO_USER 0.001 # force non-zero
+score FUZZY_AMAZON 2.699
+score FUZZY_BITCOIN 0.696
+score GB_FAKE_RF_SHORT 1.999
+score GB_FREEMAIL_DISPTO 0.499
+score GOOGLE_DOC_SUSP 2.999
+score GOOG_REDIR_NORDNS 1.818
+score GOOG_STO_HTML_PHISH 1.788
+score GOOG_STO_IMG_HTML 2.999
+score GOOG_STO_NOIMG_HTML 2.999
+score HAS_X_OUTGOING_SPAM_STAT 1.999
+score HDRS_LCASE 0.100
+score HDRS_LCASE_IMGONLY 0.100
+score HDRS_MISSP 2.499
+score HDR_ORDER_FTSDMCXX_DIRECT 1.813
score HDR_ORDER_FTSDMCXX_NORDNS 0.001
-score HEADER_FROM_DIFFERENT_DOMAINS 0.248
-score HELO_NO_DOMAIN 0.001
-score HK_LOTTO 0.998
-score HK_NAME_FM_MR_MRS 1.498
-score HK_NAME_MR_MRS 0.998
-score HK_RANDOM_ENVFROM 0.998
+score HEADER_FROM_DIFFERENT_DOMAINS 0.249
+score HELO_NO_DOMAIN 0.001 # force non-zero
+score HK_LOTTO 0.999
+score HK_NAME_FM_MR_MRS 1.499
+score HK_NAME_MR_MRS 0.999
+score HK_RANDOM_ENVFROM 0.999
score HK_RANDOM_FROM 0.999
-score HK_RANDOM_REPLYTO 0.976
+score HK_RANDOM_REPLYTO 0.979
score HK_SCAM 0.741
-score HOSTED_IMG_DIRECT_MX 1.980
-score HOSTED_IMG_FREEM 3.496
-score HOSTED_IMG_MULTI 0.064
-score HOSTED_IMG_MULTI_PUB_01 2.996
-score HTML_ENTITY_ASCII 2.946
-score HTML_OFF_PAGE 2.996
-score HTML_SINGLET_MANY 1.417
-score HTML_TAG_BALANCE_CENTER 2.952
-score HTML_TEXT_INVISIBLE_FONT 0.464
-score HTML_TEXT_INVISIBLE_STYLE 1.932
-score JH_SPAMMY_HEADERS 3.496
-score KHOP_FAKE_EBAY 1.198
-score KHOP_HELO_FCRDNS 0.398
-score LIST_PRTL_SAME_USER 0.930
+score HOSTED_IMG_DIRECT_MX 2.281
+score HOSTED_IMG_FREEM 3.499
+score HOSTED_IMG_MULTI 0.991
+score HOSTED_IMG_MULTI_PUB_01 2.999
+score HTML_ENTITY_ASCII 2.950
+score HTML_OFF_PAGE 2.999
+score HTML_SINGLET_MANY 1.410
+score HTML_TAG_BALANCE_CENTER 2.961
+score HTML_TEXT_INVISIBLE_FONT 0.469
+score HTML_TEXT_INVISIBLE_STYLE 1.929
+score JH_SPAMMY_HEADERS 3.500
+score KHOP_FAKE_EBAY 1.199
+score KHOP_HELO_FCRDNS 0.399
+score LIST_PRTL_SAME_USER 1.346
score LONG_HEX_URI 0.001
-score LONG_IMG_URI 0.898
-score LONG_INVISIBLE_TEXT 2.494
-score LOTS_OF_MONEY 0.010
-score LOTTO_AGENT 1.498
+score LONG_IMG_URI 0.912
+score LONG_INVISIBLE_TEXT 2.482
+score LOTS_OF_MONEY 0.009
+score LOTTO_AGENT 1.499
score LOTTO_DEPT 0.001
-score MALWARE_NORDNS 0.001 # force non-zero
-score MANY_SPAN_IN_TEXT 2.688
-score MAY_BE_FORGED 1.022
+score MALWARE_NORDNS 0.001
+score MANY_SPAN_IN_TEXT 2.698
+score MAY_BE_FORGED 1.015
score MILLION_HUNDRED 0.001
score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 0.001
-score MIXED_AREA_CASE 2.429
-score MIXED_CENTER_CASE 1.391
-score MIXED_CTYPE_CASE 2.057
-score MIXED_ES 2.595
-score MIXED_FONT_CASE 0.588
-score MIXED_HREF_CASE 1.997
-score MIXED_IMG_CASE 2.996
+score MIXED_AREA_CASE 2.047
+score MIXED_CENTER_CASE 2.002
+score MIXED_CTYPE_CASE 2.872
+score MIXED_ES 2.599
+score MIXED_FONT_CASE 0.735
+score MIXED_HREF_CASE 1.999
+score MIXED_IMG_CASE 2.999
score MONEY_ATM_CARD 0.001
-score MONEY_FORM 0.001 # force non-zero
-score MONEY_FORM_SHORT 1.429
-score MONEY_FRAUD_3 2.668
+score MONEY_FORM 0.001
+score MONEY_FORM_SHORT 1.424
+score MONEY_FRAUD_3 2.721
score MONEY_FRAUD_5 0.001
-score MONEY_FRAUD_8 1.680
+score MONEY_FRAUD_8 0.980
score MONEY_FREEMAIL_REPTO 1.085
-score MONEY_FROM_41 1.997
+score MONEY_FROM_41 1.999
score MONEY_FROM_MISSP 0.001
-score MONEY_NOHTML 2.497
-score MSGID_HDR_MALF 3.496
-score MSGID_NOFQDN1 1.649
-score MSMAIL_PRI_ABNORMAL 1.499
+score MONEY_NOHTML 2.499
+score MSGID_HDR_MALF 3.499
+score MSGID_NOFQDN1 1.639
+score MSMAIL_PRI_ABNORMAL 0.001
score MSM_PRIO_REPTO 0.001
-score NA_DOLLARS 1.498
+score NA_DOLLARS 1.499
score NICE_REPLY_A -0.001
-score NORDNS_LOW_CONTRAST 2.200
-score NO_FM_NAME_IP_HOSTN 0.001
+score NORDNS_LOW_CONTRAST 2.202
+score NO_FM_NAME_IP_HOSTN 0.001 # force non-zero
score NSL_RCVD_FROM_USER 0.001
score NSL_RCVD_HELO_USER 0.001
-score NUMBEREND_LINKBAIT 0.738
-score ODD_FREEM_REPTO 2.938
-score OFFER_ONLY_AMERICA 1.214
-score ONLINE_MKTG_CNSLT 2.696
-score PDS_BAD_THREAD_QP_64 0.998
-score PDS_BTC_ID 0.498
+score NUMBEREND_LINKBAIT 0.757
+score ODD_FREEM_REPTO 2.946
+score OFFER_ONLY_AMERICA 0.770
+score ONLINE_MKTG_CNSLT 2.699
+score PDS_BAD_THREAD_QP_64 0.999
+score PDS_BTC_ID 0.487
score PDS_BTC_MSGID 0.001
score PDS_DBL_URL_TNB_RUNON 0.001
score PDS_EMPTYSUBJ_URISHRT 0.001
-score PDS_FRNOM_TODOM_DBL_URL 1.498
-score PDS_FRNOM_TODOM_NAKED_TO 1.149
-score PDS_FROM_2_EMAILS 2.683
-score PDS_FROM_2_EMAILS_SHRTNER 1.499
-score PDS_FROM_NAME_TO_DOMAIN 1.387
-score PDS_NO_FULL_NAME_SPOOFED_URL 0.749
-score PDS_OTHER_BAD_TLD 1.997
-score PDS_PRO_TLD 0.998
-score PDS_SHORT_SPOOFED_URL 0.431
+score PDS_FRNOM_TODOM_DBL_URL 1.499
+score PDS_FRNOM_TODOM_NAKED_TO 0.520
+score PDS_FROM_2_EMAILS 2.687
+score PDS_FROM_2_EMAILS_SHRTNER 0.680
+score PDS_FROM_NAME_TO_DOMAIN 1.925
+score PDS_NO_FULL_NAME_SPOOFED_URL 0.035
+score PDS_OTHER_BAD_TLD 1.999
+score PDS_PRO_TLD 1.000
+score PDS_SHORT_SPOOFED_URL 1.827
score PDS_TINYSUBJ_URISHRT 0.001
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.001
-score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.997
-score PDS_TONAME_EQ_TOLOCAL_SHORT 1.997
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.001 # force non-zero
+score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
+score PDS_TONAME_EQ_TOLOCAL_SHORT 1.999
score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
-score PHP_ORIG_SCRIPT 0.001 # force non-zero
-score PHP_SCRIPT 0.834
-score PP_MIME_FAKE_ASCII_TEXT 0.842
-score RAND_HEADER_LIST_SPOOF 2.996
-score RAND_MKTG_HEADER 1.997
-score RATWARE_NO_RDNS 0.001
-score RCVD_DOTEDU_SUSP_URI 2.996
+score PHP_ORIG_SCRIPT 0.001
+score PHP_SCRIPT 0.826
+score PP_MIME_FAKE_ASCII_TEXT 0.843
+score RAND_HEADER_LIST_SPOOF 2.999
+score RAND_MKTG_HEADER 1.999
+score RATWARE_NO_RDNS 2.321
+score RCVD_DOTEDU_SUSP_URI 2.999
score RCVD_IN_MSPIKE_H2 -0.001
-score READY_TO_SHIP 1.248
-score REPTO_419_FRAUD 2.996
-score REPTO_419_FRAUD_GM 2.901
-score REPTO_419_FRAUD_QQ 2.794
-score REPTO_419_FRAUD_YJ 2.996
-score RISK_FREE 1.836
-score SENDGRID_REDIR 0.782
-score SEO_SUSP_NTLD 0.001
-score SERGIO_SUBJECT_VIAGRA01 4.195
-score SHOPIFY_IMG_NOT_RCVD_SFY 2.497
-score SHORTENER_SHORT_SUBJ 2.702
-score SHORT_SHORTNER 1.291
+score READY_TO_SHIP 1.249
+score REPTO_419_FRAUD 2.999
+score REPTO_419_FRAUD_GM 2.500
+score REPTO_419_FRAUD_QQ 2.191
+score REPTO_419_FRAUD_YJ 2.999
+score RISK_FREE 1.822
+score SENDGRID_REDIR 0.783
+score SEO_SUSP_NTLD 0.495
+score SERGIO_SUBJECT_VIAGRA01 4.199
+score SHOPIFY_IMG_NOT_RCVD_SFY 2.499
+score SHORTENER_SHORT_SUBJ 2.713
+score SHORT_SHORTNER 1.058
score SINGLETS_LOW_CONTRAST 0.001
-score SPOOFED_FREEMAIL 1.497
-score SPOOFED_FREEMAIL_NO_RDNS 0.001
-score SPOOFED_FREEM_REPTO 2.497
-score SPOOF_GMAIL_MID 1.498
+score SPOOFED_FREEMAIL 1.498
+score SPOOFED_FREEMAIL_NO_RDNS 0.001 # force non-zero
+score SPOOFED_FREEM_REPTO 2.499
+score SPOOF_GMAIL_MID 1.499
score STATIC_XPRIO_OLE 0.001
score STOCK_LOW_CONTRAST 0.001
-score SUSP_UTF8_WORD_SUBJ 1.997
-score THIS_AD 0.903
-score THIS_IS_ADV_SUSP_NTLD 0.482
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.498
-score TO_EQ_FM_DIRECT_MX 2.452
-score TO_EQ_FM_DOM_HTML_IMG 0.323
-score TO_EQ_FM_DOM_HTML_ONLY 0.881
+score SUSP_UTF8_WORD_SUBJ 1.999
+score THIS_AD 0.904
+score THIS_IS_ADV_SUSP_NTLD 1.434
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
+score TO_EQ_FM_DIRECT_MX 2.203
+score TO_EQ_FM_DOM_HTML_IMG 0.001
+score TO_EQ_FM_DOM_HTML_ONLY 0.882
score TO_EQ_FM_DOM_SPF_FAIL 0.001
-score TO_EQ_FM_HTML_DIRECT 1.377
-score TO_EQ_FM_HTML_ONLY 1.485
-score TO_EQ_FM_SPF_FAIL 0.084
-score TO_IN_SUBJ 0.098
-score TO_NAME_SUBJ_NO_RDNS 2.238
-score TO_NO_BRKTS_FROM_MSSP 1.038
-score TO_NO_BRKTS_HTML_IMG 1.779
-score TO_NO_BRKTS_HTML_ONLY 1.997
-score TO_NO_BRKTS_MSFT 1.004
-score TO_NO_BRKTS_NORDNS_HTML 0.048
-score TO_NO_BRKTS_PCNT 2.497
-score TVD_RCVD_SPACE_BRACKET 1.928
+score TO_EQ_FM_HTML_DIRECT 1.626
+score TO_EQ_FM_HTML_ONLY 1.398
+score TO_EQ_FM_SPF_FAIL 0.082
+score TO_IN_SUBJ 0.099
+score TO_NAME_SUBJ_NO_RDNS 2.233
+score TO_NO_BRKTS_FROM_MSSP 1.077
+score TO_NO_BRKTS_HTML_IMG 1.783
+score TO_NO_BRKTS_HTML_ONLY 1.999
+score TO_NO_BRKTS_MSFT 1.003
+score TO_NO_BRKTS_NORDNS_HTML 0.043
+score TO_NO_BRKTS_PCNT 2.499
+score TVD_RCVD_SPACE_BRACKET 0.147
score TVD_SPACE_ENCODED 0.001
-score TVD_SPACE_RATIO_MINFP 2.397
-score UNDISC_FREEM 3.096
-score UNDISC_MONEY 3.396
+score TVD_SPACE_RATIO_MINFP 2.402
+score UNDISC_FREEM 3.099
+score UNDISC_MONEY 3.399
score UPGRADE_MAILBOX 0.001
-score URI_BUFFLY 1.915
-score URI_DEOBFU_INSTR 3.595
-score URI_DOTDOT_LOW_CNTRST 1.834
-score URI_DOTEDU 1.160
-score URI_DQ_UNSUB 2.397
-score URI_FIREBASEAPP 2.996
+score URI_DEOBFU_INSTR 3.599
+score URI_DOTDOT_LOW_CNTRST 1.904
+score URI_DOTEDU 1.164
+score URI_DQ_UNSUB 2.399
+score URI_FIREBASEAPP 2.999
score URI_GOOGLE_PROXY 2.045
-score URI_GOOG_STO_SPAMMY 2.310
-score URI_LONG_REPEAT 1.047
-score URI_ONLY_MSGID_MALF 0.001
-score URI_PHISH 1.993
-score URI_PHP_REDIR 3.496
-score URI_TRY_3LD 1.997
-score URI_WPADMIN 2.596
-score URI_WP_DIRINDEX 3.496
-score URI_WP_HACKED 3.496
-score URI_WP_HACKED_2 2.497
-score VFY_ACCT_NORDNS 2.996
-score WANT_TO_ORDER 2.440
-score WIKI_IMG 3.024
-score WORD_INVIS_MANY 2.996
+score URI_GOOG_STO_SPAMMY 2.810
+score URI_LONG_REPEAT 1.102
+score URI_ONLY_MSGID_MALF 0.001 # force non-zero
+score URI_PHISH 2.058
+score URI_PHP_REDIR 3.499
+score URI_TRY_3LD 1.999
+score URI_WPADMIN 2.599
+score URI_WP_DIRINDEX 3.499
+score URI_WP_HACKED 3.499
+score URI_WP_HACKED_2 2.499
+score VFY_ACCT_NORDNS 2.999
+score WANT_TO_ORDER 1.959
+score WIKI_IMG 3.021
+score WORD_INVIS_MANY 2.999
score XFER_LOTSA_MONEY 0.001
-score XM_DIGITS_ONLY 2.907
-score XM_LIGHT_HEAVY 2.497
-score XM_LONG_DUP_TO 3.628
-score XM_RANDOM 2.497
-score XM_RECPTID 2.997
-score YOUR_DELIVERY_ADDRESS 1.248
-score YOU_INHERIT 1.528
+score XM_DIGITS_ONLY 2.919
+score XM_LIGHT_HEAVY 2.499
+score XM_LONG_DUP_TO 3.433
+score XM_RANDOM 2.499
+score XM_RECPTID 2.999
+score YOUR_DELIVERY_ADDRESS 1.249
+score YOU_INHERIT 1.470
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index 347c187..cc02be2 100644
--- a/rulesrc/scores/stats-set0
+++ b/rulesrc/scores/stats-set0
@@ -1,40 +1,40 @@
##### WITH NEW RULES AND SCORES #####
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 265703 32.329% (99.433% of non-spam corpus)
-# Correctly spam: 411861 50.112% (74.254% of spam corpus)
-# False positives: 1516 0.184% (0.567% of nonspam, 96248 weighted)
-# False negatives: 142804 17.375% (25.746% of spam, 315503 weighted)
-# Average score for spam: 9.8 nonspam: 0.6
+# Correctly non-spam: 262846 33.309% (99.453% of non-spam corpus)
+# Correctly spam: 394712 50.020% (75.209% of spam corpus)
+# False positives: 1445 0.183% (0.547% of nonspam, 87806 weighted)
+# False negatives: 130109 16.488% (24.791% of spam, 283073 weighted)
+# Average score for spam: 10.1 nonspam: 0.6
# Average for false-pos: 6.1 false-neg: 2.2
-# TOTAL: 821884 100.00%
+# TOTAL: 789112 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 33223 99.42%
-# Correctly spam: 51458 74.28%
-# False positives: 194 0.58%
-# False negatives: 17819 25.72%
-# TCR(l=50): 2.517424 SpamRecall: 74.279% SpamPrec: 99.624%
+# Correctly non-spam: 32848 99.39%
+# Correctly spam: 49292 75.23%
+# False positives: 203 0.61%
+# False negatives: 16234 24.77%
+# TCR(l=50): 2.483551 SpamRecall: 75.225% SpamPrec: 99.590%
##### WITHOUT NEW RULES AND SCORES #####
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 257226 96.26%
-# Correctly spam: 259849 46.85%
-# False positives: 9993 3.74%
-# False negatives: 294816 53.15%
-# TCR(l=50): 0.698161 SpamRecall: 46.848% SpamPrec: 96.297%
+# Correctly non-spam: 254570 96.32%
+# Correctly spam: 251121 47.85%
+# False positives: 9721 3.68%
+# False negatives: 273700 52.15%
+# TCR(l=50): 0.690781 SpamRecall: 47.849% SpamPrec: 96.273%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 32175 96.28%
-# Correctly spam: 32332 46.67%
-# False positives: 1242 3.72%
-# False negatives: 36945 53.33%
-# TCR(l=50): 0.699450 SpamRecall: 46.671% SpamPrec: 96.301%
+# Correctly non-spam: 31869 96.42%
+# Correctly spam: 31288 47.75%
+# False positives: 1182 3.58%
+# False negatives: 34238 52.25%
+# TCR(l=50): 0.702029 SpamRecall: 47.749% SpamPrec: 96.360%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index cb0e4d5..ec134fe 100644
--- a/rulesrc/scores/stats-set1
+++ b/rulesrc/scores/stats-set1
@@ -1,12 +1,12 @@
##### WITH NEW RULES AND SCORES #####
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 266726 32.011% (99.104% of non-spam corpus)
-# Correctly spam: 470633 56.482% (83.431% of spam corpus)
-# False positives: 2412 0.289% (0.896% of nonspam, 318760 weighted)
-# False negatives: 93466 11.217% (16.569% of spam, 197520 weighted)
-# Average score for spam: 14.4 nonspam: -1.5
-# Average for false-pos: 6.3 false-neg: 2.1
+# Correctly non-spam: 266705 32.008% (99.096% of non-spam corpus)
+# Correctly spam: 478150 57.385% (84.763% of spam corpus)
+# False positives: 2433 0.292% (0.904% of nonspam, 320965 weighted)
+# False negatives: 85949 10.315% (15.237% of spam, 159991 weighted)
+# Average score for spam: 14.1 nonspam: -1.5
+# Average for false-pos: 6.3 false-neg: 1.9
# TOTAL: 833237 100.00%
Reading scores from "tmprules"...
@@ -14,10 +14,10 @@
# SUMMARY for threshold 5.0:
# Correctly non-spam: 33316 99.03%
-# Correctly spam: 58923 83.65%
+# Correctly spam: 59713 84.77%
# False positives: 328 0.97%
-# False negatives: 11515 16.35%
-# TCR(l=50): 2.523303 SpamRecall: 83.652% SpamPrec: 99.446%
+# False negatives: 10725 15.23%
+# TCR(l=50): 2.596793 SpamRecall: 84.774% SpamPrec: 99.454%
##### WITHOUT NEW RULES AND SCORES #####
Reading scores from "../rules-base"...
