updated scores for revision 1881814 active rules added since last mass-check
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1881836 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index ff07ac0..6ff1c6a 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf
@@ -1,6 +1,6 @@
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.294 2.999 2.294
+score AC_FROM_MANY_DOTS 3.000 1.251 3.000 1.251
score AC_HTML_NONSENSE_TAGS 1.999 1.999 1.999 1.999
score AC_POST_EXTRAS 2.499 0.001 2.499 0.001
score AC_SPAMMY_URI_PATTERNS1 1.000 1.000 1.000 1.000
@@ -12,44 +12,44 @@
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 2.554 0.532 2.554 0.532
+score ADMITS_SPAM 2.436 0.543 2.436 0.543
score ADVANCE_FEE_2_NEW_FORM 1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_MONEY 2.000 1.617 2.000 1.617
+score ADVANCE_FEE_2_NEW_MONEY 1.999 1.999 1.999 1.999
score ADVANCE_FEE_3_NEW 1.000 3.499 1.000 3.499
-score ADVANCE_FEE_3_NEW_MONEY 2.799 0.001 2.799 0.001
-score ADVANCE_FEE_4_NEW_MONEY 2.799 2.399 2.799 2.399
-score ADVANCE_FEE_5_NEW 2.800 2.398 2.800 2.398
+score ADVANCE_FEE_3_NEW_MONEY 2.899 0.001 2.899 0.001
+score ADVANCE_FEE_4_NEW_MONEY 2.799 1.989 2.799 1.989
+score ADVANCE_FEE_5_NEW 1.897 2.599 1.897 2.599
score AD_PREFS 0.250 0.250 0.250 0.250
score ALIBABA_IMG_NOT_RCVD_ALI 1.000 1.000 1.000 1.000
-score AMAZON_IMG_NOT_RCVD_AMZN 2.500 2.499 2.500 2.499
+score AMAZON_IMG_NOT_RCVD_AMZN 2.499 2.499 2.499 2.499
score APP_DEVELOPMENT_FREEM 1.000 1.000 1.000 1.000
score APP_DEVELOPMENT_NORDNS 1.000 1.000 1.000 1.000
-score AXB_XMAILER_MIMEOLE_OL_024C2 2.597 3.529 2.597 3.529
+score AXB_XMAILER_MIMEOLE_OL_024C2 2.599 0.001 2.599 0.001
score BITCOIN_BOMB 1.000 1.000 1.000 1.000
score BITCOIN_DEADLINE 2.999 1.000 2.999 1.000
-score BITCOIN_EXTORT_01 3.743 4.212 3.743 4.212
+score BITCOIN_EXTORT_01 4.559 3.826 4.559 3.826
score BITCOIN_EXTORT_02 1.000 1.000 1.000 1.000
-score BITCOIN_MALF_HTML 3.500 3.500 3.500 3.500
+score BITCOIN_MALF_HTML 3.499 3.499 3.499 3.499
score BITCOIN_MALWARE 1.000 1.000 1.000 1.000
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 1.512 0.221 1.512 0.221
+score BITCOIN_SPAM_02 1.919 1.968 1.919 1.968
score BITCOIN_SPAM_03 1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_04 1.500 1.000 1.500 1.000
-score BITCOIN_SPAM_05 0.001 1.906 0.001 1.906
+score BITCOIN_SPAM_04 1.499 1.000 1.499 1.000
+score BITCOIN_SPAM_05 0.001 1.662 0.001 1.662
score BITCOIN_SPAM_06 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_07 1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_08 1.736 1.026 1.736 1.026
-score BITCOIN_SPAM_09 1.000 1.214 1.000 1.214
+score BITCOIN_SPAM_08 1.000 1.308 1.000 1.308
+score BITCOIN_SPAM_09 1.000 0.975 1.000 0.975
score BITCOIN_SPAM_10 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_11 1.000 1.000 1.000 1.000
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 1.253 0.001 1.253 0.001
-score BITCOIN_YOUR_INFO 1.326 1.000 1.326 1.000
+score BITCOIN_XPRIO 1.251 0.001 1.251 0.001
+score BITCOIN_YOUR_INFO 1.392 1.000 1.392 1.000
score BODY_EMPTY 1.000 1.000 1.000 1.000
-score BODY_URI_ONLY 1.000 0.999 1.000 0.999
-score BOGUS_MIME_VERSION 1.000 1.761 1.000 1.761
+score BODY_URI_ONLY 0.999 0.999 0.999 0.999
+score BOGUS_MIME_VERSION 1.000 1.763 1.000 1.763
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
@@ -57,84 +57,84 @@
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_DYNAMIC_SPLIT_IP 1.499 0.001 1.499 0.001
-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.000 1.000 1.000 1.000
-score CTE_8BIT_MISMATCH 0.999 0.999 0.999 0.999
-score CTYPE_NULL 2.601 2.400 2.601 2.400
+score CTE_8BIT_MISMATCH 1.000 0.999 1.000 0.999
+score CTYPE_NULL 2.600 1.500 2.600 1.500
score DAY_I_EARNED 1.000 1.000 1.000 1.000
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 -2.999 0.001 -2.999
+score DKIMWL_WL_HIGH 0.001 -2.996 0.001 -2.996
score DKIMWL_WL_MED 0.001 -0.001 0.001 -0.001
score DKIMWL_WL_MEDHI 0.001 -1.000 0.001 -1.000
-score DOTGOV_IMAGE 3.000 0.159 3.000 0.159
-score DSN_NO_MIMEVERSION 1.999 1.999 1.999 1.999
-score DX_TEXT_03 0.899 0.199 0.899 0.199
+score DOTGOV_IMAGE 2.999 1.468 2.999 1.468
+score DSN_NO_MIMEVERSION 1.999 2.000 1.999 2.000
+score DX_TEXT_03 0.799 0.199 0.799 0.199
score EBAY_IMG_NOT_RCVD_EBAY 1.000 1.000 1.000 1.000
score ENCRYPTED_MESSAGE -1.000 -1.000 -1.000 -1.000
-score END_FUTURE_EMAILS 2.100 2.499 2.100 2.499
+score END_FUTURE_EMAILS 2.099 2.499 2.099 2.499
score FBI_MONEY 1.000 1.000 1.000 1.000
score FBI_SPOOF 1.000 1.000 1.000 1.000
-score FILL_THIS_FORM 1.199 1.094 1.199 1.094
-score FONT_INVIS_DIRECT 0.001 0.001 0.001 0.001
-score FONT_INVIS_DOTGOV 3.001 0.001 3.001 0.001
+score FILL_THIS_FORM 1.201 0.526 1.201 0.526
+score FONT_INVIS_DIRECT 1.706 0.001 1.706 0.001
+score FONT_INVIS_DOTGOV 1.113 0.372 1.113 0.372
score FONT_INVIS_LONG_LINE 0.001 0.001 0.001 0.001
-score FONT_INVIS_MSGID 1.999 0.001 1.999 0.001
-score FONT_INVIS_POSTEXTRAS 0.505 2.982 0.505 2.982
-score FORGED_RELAY_MUA_TO_MX 4.099 3.693 4.099 3.693
-score FORM_FRAUD 0.999 0.999 0.999 0.999
-score FORM_FRAUD_5 2.999 2.700 2.999 2.700
+score FONT_INVIS_MSGID 2.182 0.001 2.182 0.001
+score FONT_INVIS_POSTEXTRAS 0.001 1.898 0.001 1.898
+score FORGED_RELAY_MUA_TO_MX 4.099 3.709 4.099 3.709
+score FORM_FRAUD 0.999 0.001 0.999 0.001
+score FORM_FRAUD_5 1.954 2.699 1.954 2.699
score FORM_LOW_CONTRAST 1.000 1.000 1.000 1.000
score FOUND_YOU 3.249 3.249 3.249 3.249
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 FROM_2_EMAILS_SHORT 1.999 1.999 1.999 1.999
-score FROM_ADDR_WS 1.000 2.999 1.000 2.999
+score FROM_2_EMAILS_SHORT 2.000 1.999 2.000 1.999
+score FROM_ADDR_WS 2.526 2.999 2.526 2.999
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.499 0.001 1.499
+score FROM_FMBLA_NEWDOM 0.001 1.498 0.001 1.498
score FROM_FMBLA_NEWDOM14 0.001 0.999 0.001 0.999
score FROM_FMBLA_NEWDOM28 0.001 0.799 0.001 0.799
-score FROM_GOV_DKIM_AU 0.001 -0.453 0.001 -0.453
+score FROM_GOV_DKIM_AU 0.001 -0.448 0.001 -0.448
score FROM_GOV_REPLYTO_FREEMAIL 0.001 1.000 0.001 1.000
score FROM_GOV_SPOOF 0.001 0.999 0.001 0.999
-score FROM_MISSPACED 1.999 1.073 1.999 1.073
-score FROM_MISSP_DYNIP 0.326 1.533 0.326 1.533
-score FROM_MISSP_EH_MATCH 1.999 1.551 1.999 1.551
-score FROM_MISSP_FREEMAIL 2.549 1.143 2.549 1.143
-score FROM_MISSP_MSFT 0.001 2.155 0.001 2.155
-score FROM_MISSP_REPLYTO 1.949 2.499 1.949 2.499
+score FROM_MISSPACED 2.000 0.001 2.000 0.001
+score FROM_MISSP_DYNIP 1.564 2.599 1.564 2.599
+score FROM_MISSP_EH_MATCH 1.999 0.001 1.999 0.001
+score FROM_MISSP_FREEMAIL 1.998 1.131 1.998 1.131
+score FROM_MISSP_MSFT 0.546 0.001 0.546 0.001
+score FROM_MISSP_REPLYTO 2.499 0.112 2.499 0.112
score FROM_MISSP_SPF_FAIL 0.001 1.999 0.001 1.999
-score FROM_MISSP_TO_UNDISC 0.001 0.001 0.001 0.001
-score FROM_MISSP_USER 0.001 0.381 0.001 0.381
-score FROM_MISSP_XPRIO 0.001 2.499 0.001 2.499
-score FROM_NAME_EQ_TO_G_DRIVE 0.001 0.922 0.001 0.922
+score FROM_MISSP_TO_UNDISC 1.544 0.001 1.544 0.001
+score FROM_MISSP_USER 0.001 0.001 0.001 0.001
+score FROM_MISSP_XPRIO 0.001 0.001 0.001 0.001
+score FROM_NAME_EQ_TO_G_DRIVE 0.001 0.882 0.001 0.882
score FROM_NEWDOM_BTC 0.001 1.000 0.001 1.000
score FROM_NTLD_LINKBAIT 1.000 1.000 1.000 1.000
-score FROM_NTLD_REPLY_FREEMAIL 1.999 1.973 1.999 1.973
+score FROM_NTLD_REPLY_FREEMAIL 1.303 0.768 1.303 0.768
score FROM_NUMBERO_NEWDOMAIN 0.001 1.000 0.001 1.000
score FROM_PAYPAL_SPOOF 0.001 1.000 0.001 1.000
-score FROM_SUSPICIOUS_NTLD 0.500 0.499 0.500 0.499
-score FROM_SUSPICIOUS_NTLD_FP 2.000 1.999 2.000 1.999
-score FROM_UNBAL1 3.500 0.001 3.500 0.001
-score FROM_URI 1.684 2.126 1.684 2.126
-score FROM_WORDY 0.001 1.072 0.001 1.072
+score FROM_SUSPICIOUS_NTLD 0.499 0.498 0.499 0.498
+score FROM_SUSPICIOUS_NTLD_FP 1.999 1.997 1.999 1.997
+score FROM_UNBAL1 2.473 0.001 2.473 0.001
+score FROM_URI 1.718 1.698 1.718 1.698
+score FROM_WORDY 0.001 2.113 0.001 2.113
score FROM_WORDY_SHORT 1.000 1.000 1.000 1.000
-score FROM_WWW 2.102 1.303 2.102 1.303
+score FROM_WWW 2.069 1.335 2.069 1.335
score FSL_BULK_SIG 0.001 0.001 0.001 0.001
-score FSL_CTYPE_WIN1251 0.001 2.983 0.001 2.983
-score FSL_NEW_HELO_USER 0.001 1.999 0.001 1.999
-score FSL_THIS_IS_ADV 2.045 0.497 2.045 0.497
+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 FSL_THIS_IS_ADV 2.163 0.105 2.163 0.105
score GAPPY_SALES_LEADS_FREEM 1.000 1.000 1.000 1.000
-score GB_BITCOIN_CP 1.248 2.307 1.248 2.307
-score GB_BITCOIN_NH 2.614 2.774 2.614 2.774
+score GB_BITCOIN_CP 1.563 1.723 1.563 1.723
+score GB_BITCOIN_NH 1.000 0.848 1.000 0.848
score GB_FORGED_MUA_POSTFIX 1.000 1.000 1.000 1.000
-score GB_FREEMAIL_DISPTO 0.499 0.001 0.499 0.001
+score GB_FREEMAIL_DISPTO 0.500 0.001 0.500 0.001
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 GB_GOOGLE_OBFUS 0.749 0.749 0.749 0.749
+score GB_GOOGLE_OBFUS 0.749 0.750 0.749 0.750
score GB_LINKED_IMG_NOT_RCVD_LINK 1.000 1.000 1.000 1.000
score GB_WP_FILELINK 1.000 1.000 1.000 1.000
score GOOGLE_DOCS_PHISH 1.000 1.000 1.000 1.000
@@ -144,37 +144,37 @@
score HDRS_LCASE 0.100 0.099 0.100 0.099
score HDRS_LCASE_IMGONLY 0.099 0.099 0.099 0.099
score HDRS_MISSP 1.000 1.000 1.000 1.000
-score HDR_ORDER_FTSDMCXX_DIRECT 1.999 1.728 1.999 1.728
-score HDR_ORDER_FTSDMCXX_NORDNS 2.600 3.297 2.600 3.297
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250 0.250 0.250 0.250
-score HELO_MISC_IP 0.250 0.001 0.250 0.001
+score HDR_ORDER_FTSDMCXX_DIRECT 1.999 0.888 1.999 0.888
+score HDR_ORDER_FTSDMCXX_NORDNS 2.601 3.165 2.601 3.165
+score HEADER_FROM_DIFFERENT_DOMAINS 0.250 0.248 0.250 0.248
+score HELO_MISC_IP 0.249 0.001 0.249 0.001
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_RANDOM_FROM 0.997 1.000 0.997 1.000
-score HK_RANDOM_REPLYTO 0.999 0.001 0.999 0.001
+score HK_RANDOM_FROM 0.950 0.997 0.950 0.997
+score HK_RANDOM_REPLYTO 1.000 0.001 1.000 0.001
score HK_RCVD_IP_MULTICAST 1.000 1.000 1.000 1.000
-score HK_SCAM 1.607 1.035 1.607 1.035
-score HOSTED_IMG_DIRECT_MX 3.499 1.546 3.499 1.546
+score HK_SCAM 1.569 1.022 1.569 1.022
+score HOSTED_IMG_DIRECT_MX 3.499 1.608 3.499 1.608
score HOSTED_IMG_DQ_UNSUB 1.000 1.000 1.000 1.000
score HOSTED_IMG_FREEM 1.000 1.000 1.000 1.000
score HOSTED_IMG_MULTI 1.000 1.000 1.000 1.000
score HTML_ENTITY_ASCII 1.000 1.000 1.000 1.000
score HTML_ENTITY_ASCII_TINY 1.000 1.000 1.000 1.000
-score HTML_OFF_PAGE 0.100 1.072 0.100 1.072
+score HTML_OFF_PAGE 0.102 1.043 0.102 1.043
score HTML_SHRT_CMNT_OBFU_MANY 1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY 1.388 1.155 1.388 1.155
-score HTML_TEXT_INVISIBLE_FONT 2.897 2.196 2.897 2.196
-score HTML_TEXT_INVISIBLE_STYLE 1.689 1.590 1.689 1.590
-score IMG_ONLY_FM_DOM_INFO 2.199 2.447 2.199 2.447
-score KB_FORGED_MOZ4 4.500 3.994 4.500 3.994
-score KHOP_FAKE_EBAY 0.005 0.899 0.005 0.899
-score KHOP_HELO_FCRDNS 0.400 0.400 0.400 0.400
-score LH_URI_DOM_IN_PATH 2.699 1.420 2.699 1.420
+score HTML_SINGLET_MANY 0.247 2.499 0.247 2.499
+score HTML_TEXT_INVISIBLE_FONT 2.590 1.564 2.590 1.564
+score HTML_TEXT_INVISIBLE_STYLE 2.251 1.973 2.251 1.973
+score IMG_ONLY_FM_DOM_INFO 1.699 2.499 1.699 2.499
+score KB_FORGED_MOZ4 4.499 4.499 4.499 4.499
+score KHOP_FAKE_EBAY 0.001 0.120 0.001 0.120
+score KHOP_HELO_FCRDNS 0.400 0.399 0.400 0.399
+score LH_URI_DOM_IN_PATH 2.700 1.812 2.700 1.812
score LIST_PARTIAL_SHORT_MSG 1.000 0.001 1.000 0.001
score LIST_PRTL_PUMPDUMP 1.000 1.000 1.000 1.000
-score LIST_PRTL_SAME_USER 0.001 0.750 0.001 0.750
-score LONG_HEX_URI 2.200 0.001 2.200 0.001
+score LIST_PRTL_SAME_USER 0.001 0.609 0.001 0.609
+score LONG_HEX_URI 2.249 0.001 2.249 0.001
score LONG_IMG_URI 1.000 0.001 1.000 0.001
score LOTS_OF_MONEY 0.010 0.010 0.010 0.010
score LUCRATIVE 1.000 1.000 1.000 1.000
@@ -182,58 +182,58 @@
score MALWARE_NORDNS 1.000 1.000 1.000 1.000
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.763 2.799 2.763 2.799
+score MANY_SPAN_IN_TEXT 3.099 1.892 3.099 1.892
score MAY_BE_FORGED 2.699 0.001 2.699 0.001
-score MILLION_HUNDRED 0.001 0.001 0.001 0.001
-score MIMEOLE_DIRECT_TO_MX 0.001 1.094 0.001 1.094
+score MILLION_HUNDRED 0.001 0.511 0.001 0.511
+score MIMEOLE_DIRECT_TO_MX 0.001 1.717 0.001 1.717
score MIME_NO_TEXT 0.001 0.001 0.001 0.001
-score MIXED_ES 2.699 0.001 2.699 0.001
+score MIXED_ES 2.700 0.924 2.700 0.924
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_FORM_SHORT 1.692 0.001 1.692 0.001
-score MONEY_FRAUD_3 2.599 2.297 2.599 2.297
-score MONEY_FRAUD_5 2.592 0.486 2.592 0.486
-score MONEY_FRAUD_8 1.882 0.001 1.882 0.001
-score MONEY_FROM_MISSP 1.999 1.999 1.999 1.999
-score MSM_PRIO_REPTO 2.419 0.994 2.419 0.994
+score MONEY_FORM_SHORT 2.042 0.001 2.042 0.001
+score MONEY_FRAUD_3 2.599 1.896 2.599 1.896
+score MONEY_FRAUD_5 2.284 0.478 2.284 0.478
+score MONEY_FRAUD_8 2.237 0.538 2.237 0.538
+score MONEY_FROM_MISSP 1.999 1.006 1.999 1.006
+score MSM_PRIO_REPTO 2.499 2.308 2.499 2.308
score NEWEGG_IMG_NOT_RCVD_NEGG 1.000 1.000 1.000 1.000
-score NICE_REPLY_A -0.340 -1.869 -0.340 -1.869
-score NORDNS_LOW_CONTRAST 1.786 0.910 1.786 0.910
+score NICE_REPLY_A -0.300 -0.001 -0.300 -0.001
+score NORDNS_LOW_CONTRAST 1.887 0.910 1.887 0.910
score NO_FM_NAME_IP_HOSTN 0.001 0.001 0.001 0.001
-score NSL_RCVD_FROM_USER 0.001 0.284 0.001 0.284
-score NSL_RCVD_HELO_USER 0.103 0.001 0.103 0.001
+score NSL_RCVD_FROM_USER 0.001 0.001 0.001 0.001
+score NSL_RCVD_HELO_USER 1.635 0.438 1.635 0.438
score OBFU_BITCOIN 1.000 1.000 1.000 1.000
-score OFFER_ONLY_AMERICA 1.999 1.078 1.999 1.078
-score PDS_BTC_ID 0.500 0.500 0.500 0.500
+score OFFER_ONLY_AMERICA 1.999 0.001 1.999 0.001
+score PDS_BTC_ID 0.499 0.499 0.499 0.499
score PDS_BTC_MSGID 0.001 0.999 0.001 0.999
-score PDS_EMPTYSUBJ_URISHRT 1.499 0.225 1.499 0.225
+score PDS_EMPTYSUBJ_URISHRT 1.499 0.224 1.499 0.224
score PDS_FREEMAIL_REPLYTO_URISHRT 1.499 1.499 1.499 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499 1.499 1.499 1.499
-score PDS_FROM_2_EMAILS 2.099 1.049 2.099 1.049
+score PDS_FROM_2_EMAILS 2.099 1.048 2.099 1.048
score PDS_FROM_NAME_TO_DOMAIN 0.999 0.999 0.999 0.999
score PDS_HELO_SPF_FAIL 0.001 1.000 0.001 1.000
score PDS_NAKED_TO_NUMERO 1.999 1.999 1.999 1.999
-score PDS_SHORTFWD_URISHRT 1.500 1.296 1.500 1.296
+score PDS_SHORTFWD_URISHRT 1.500 1.500 1.500 1.500
score PDS_TINYSUBJ_URISHRT 1.499 0.001 1.499 0.001
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999 1.999 1.999 1.999
-score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999 1.071 1.999 1.071
-score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999 0.999 0.999 0.999
-score PDS_TO_EQ_FROM_NAME 0.001 3.399 0.001 3.399
+score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 2.000 1.999 2.000 1.999
+score PDS_TONAME_EQ_TOLOCAL_VSHORT 1.000 0.999 1.000 0.999
+score PDS_TO_EQ_FROM_NAME 0.001 1.679 0.001 1.679
score PHOTO_EDITING_DIRECT 1.000 1.000 1.000 1.000
score PHP_NOVER_MUA 1.000 1.000 1.000 1.000
-score PHP_ORIG_SCRIPT 1.000 1.000 1.000 1.000
+score PHP_ORIG_SCRIPT 2.499 1.000 2.499 1.000
score PHP_SCRIPT_MUA 1.000 1.000 1.000 1.000
-score PP_MIME_FAKE_ASCII_TEXT 0.999 0.111 0.999 0.111
+score PP_MIME_FAKE_ASCII_TEXT 0.999 0.108 0.999 0.108
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_MANY 1.000 1.000 1.000 1.000
-score RATWARE_NO_RDNS 0.700 1.283 0.700 1.283
+score RATWARE_NO_RDNS 2.131 2.770 2.131 2.770
score RCVD_DOTEDU_SHORT 1.000 2.499 1.000 2.499
-score RCVD_DOTEDU_SUSP_URI 1.000 2.999 1.000 2.999
+score RCVD_DOTEDU_SUSP_URI 1.000 0.001 1.000 0.001
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
@@ -246,81 +246,81 @@
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.000 2.999 1.000 2.999
+score RDNS_NUM_TLD_XM 1.000 0.001 1.000 0.001
score RISK_FREE 2.999 2.599 2.999 2.599
-score SENDGRID_REDIR 1.999 2.569 1.999 2.569
-score SENDGRID_REDIR_PHISH 2.816 1.000 2.816 1.000
+score SENDGRID_REDIR 1.999 2.396 1.999 2.396
+score SENDGRID_REDIR_PHISH 3.226 1.000 3.226 1.000
score SEO_SUSP_NTLD 1.000 1.000 1.000 1.000
-score SERGIO_SUBJECT_VIAGRA01 2.869 3.600 2.869 3.600
+score SERGIO_SUBJECT_VIAGRA01 2.870 3.599 2.870 3.599
score SHOPIFY_IMG_NOT_RCVD_SFY 1.000 1.000 1.000 1.000
-score SHORTENED_URL_SRC 2.999 3.999 2.999 3.999
-score SHORTENER_SHORT_IMG 0.001 1.484 0.001 1.484
-score SHORT_BODY_G_DRIVE_DYN 0.383 0.001 0.383 0.001
+score SHORTENED_URL_SRC 2.999 3.899 2.999 3.899
+score SHORTENER_SHORT_IMG 1.022 1.273 1.022 1.273
+score SHORT_BODY_G_DRIVE_DYN 1.096 0.001 1.096 0.001
score SHORT_IMG_SUSP_NTLD 1.000 1.000 1.000 1.000
score SHORT_SHORTNER 1.999 1.999 1.999 1.999
-score SHORT_URL 2.348 1.210 2.348 1.210
+score SHORT_URL 2.317 0.933 2.317 0.933
score SINGLETS_LOW_CONTRAST 0.001 0.001 0.001 0.001
-score SPOOFED_FREEMAIL 0.001 1.999 0.001 1.999
+score SPOOFED_FREEMAIL 0.001 1.997 0.001 1.997
score SPOOFED_FREEMAIL_NO_RDNS 1.499 0.001 1.499 0.001
-score SPOOFED_FREEM_REPTO 0.001 0.672 0.001 0.672
-score SPOOFED_FREEM_REPTO_CHN 0.001 3.022 0.001 3.022
+score SPOOFED_FREEM_REPTO 0.001 1.791 0.001 1.791
+score SPOOFED_FREEM_REPTO_CHN 0.001 1.828 0.001 1.828
score SPOOFED_FREEM_REPTO_RUS 0.001 1.000 0.001 1.000
score STATIC_XPRIO_OLE 1.999 1.999 1.999 1.999
-score STOCK_LOW_CONTRAST 2.499 0.001 2.499 0.001
+score STOCK_LOW_CONTRAST 2.500 0.001 2.500 0.001
score STOCK_TIP 1.000 1.000 1.000 1.000
-score STOX_BOUND_090909_B 1.976 2.495 1.976 2.495
-score SUBJ_OBFU_PUNCT_FEW 0.001 0.133 0.001 0.133
-score SUBJ_OBFU_PUNCT_MANY 1.749 0.226 1.749 0.226
+score STOX_BOUND_090909_B 1.932 2.485 1.932 2.485
+score SUBJ_OBFU_PUNCT_FEW 0.001 0.001 0.001 0.001
+score SUBJ_OBFU_PUNCT_MANY 1.750 0.344 1.750 0.344
score SURBL_BLOCKED 0.001 0.001 0.001 0.001
-score SUSP_UTF8_WORD_COMBO 0.001 3.000 0.001 3.000
-score SUSP_UTF8_WORD_FROM 1.999 1.999 1.999 1.999
+score SUSP_UTF8_WORD_COMBO 0.001 2.999 0.001 2.999
+score SUSP_UTF8_WORD_FROM 2.000 1.999 2.000 1.999
score SUSP_UTF8_WORD_SUBJ 1.999 1.999 1.999 1.999
score SYSADMIN 1.000 1.000 1.000 1.000
-score THIS_AD 1.300 0.799 1.300 0.799
+score THIS_AD 1.299 0.799 1.299 0.799
score THIS_IS_ADV_SUSP_NTLD 0.001 1.000 0.001 1.000
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499 0.378 1.499 0.378
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.500 0.560 1.500 0.560
score TO_EQ_FM_DIRECT_MX 1.000 1.000 1.000 1.000
-score TO_EQ_FM_DOM_HTML_IMG 0.001 0.173 0.001 0.173
-score TO_EQ_FM_DOM_HTML_ONLY 1.517 1.799 1.517 1.799
+score TO_EQ_FM_DOM_HTML_IMG 0.001 0.025 0.001 0.025
+score TO_EQ_FM_DOM_HTML_ONLY 1.436 1.799 1.436 1.799
score TO_EQ_FM_DOM_SPF_FAIL 0.001 0.001 0.001 0.001
-score TO_EQ_FM_HTML_ONLY 0.320 0.965 0.320 0.965
+score TO_EQ_FM_HTML_ONLY 0.431 1.526 0.431 1.526
score TO_EQ_FM_SPF_FAIL 0.001 0.001 0.001 0.001
-score TO_IN_SUBJ 0.100 0.100 0.100 0.100
+score TO_IN_SUBJ 0.099 0.100 0.099 0.100
score TO_NAME_SUBJ_NO_RDNS 1.000 1.000 1.000 1.000
-score TO_NO_BRKTS_FROM_MSSP 2.499 2.499 2.499 2.499
-score TO_NO_BRKTS_HTML_IMG 1.000 0.099 1.000 0.099
+score TO_NO_BRKTS_FROM_MSSP 2.499 2.497 2.499 2.497
+score TO_NO_BRKTS_HTML_IMG 1.000 1.999 1.000 1.999
score TO_NO_BRKTS_HTML_ONLY 1.999 1.999 1.999 1.999
-score TO_NO_BRKTS_MSFT 2.499 2.500 2.499 2.500
+score TO_NO_BRKTS_MSFT 2.499 1.214 2.499 1.214
score TO_NO_BRKTS_NORDNS_HTML 1.999 1.999 1.999 1.999
-score TO_NO_BRKTS_PCNT 1.000 2.398 1.000 2.398
-score TVD_RCVD_SPACE_BRACKET 4.299 4.027 4.299 4.027
-score TVD_SPACE_ENCODED 1.111 2.499 1.111 2.499
-score TVD_SPACE_RATIO_MINFP 1.601 1.486 1.601 1.486
+score TO_NO_BRKTS_PCNT 1.000 2.499 1.000 2.499
+score TVD_RCVD_SPACE_BRACKET 4.299 4.006 4.299 4.006
+score TVD_SPACE_ENCODED 0.610 2.499 0.610 2.499
+score TVD_SPACE_RATIO_MINFP 1.648 1.619 1.648 1.619
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 UNICODE_OBFU_ASC 1.000 1.000 1.000 1.000
score UNICODE_OBFU_ZW 1.000 1.000 1.000 1.000
-score UPGRADE_MAILBOX 1.267 0.001 1.267 0.001
+score UPGRADE_MAILBOX 1.273 0.001 1.273 0.001
score URI_DATA 1.000 1.000 1.000 1.000
score URI_DOTEDU 1.999 0.001 1.999 0.001
-score URI_DOTEDU_ENTITY 2.925 2.115 2.925 2.115
+score URI_DOTEDU_ENTITY 2.999 2.142 2.999 2.142
score URI_DOTEDU_LONG 2.287 0.001 2.287 0.001
-score URI_GOOGLE_PROXY 0.105 0.632 0.105 0.632
+score URI_GOOGLE_PROXY 0.108 0.635 0.108 0.635
score URI_HEX_IP 1.000 1.000 1.000 1.000
-score URI_IMG_WP_REDIR 2.890 2.999 2.890 2.999
-score URI_IN_URI_10 2.051 1.229 2.051 1.229
-score URI_IN_URI_5 2.439 3.464 2.439 3.464
+score URI_IMG_WP_REDIR 2.649 2.999 2.649 2.999
+score URI_IN_URI_10 2.207 3.373 2.207 3.373
+score URI_IN_URI_5 2.440 2.518 2.440 2.518
score URI_ONLY_MSGID_MALF 1.999 0.001 1.999 0.001
score URI_OPTOUT_3LD 1.000 1.000 1.000 1.000
-score URI_PHISH 1.000 3.999 1.000 3.999
-score URI_PHP_REDIR 3.499 3.499 3.499 3.499
-score URI_TRY_3LD 1.936 1.999 1.936 1.999
-score URI_WP_DIRINDEX 3.499 2.596 3.499 2.596
+score URI_PHISH 2.248 3.999 2.248 3.999
+score URI_PHP_REDIR 3.500 3.496 3.500 3.496
+score URI_TRY_3LD 1.938 1.997 1.938 1.997
+score URI_WPADMIN 2.799 0.001 2.799 0.001
+score URI_WP_DIRINDEX 3.499 2.181 3.499 2.181
score URI_WP_HACKED 3.499 3.499 3.499 3.499
-score URI_WP_HACKED_2 2.499 1.598 2.499 1.598
+score URI_WP_HACKED_2 2.499 1.596 2.499 1.596
score USB_DRIVES 1.000 1.000 1.000 1.000
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 XPRIO 2.249 1.000 2.249 1.000
-score XPRIO_SHORT_SUBJ 2.499 2.422 2.499 2.422
-score XPRIO_URL_SHORTNER 1.000 0.999 1.000 0.999
+score XPRIO_SHORT_SUBJ 2.499 2.499 2.499 2.499
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index f179379..0f4a618 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -1,114 +1,113 @@
-# Using score set 0 logs for revision 1881786 from:
-# ham-axb-coi-bulk.r1881786.log ham-axb-generic.r1881786.log ham-axb-ham-misc.r1881786.log ham-darxus.r1881786.log ham-ena-week0.r1881786.log ham-ena-week1.r1881786.log ham-ena-week2.r1881786.log ham-ena-week3.r1881786.log ham-ena-week4.r1881786.log ham-giovanni-ham.r1881786.log ham-giovanni-spammy.r1881786.log ham-giovanni-spam.r1881786.log ham-grenier.r1881786.log ham-jbrooks.r1881786.log ham-llanga.r1881786.log ham-mmiroslaw-mails-ham.r1881786.log ham-mmiroslaw-mails-spam.r1881786.log ham-npiazzi.r1881786.log ham-pds.r1881786.log ham-sihde.r1881786.log ham-spamsponge.r1881786.log ham-thendrikx.r1881786.log spam-axb-coi-bulk.r1881786.log spam-axb-generic.r1881786.log spam-axb-ham-misc.r1881786.log spam-darxus.r1881786.log spam-ena-week0.r1881786.log spam-ena-week1.r1881786.log spam-ena-week2.r1881786.log spam-ena-week3.r1881786.log spam-ena-week4.r1881786.log spam-giovanni-ham.r1881786.log spam-giovanni-spammy.r1881786.log spam-giovanni-spam.r1881786.log spam-grenier.r1881786.log spam-jbrooks.r1881786.log spam-llanga.r1881786.log spam-mmiroslaw-mails-ham.r1881786.log spam-mmiroslaw-mails-spam.r1881786.log spam-npiazzi.r1881786.log spam-pds.r1881786.log spam-sihde.r1881786.log spam-spamsponge.r1881786.log spam-thendrikx.r1881786.log
+# Using score set 0 logs for revision 1881814 from:
+# ham-axb-coi-bulk.r1881814.log ham-axb-generic.r1881814.log ham-axb-ham-misc.r1881814.log ham-darxus.r1881814.log ham-ena-week0.r1881814.log ham-ena-week1.r1881814.log ham-ena-week2.r1881814.log ham-ena-week3.r1881814.log ham-ena-week4.r1881814.log ham-giovanni-ham.r1881814.log ham-giovanni-spammy.r1881814.log ham-giovanni-spam.r1881814.log ham-grenier.r1881814.log ham-jbrooks.r1881814.log ham-llanga.r1881814.log ham-mmiroslaw-mails-ham.r1881814.log ham-mmiroslaw-mails-spam.r1881814.log ham-npiazzi.r1881814.log ham-pds.r1881814.log ham-sihde.r1881814.log ham-spamsponge.r1881814.log ham-thendrikx.r1881814.log spam-axb-coi-bulk.r1881814.log spam-axb-generic.r1881814.log spam-axb-ham-misc.r1881814.log spam-darxus.r1881814.log spam-ena-week0.r1881814.log spam-ena-week1.r1881814.log spam-ena-week2.r1881814.log spam-ena-week3.r1881814.log spam-ena-week4.r1881814.log spam-giovanni-ham.r1881814.log spam-giovanni-spammy.r1881814.log spam-giovanni-spam.r1881814.log spam-grenier.r1881814.log spam-jbrooks.r1881814.log spam-llanga.r1881814.log spam-mmiroslaw-mails-ham.r1881814.log spam-mmiroslaw-mails-spam.r1881814.log spam-npiazzi.r1881814.log spam-pds.r1881814.log spam-sihde.r1881814.log spam-spamsponge.r1881814.log spam-thendrikx.r1881814.log
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001 # force non-zero
-score AC_FROM_MANY_DOTS 2.999
+score AC_FROM_MANY_DOTS 3.000
score AC_HTML_NONSENSE_TAGS 1.999
score AC_POST_EXTRAS 2.499
-score ADMITS_SPAM 2.554
-score ADVANCE_FEE_2_NEW_MONEY 2.000
-score ADVANCE_FEE_3_NEW_MONEY 2.799
+score ADMITS_SPAM 2.436
+score ADVANCE_FEE_2_NEW_MONEY 1.999
+score ADVANCE_FEE_3_NEW_MONEY 2.899
score ADVANCE_FEE_4_NEW_MONEY 2.799
-score ADVANCE_FEE_5_NEW 2.800
-score AMAZON_IMG_NOT_RCVD_AMZN 2.500
-score AXB_XMAILER_MIMEOLE_OL_024C2 2.597
+score ADVANCE_FEE_5_NEW 1.897
+score AMAZON_IMG_NOT_RCVD_AMZN 2.499
+score AXB_XMAILER_MIMEOLE_OL_024C2 2.599
score BITCOIN_DEADLINE 2.999
-score BITCOIN_EXTORT_01 3.743
-score BITCOIN_MALF_HTML 3.500
-score BITCOIN_SPAM_02 1.512
-score BITCOIN_SPAM_04 1.500
-score BITCOIN_SPAM_08 1.736
-score BITCOIN_XPRIO 1.253
-score BITCOIN_YOUR_INFO 1.326
-score BODY_URI_ONLY 1.000
+score BITCOIN_EXTORT_01 4.559
+score BITCOIN_MALF_HTML 3.499
+score BITCOIN_SPAM_02 1.919
+score BITCOIN_SPAM_04 1.499
+score BITCOIN_XPRIO 1.251
+score BITCOIN_YOUR_INFO 1.392
+score BODY_URI_ONLY 0.999
score CK_HELO_DYNAMIC_SPLIT_IP 1.499
-score CK_HELO_GENERIC 0.250
-score CTE_8BIT_MISMATCH 0.999
-score CTYPE_NULL 2.601
-score DOTGOV_IMAGE 3.000
+score CK_HELO_GENERIC 0.249
+score CTE_8BIT_MISMATCH 1.000
+score CTYPE_NULL 2.600
+score DOTGOV_IMAGE 2.999
score DSN_NO_MIMEVERSION 1.999
-score DX_TEXT_03 0.899
-score END_FUTURE_EMAILS 2.100
-score FILL_THIS_FORM 1.199
-score FONT_INVIS_DIRECT 0.001 # force non-zero
-score FONT_INVIS_DOTGOV 3.001
+score DX_TEXT_03 0.799
+score END_FUTURE_EMAILS 2.099
+score FILL_THIS_FORM 1.201
+score FONT_INVIS_DIRECT 1.706
+score FONT_INVIS_DOTGOV 1.113
score FONT_INVIS_LONG_LINE 0.001
-score FONT_INVIS_MSGID 1.999
-score FONT_INVIS_POSTEXTRAS 0.505
+score FONT_INVIS_MSGID 2.182
+score FONT_INVIS_POSTEXTRAS 0.001
score FORGED_RELAY_MUA_TO_MX 4.099
score FORM_FRAUD 0.999
-score FORM_FRAUD_5 2.999
+score FORM_FRAUD_5 1.954
score FOUND_YOU 3.249
score FREEMAIL_FORGED_FROMDOMAIN 0.249
-score FROM_2_EMAILS_SHORT 1.999
-score FROM_MISSPACED 1.999
-score FROM_MISSP_DYNIP 0.326
+score FROM_2_EMAILS_SHORT 2.000
+score FROM_ADDR_WS 2.526
+score FROM_MISSPACED 2.000
+score FROM_MISSP_DYNIP 1.564
score FROM_MISSP_EH_MATCH 1.999
-score FROM_MISSP_FREEMAIL 2.549
-score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_REPLYTO 1.949
-score FROM_MISSP_TO_UNDISC 0.001
+score FROM_MISSP_FREEMAIL 1.998
+score FROM_MISSP_MSFT 0.546
+score FROM_MISSP_REPLYTO 2.499
+score FROM_MISSP_TO_UNDISC 1.544
score FROM_MISSP_USER 0.001
score FROM_MISSP_XPRIO 0.001
score FROM_NAME_EQ_TO_G_DRIVE 0.001
-score FROM_NTLD_REPLY_FREEMAIL 1.999
-score FROM_SUSPICIOUS_NTLD 0.500
-score FROM_SUSPICIOUS_NTLD_FP 2.000
-score FROM_UNBAL1 3.500
-score FROM_URI 1.684
+score FROM_NTLD_REPLY_FREEMAIL 1.303
+score FROM_SUSPICIOUS_NTLD 0.499
+score FROM_SUSPICIOUS_NTLD_FP 1.999
+score FROM_UNBAL1 2.473
+score FROM_URI 1.718
score FROM_WORDY 0.001
-score FROM_WWW 2.102
+score FROM_WWW 2.069
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FSL_THIS_IS_ADV 2.045
-score GB_BITCOIN_CP 1.248
-score GB_BITCOIN_NH 2.614
-score GB_FREEMAIL_DISPTO 0.499
+score FSL_THIS_IS_ADV 2.163
+score GB_BITCOIN_CP 1.563
+score GB_FREEMAIL_DISPTO 0.500
score GB_GOOGLE_OBFUS 0.749
score HDRS_LCASE 0.100
score HDRS_LCASE_IMGONLY 0.099
score HDR_ORDER_FTSDMCXX_DIRECT 1.999
-score HDR_ORDER_FTSDMCXX_NORDNS 2.600
+score HDR_ORDER_FTSDMCXX_NORDNS 2.601
score HEADER_FROM_DIFFERENT_DOMAINS 0.250
-score HELO_MISC_IP 0.250
+score HELO_MISC_IP 0.249
score HELO_NO_DOMAIN 0.001
-score HK_RANDOM_FROM 0.997
-score HK_RANDOM_REPLYTO 0.999
-score HK_SCAM 1.607
+score HK_RANDOM_FROM 0.950
+score HK_RANDOM_REPLYTO 1.000
+score HK_SCAM 1.569
score HOSTED_IMG_DIRECT_MX 3.499
-score HTML_OFF_PAGE 0.100
-score HTML_SINGLET_MANY 1.388
-score HTML_TEXT_INVISIBLE_FONT 2.897
-score HTML_TEXT_INVISIBLE_STYLE 1.689
-score IMG_ONLY_FM_DOM_INFO 2.199
-score KB_FORGED_MOZ4 4.500
-score KHOP_FAKE_EBAY 0.005
+score HTML_OFF_PAGE 0.102
+score HTML_SINGLET_MANY 0.247
+score HTML_TEXT_INVISIBLE_FONT 2.590
+score HTML_TEXT_INVISIBLE_STYLE 2.251
+score IMG_ONLY_FM_DOM_INFO 1.699
+score KB_FORGED_MOZ4 4.499
+score KHOP_FAKE_EBAY 0.001
score KHOP_HELO_FCRDNS 0.400
-score LH_URI_DOM_IN_PATH 2.699
-score LIST_PRTL_SAME_USER 0.001
-score LONG_HEX_URI 2.200
+score LH_URI_DOM_IN_PATH 2.700
+score LIST_PRTL_SAME_USER 0.001 # force non-zero
+score LONG_HEX_URI 2.249
score LOTS_OF_MONEY 0.010
-score MANY_SPAN_IN_TEXT 2.763
+score MANY_SPAN_IN_TEXT 3.099
score MAY_BE_FORGED 2.699
score MILLION_HUNDRED 0.001
score MIMEOLE_DIRECT_TO_MX 0.001
score MIME_NO_TEXT 0.001
-score MIXED_ES 2.699
-score MONEY_FORM_SHORT 1.692
+score MIXED_ES 2.700
+score MONEY_FORM_SHORT 2.042
score MONEY_FRAUD_3 2.599
-score MONEY_FRAUD_5 2.592
-score MONEY_FRAUD_8 1.882
+score MONEY_FRAUD_5 2.284
+score MONEY_FRAUD_8 2.237
score MONEY_FROM_MISSP 1.999
-score MSM_PRIO_REPTO 2.419
-score NICE_REPLY_A -0.340
-score NORDNS_LOW_CONTRAST 1.786
+score MSM_PRIO_REPTO 2.499
+score NICE_REPLY_A -0.300
+score NORDNS_LOW_CONTRAST 1.887
score NO_FM_NAME_IP_HOSTN 0.001
-score NSL_RCVD_FROM_USER 0.001 # force non-zero
-score NSL_RCVD_HELO_USER 0.103
+score NSL_RCVD_FROM_USER 0.001
+score NSL_RCVD_HELO_USER 1.635
score OFFER_ONLY_AMERICA 1.999
-score PDS_BTC_ID 0.500
-score PDS_BTC_MSGID 0.001
+score PDS_BTC_ID 0.499
+score PDS_BTC_MSGID 0.001 # force non-zero
score PDS_EMPTYSUBJ_URISHRT 1.499
score PDS_FREEMAIL_REPLYTO_URISHRT 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
@@ -118,55 +117,58 @@
score PDS_SHORTFWD_URISHRT 1.500
score PDS_TINYSUBJ_URISHRT 1.499
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
-score PDS_TO_EQ_FROM_NAME 0.001 # force non-zero
+score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 2.000
+score PDS_TONAME_EQ_TOLOCAL_VSHORT 1.000
+score PDS_TO_EQ_FROM_NAME 0.001
+score PHP_ORIG_SCRIPT 2.499
score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RATWARE_NO_RDNS 0.700
+score RATWARE_NO_RDNS 2.131
score RISK_FREE 2.999
score SENDGRID_REDIR 1.999
-score SENDGRID_REDIR_PHISH 2.816
-score SERGIO_SUBJECT_VIAGRA01 2.869
+score SENDGRID_REDIR_PHISH 3.226
+score SERGIO_SUBJECT_VIAGRA01 2.870
score SHORTENED_URL_SRC 2.999
-score SHORTENER_SHORT_IMG 0.001
-score SHORT_BODY_G_DRIVE_DYN 0.383
+score SHORTENER_SHORT_IMG 1.022
+score SHORT_BODY_G_DRIVE_DYN 1.096
score SHORT_SHORTNER 1.999
-score SHORT_URL 2.348
+score SHORT_URL 2.317
score SINGLETS_LOW_CONTRAST 0.001
score SPOOFED_FREEMAIL_NO_RDNS 1.499
score STATIC_XPRIO_OLE 1.999
-score STOCK_LOW_CONTRAST 2.499
-score STOX_BOUND_090909_B 1.976
+score STOCK_LOW_CONTRAST 2.500
+score STOX_BOUND_090909_B 1.932
score SUBJ_OBFU_PUNCT_FEW 0.001
-score SUBJ_OBFU_PUNCT_MANY 1.749
+score SUBJ_OBFU_PUNCT_MANY 1.750
score SUSP_UTF8_WORD_COMBO 0.001
-score SUSP_UTF8_WORD_FROM 1.999
+score SUSP_UTF8_WORD_FROM 2.000
score SUSP_UTF8_WORD_SUBJ 1.999
-score THIS_AD 1.300
+score THIS_AD 1.299
score THIS_IS_ADV_SUSP_NTLD 0.001
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.500
score TO_EQ_FM_DOM_HTML_IMG 0.001
-score TO_EQ_FM_DOM_HTML_ONLY 1.517
-score TO_EQ_FM_HTML_ONLY 0.320
-score TO_IN_SUBJ 0.100
+score TO_EQ_FM_DOM_HTML_ONLY 1.436
+score TO_EQ_FM_HTML_ONLY 0.431
+score TO_IN_SUBJ 0.099
score TO_NO_BRKTS_FROM_MSSP 2.499
score TO_NO_BRKTS_HTML_ONLY 1.999
score TO_NO_BRKTS_MSFT 2.499
score TO_NO_BRKTS_NORDNS_HTML 1.999
score TVD_RCVD_SPACE_BRACKET 4.299
-score TVD_SPACE_ENCODED 1.111
-score TVD_SPACE_RATIO_MINFP 1.601
-score UPGRADE_MAILBOX 1.267
+score TVD_SPACE_ENCODED 0.610
+score TVD_SPACE_RATIO_MINFP 1.648
+score UPGRADE_MAILBOX 1.273
score URI_DOTEDU 1.999
-score URI_DOTEDU_ENTITY 2.925
+score URI_DOTEDU_ENTITY 2.999
score URI_DOTEDU_LONG 2.287
-score URI_GOOGLE_PROXY 0.105
-score URI_IMG_WP_REDIR 2.890
-score URI_IN_URI_10 2.051
-score URI_IN_URI_5 2.439
+score URI_GOOGLE_PROXY 0.108
+score URI_IMG_WP_REDIR 2.649
+score URI_IN_URI_10 2.207
+score URI_IN_URI_5 2.440
score URI_ONLY_MSGID_MALF 1.999
-score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 1.936
+score URI_PHISH 2.248
+score URI_PHP_REDIR 3.500
+score URI_TRY_3LD 1.938
+score URI_WPADMIN 2.799
score URI_WP_DIRINDEX 3.499
score URI_WP_HACKED 3.499
score URI_WP_HACKED_2 2.499
@@ -195,6 +197,7 @@
score BITCOIN_SPAM_03 1.000
score BITCOIN_SPAM_06 1.000
score BITCOIN_SPAM_07 1.000
+score BITCOIN_SPAM_08 1.000
score BITCOIN_SPAM_09 1.000
score BITCOIN_SPAM_10 1.000
score BITCOIN_SPAM_11 1.000
@@ -217,10 +220,10 @@
score FORM_LOW_CONTRAST 1.000
score FREEM_FRNUM_UNICD_EMPTY 1.000
score FRNAME_IN_MSG_XPRIO_NO_SUB 1.000
-score FROM_ADDR_WS 1.000
score FROM_NTLD_LINKBAIT 1.000
score FROM_WORDY_SHORT 1.000
score GAPPY_SALES_LEADS_FREEM 1.000
+score GB_BITCOIN_NH 1.000
score GB_FORGED_MUA_POSTFIX 1.000
score GB_FREEMAIL_DISPTO_NOTFREEM 0.500
score GB_GOOGLE_OBFUR 0.750
@@ -256,7 +259,6 @@
score OBFU_BITCOIN 1.000
score PHOTO_EDITING_DIRECT 1.000
score PHP_NOVER_MUA 1.000
-score PHP_ORIG_SCRIPT 1.000
score PHP_SCRIPT_MUA 1.000
score PP_TOO_MUCH_UNICODE02 0.500
score PP_TOO_MUCH_UNICODE05 1.000
@@ -283,11 +285,9 @@
score URI_DATA 1.000
score URI_HEX_IP 1.000
score URI_OPTOUT_3LD 1.000
-score URI_PHISH 1.000
score USB_DRIVES 1.000
score VPS_NO_NTLD 1.000
score WALMART_IMG_NOT_RCVD_WAL 1.000
-score XPRIO_URL_SHORTNER 1.000
# in active.list but have no hits in recent corpus
score BITCOIN_SPAM_05 0.001 # force non-zero
score BITCOIN_SPF_ONLYALL 0.001 # force non-zero
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index 4e821d9..5c7efa0 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -3,193 +3,192 @@
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001 # force non-zero
-score AC_FROM_MANY_DOTS 2.294
+score AC_FROM_MANY_DOTS 1.251
score AC_HTML_NONSENSE_TAGS 1.999
score AC_POST_EXTRAS 0.001
-score ADMITS_SPAM 0.532
-score ADVANCE_FEE_2_NEW_MONEY 1.617
+score ADMITS_SPAM 0.543
+score ADVANCE_FEE_2_NEW_MONEY 1.999
score ADVANCE_FEE_3_NEW 3.499
score ADVANCE_FEE_3_NEW_MONEY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 2.399
-score ADVANCE_FEE_5_NEW 2.398
+score ADVANCE_FEE_4_NEW_MONEY 1.989
+score ADVANCE_FEE_5_NEW 2.599
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
-score AXB_XMAILER_MIMEOLE_OL_024C2 3.529
-score BITCOIN_EXTORT_01 4.212
-score BITCOIN_MALF_HTML 3.500
-score BITCOIN_SPAM_02 0.221
-score BITCOIN_SPAM_05 1.906
-score BITCOIN_SPAM_08 1.026
-score BITCOIN_SPAM_09 1.214
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 # force non-zero
+score BITCOIN_EXTORT_01 3.826
+score BITCOIN_MALF_HTML 3.499
+score BITCOIN_SPAM_02 1.968
+score BITCOIN_SPAM_05 1.662
+score BITCOIN_SPAM_08 1.308
+score BITCOIN_SPAM_09 0.975
score BODY_URI_ONLY 0.999
-score BOGUS_MIME_VERSION 1.761
+score BOGUS_MIME_VERSION 1.763
score CK_HELO_DYNAMIC_SPLIT_IP 0.001
-score CK_HELO_GENERIC 0.001 # force non-zero
+score CK_HELO_GENERIC 0.001
score CTE_8BIT_MISMATCH 0.999
-score CTYPE_NULL 2.400
+score CTYPE_NULL 1.500
score DKIMWL_BL 2.999
-score DKIMWL_WL_HIGH -2.999
+score DKIMWL_WL_HIGH -2.996
score DKIMWL_WL_MED -0.001
-score DOTGOV_IMAGE 0.159
-score DSN_NO_MIMEVERSION 1.999
+score DOTGOV_IMAGE 1.468
+score DSN_NO_MIMEVERSION 2.000
score DX_TEXT_03 0.199
score END_FUTURE_EMAILS 2.499
-score FILL_THIS_FORM 1.094
+score FILL_THIS_FORM 0.526
score FONT_INVIS_DIRECT 0.001
-score FONT_INVIS_DOTGOV 0.001
+score FONT_INVIS_DOTGOV 0.372
score FONT_INVIS_LONG_LINE 0.001 # force non-zero
score FONT_INVIS_MSGID 0.001
-score FONT_INVIS_POSTEXTRAS 2.982
-score FORGED_RELAY_MUA_TO_MX 3.693
-score FORGED_SPF_HELO 0.939
-score FORM_FRAUD 0.999
-score FORM_FRAUD_5 2.700
+score FONT_INVIS_POSTEXTRAS 1.898
+score FORGED_RELAY_MUA_TO_MX 3.709
+score FORGED_SPF_HELO 0.941
+score FORM_FRAUD 0.001 # force non-zero
+score FORM_FRAUD_5 2.699
score FOUND_YOU 3.249
score FREEMAIL_FORGED_FROMDOMAIN 0.249
score FROM_2_EMAILS_SHORT 1.999
score FROM_ADDR_WS 2.999
-score FROM_FMBLA_NEWDOM 1.499
+score FROM_FMBLA_NEWDOM 1.498
score FROM_FMBLA_NEWDOM14 0.999
score FROM_FMBLA_NEWDOM28 0.799
-score FROM_GOV_DKIM_AU -0.453
+score FROM_GOV_DKIM_AU -0.448
score FROM_GOV_SPOOF 0.999
-score FROM_MISSPACED 1.073
-score FROM_MISSP_DYNIP 1.533
-score FROM_MISSP_EH_MATCH 1.551
-score FROM_MISSP_FREEMAIL 1.143
-score FROM_MISSP_MSFT 2.155
-score FROM_MISSP_REPLYTO 2.499
+score FROM_MISSPACED 0.001
+score FROM_MISSP_DYNIP 2.599
+score FROM_MISSP_EH_MATCH 0.001
+score FROM_MISSP_FREEMAIL 1.131
+score FROM_MISSP_MSFT 0.001
+score FROM_MISSP_REPLYTO 0.112
score FROM_MISSP_SPF_FAIL 1.999
-score FROM_MISSP_USER 0.381
-score FROM_MISSP_XPRIO 2.499
-score FROM_NAME_EQ_TO_G_DRIVE 0.922
-score FROM_NTLD_REPLY_FREEMAIL 1.973
-score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_URI 2.126
-score FROM_WORDY 1.072
-score FROM_WWW 1.303
-score FSL_BULK_SIG 0.001 # force non-zero
-score FSL_CTYPE_WIN1251 2.983
-score FSL_NEW_HELO_USER 1.999
-score FSL_THIS_IS_ADV 0.497
-score GB_BITCOIN_CP 2.307
-score GB_BITCOIN_NH 2.774
-score GB_FREEMAIL_DISPTO 0.001
-score GB_GOOGLE_OBFUS 0.749
+score FROM_MISSP_USER 0.001
+score FROM_MISSP_XPRIO 0.001
+score FROM_NAME_EQ_TO_G_DRIVE 0.882
+score FROM_NTLD_REPLY_FREEMAIL 0.768
+score FROM_SUSPICIOUS_NTLD 0.498
+score FROM_SUSPICIOUS_NTLD_FP 1.997
+score FROM_URI 1.698
+score FROM_WORDY 2.113
+score FROM_WWW 1.335
+score FSL_BULK_SIG 0.001
+score FSL_CTYPE_WIN1251 0.001 # force non-zero
+score FSL_NEW_HELO_USER 0.001 # force non-zero
+score FSL_THIS_IS_ADV 0.105
+score GB_BITCOIN_CP 1.723
+score GB_BITCOIN_NH 0.848
+score GB_FREEMAIL_DISPTO 0.001 # force non-zero
+score GB_GOOGLE_OBFUS 0.750
score HDRS_LCASE 0.099
score HDRS_LCASE_IMGONLY 0.099
-score HDR_ORDER_FTSDMCXX_DIRECT 1.728
-score HDR_ORDER_FTSDMCXX_NORDNS 3.297
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250
-score HELO_MISC_IP 0.001 # force non-zero
-score HELO_NO_DOMAIN 0.001
-score HK_RANDOM_FROM 1.000
+score HDR_ORDER_FTSDMCXX_DIRECT 0.888
+score HDR_ORDER_FTSDMCXX_NORDNS 3.165
+score HEADER_FROM_DIFFERENT_DOMAINS 0.248
+score HELO_MISC_IP 0.001
+score HELO_NO_DOMAIN 0.001 # force non-zero
+score HK_RANDOM_FROM 0.997
score HK_RANDOM_REPLYTO 0.001
-score HK_SCAM 1.035
-score HOSTED_IMG_DIRECT_MX 1.546
-score HTML_OFF_PAGE 1.072
-score HTML_SINGLET_MANY 1.155
-score HTML_TEXT_INVISIBLE_FONT 2.196
-score HTML_TEXT_INVISIBLE_STYLE 1.590
-score IMG_ONLY_FM_DOM_INFO 2.447
-score KB_FORGED_MOZ4 3.994
-score KHOP_FAKE_EBAY 0.899
-score KHOP_HELO_FCRDNS 0.400
-score LH_URI_DOM_IN_PATH 1.420
-score LIST_PRTL_SAME_USER 0.750
+score HK_SCAM 1.022
+score HOSTED_IMG_DIRECT_MX 1.608
+score HTML_OFF_PAGE 1.043
+score HTML_SINGLET_MANY 2.499
+score HTML_TEXT_INVISIBLE_FONT 1.564
+score HTML_TEXT_INVISIBLE_STYLE 1.973
+score IMG_ONLY_FM_DOM_INFO 2.499
+score KB_FORGED_MOZ4 4.499
+score KHOP_FAKE_EBAY 0.120
+score KHOP_HELO_FCRDNS 0.399
+score LH_URI_DOM_IN_PATH 1.812
+score LIST_PRTL_SAME_USER 0.609
score LONG_HEX_URI 0.001
score LONG_IMG_URI 0.001
score LOTS_OF_MONEY 0.010
-score MANY_SPAN_IN_TEXT 2.799
-score MILLION_HUNDRED 0.001 # force non-zero
-score MIMEOLE_DIRECT_TO_MX 1.094
+score MANY_SPAN_IN_TEXT 1.892
+score MILLION_HUNDRED 0.511
+score MIMEOLE_DIRECT_TO_MX 1.717
score MIME_NO_TEXT 0.001
-score MIXED_ES 0.001
+score MIXED_ES 0.924
score MONEY_FORM_SHORT 0.001
-score MONEY_FRAUD_3 2.297
-score MONEY_FRAUD_5 0.486
-score MONEY_FRAUD_8 0.001
-score MONEY_FROM_MISSP 1.999
-score MSM_PRIO_REPTO 0.994
-score NICE_REPLY_A -1.869
+score MONEY_FRAUD_3 1.896
+score MONEY_FRAUD_5 0.478
+score MONEY_FRAUD_8 0.538
+score MONEY_FROM_MISSP 1.006
+score MSM_PRIO_REPTO 2.308
+score NICE_REPLY_A -0.001
score NORDNS_LOW_CONTRAST 0.910
-score NO_FM_NAME_IP_HOSTN 0.001 # force non-zero
-score NSL_RCVD_FROM_USER 0.284
-score NSL_RCVD_HELO_USER 0.001
-score OFFER_ONLY_AMERICA 1.078
-score PDS_BTC_ID 0.500
+score NO_FM_NAME_IP_HOSTN 0.001
+score NSL_RCVD_FROM_USER 0.001
+score NSL_RCVD_HELO_USER 0.438
+score OFFER_ONLY_AMERICA 0.001 # force non-zero
+score PDS_BTC_ID 0.499
score PDS_BTC_MSGID 0.999
-score PDS_EMPTYSUBJ_URISHRT 0.225
+score PDS_EMPTYSUBJ_URISHRT 0.224
score PDS_FREEMAIL_REPLYTO_URISHRT 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 1.049
+score PDS_FROM_2_EMAILS 1.048
score PDS_FROM_NAME_TO_DOMAIN 0.999
score PDS_NAKED_TO_NUMERO 1.999
-score PDS_SHORTFWD_URISHRT 1.296
+score PDS_SHORTFWD_URISHRT 1.500
score PDS_TINYSUBJ_URISHRT 0.001
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.071
+score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
-score PDS_TO_EQ_FROM_NAME 3.399
-score PP_MIME_FAKE_ASCII_TEXT 0.111
-score RATWARE_NO_RDNS 1.283
+score PDS_TO_EQ_FROM_NAME 1.679
+score PP_MIME_FAKE_ASCII_TEXT 0.108
+score RATWARE_NO_RDNS 2.770
score RCVD_DOTEDU_SHORT 2.499
-score RCVD_DOTEDU_SUSP_URI 2.999
+score RCVD_DOTEDU_SUSP_URI 0.001
score RCVD_IN_MSPIKE_H2 -0.001
-score RDNS_NUM_TLD_XM 2.999
+score RDNS_NUM_TLD_XM 0.001
score RISK_FREE 2.599
-score SENDGRID_REDIR 2.569
-score SERGIO_SUBJECT_VIAGRA01 3.600
-score SHORTENED_URL_SRC 3.999
-score SHORTENER_SHORT_IMG 1.484
+score SENDGRID_REDIR 2.396
+score SERGIO_SUBJECT_VIAGRA01 3.599
+score SHORTENED_URL_SRC 3.899
+score SHORTENER_SHORT_IMG 1.273
score SHORT_SHORTNER 1.999
-score SHORT_URL 1.210
+score SHORT_URL 0.933
score SINGLETS_LOW_CONTRAST 0.001
-score SPOOFED_FREEMAIL 1.999
+score SPOOFED_FREEMAIL 1.997
score SPOOFED_FREEMAIL_NO_RDNS 0.001
-score SPOOFED_FREEM_REPTO 0.672
-score SPOOFED_FREEM_REPTO_CHN 3.022
+score SPOOFED_FREEM_REPTO 1.791
+score SPOOFED_FREEM_REPTO_CHN 1.828
score STATIC_XPRIO_OLE 1.999
score STOCK_LOW_CONTRAST 0.001
-score STOX_BOUND_090909_B 2.495
-score SUBJ_OBFU_PUNCT_FEW 0.133
-score SUBJ_OBFU_PUNCT_MANY 0.226
-score SUSP_UTF8_WORD_COMBO 3.000
+score STOX_BOUND_090909_B 2.485
+score SUBJ_OBFU_PUNCT_FEW 0.001
+score SUBJ_OBFU_PUNCT_MANY 0.344
+score SUSP_UTF8_WORD_COMBO 2.999
score SUSP_UTF8_WORD_FROM 1.999
score SUSP_UTF8_WORD_SUBJ 1.999
score THIS_AD 0.799
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 0.378
-score TO_EQ_FM_DOM_HTML_IMG 0.173
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 0.560
+score TO_EQ_FM_DOM_HTML_IMG 0.025
score TO_EQ_FM_DOM_HTML_ONLY 1.799
score TO_EQ_FM_DOM_SPF_FAIL 0.001
-score TO_EQ_FM_HTML_ONLY 0.965
+score TO_EQ_FM_HTML_ONLY 1.526
score TO_EQ_FM_SPF_FAIL 0.001
score TO_IN_SUBJ 0.100
-score TO_NO_BRKTS_FROM_MSSP 2.499
-score TO_NO_BRKTS_HTML_IMG 0.099
+score TO_NO_BRKTS_FROM_MSSP 2.497
+score TO_NO_BRKTS_HTML_IMG 1.999
score TO_NO_BRKTS_HTML_ONLY 1.999
-score TO_NO_BRKTS_MSFT 2.500
+score TO_NO_BRKTS_MSFT 1.214
score TO_NO_BRKTS_NORDNS_HTML 1.999
-score TO_NO_BRKTS_PCNT 2.398
-score TVD_RCVD_SPACE_BRACKET 4.027
+score TO_NO_BRKTS_PCNT 2.499
+score TVD_RCVD_SPACE_BRACKET 4.006
score TVD_SPACE_ENCODED 2.499
-score TVD_SPACE_RATIO_MINFP 1.486
+score TVD_SPACE_RATIO_MINFP 1.619
score UPGRADE_MAILBOX 0.001
-score URI_DOTEDU 0.001 # force non-zero
-score URI_DOTEDU_ENTITY 2.115
-score URI_GOOGLE_PROXY 0.632
+score URI_DOTEDU 0.001
+score URI_DOTEDU_ENTITY 2.142
+score URI_GOOGLE_PROXY 0.635
score URI_IMG_WP_REDIR 2.999
-score URI_IN_URI_10 1.229
-score URI_IN_URI_5 3.464
-score URI_ONLY_MSGID_MALF 0.001 # force non-zero
+score URI_IN_URI_10 3.373
+score URI_IN_URI_5 2.518
+score URI_ONLY_MSGID_MALF 0.001
score URI_PHISH 3.999
-score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 1.999
-score URI_WP_DIRINDEX 2.596
+score URI_PHP_REDIR 3.496
+score URI_TRY_3LD 1.997
+score URI_WP_DIRINDEX 2.181
score URI_WP_HACKED 3.499
-score URI_WP_HACKED_2 1.598
-score XPRIO_SHORT_SUBJ 2.422
-score XPRIO_URL_SHORTNER 0.999
+score URI_WP_HACKED_2 1.596
+score XPRIO_SHORT_SUBJ 2.499
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
score AC_SPAMMY_URI_PATTERNS11 1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index f179379..0f4a618 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -1,114 +1,113 @@
-# Using score set 0 logs for revision 1881786 from:
-# ham-axb-coi-bulk.r1881786.log ham-axb-generic.r1881786.log ham-axb-ham-misc.r1881786.log ham-darxus.r1881786.log ham-ena-week0.r1881786.log ham-ena-week1.r1881786.log ham-ena-week2.r1881786.log ham-ena-week3.r1881786.log ham-ena-week4.r1881786.log ham-giovanni-ham.r1881786.log ham-giovanni-spammy.r1881786.log ham-giovanni-spam.r1881786.log ham-grenier.r1881786.log ham-jbrooks.r1881786.log ham-llanga.r1881786.log ham-mmiroslaw-mails-ham.r1881786.log ham-mmiroslaw-mails-spam.r1881786.log ham-npiazzi.r1881786.log ham-pds.r1881786.log ham-sihde.r1881786.log ham-spamsponge.r1881786.log ham-thendrikx.r1881786.log spam-axb-coi-bulk.r1881786.log spam-axb-generic.r1881786.log spam-axb-ham-misc.r1881786.log spam-darxus.r1881786.log spam-ena-week0.r1881786.log spam-ena-week1.r1881786.log spam-ena-week2.r1881786.log spam-ena-week3.r1881786.log spam-ena-week4.r1881786.log spam-giovanni-ham.r1881786.log spam-giovanni-spammy.r1881786.log spam-giovanni-spam.r1881786.log spam-grenier.r1881786.log spam-jbrooks.r1881786.log spam-llanga.r1881786.log spam-mmiroslaw-mails-ham.r1881786.log spam-mmiroslaw-mails-spam.r1881786.log spam-npiazzi.r1881786.log spam-pds.r1881786.log spam-sihde.r1881786.log spam-spamsponge.r1881786.log spam-thendrikx.r1881786.log
+# Using score set 0 logs for revision 1881814 from:
+# ham-axb-coi-bulk.r1881814.log ham-axb-generic.r1881814.log ham-axb-ham-misc.r1881814.log ham-darxus.r1881814.log ham-ena-week0.r1881814.log ham-ena-week1.r1881814.log ham-ena-week2.r1881814.log ham-ena-week3.r1881814.log ham-ena-week4.r1881814.log ham-giovanni-ham.r1881814.log ham-giovanni-spammy.r1881814.log ham-giovanni-spam.r1881814.log ham-grenier.r1881814.log ham-jbrooks.r1881814.log ham-llanga.r1881814.log ham-mmiroslaw-mails-ham.r1881814.log ham-mmiroslaw-mails-spam.r1881814.log ham-npiazzi.r1881814.log ham-pds.r1881814.log ham-sihde.r1881814.log ham-spamsponge.r1881814.log ham-thendrikx.r1881814.log spam-axb-coi-bulk.r1881814.log spam-axb-generic.r1881814.log spam-axb-ham-misc.r1881814.log spam-darxus.r1881814.log spam-ena-week0.r1881814.log spam-ena-week1.r1881814.log spam-ena-week2.r1881814.log spam-ena-week3.r1881814.log spam-ena-week4.r1881814.log spam-giovanni-ham.r1881814.log spam-giovanni-spammy.r1881814.log spam-giovanni-spam.r1881814.log spam-grenier.r1881814.log spam-jbrooks.r1881814.log spam-llanga.r1881814.log spam-mmiroslaw-mails-ham.r1881814.log spam-mmiroslaw-mails-spam.r1881814.log spam-npiazzi.r1881814.log spam-pds.r1881814.log spam-sihde.r1881814.log spam-spamsponge.r1881814.log spam-thendrikx.r1881814.log
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001 # force non-zero
-score AC_FROM_MANY_DOTS 2.999
+score AC_FROM_MANY_DOTS 3.000
score AC_HTML_NONSENSE_TAGS 1.999
score AC_POST_EXTRAS 2.499
-score ADMITS_SPAM 2.554
-score ADVANCE_FEE_2_NEW_MONEY 2.000
-score ADVANCE_FEE_3_NEW_MONEY 2.799
+score ADMITS_SPAM 2.436
+score ADVANCE_FEE_2_NEW_MONEY 1.999
+score ADVANCE_FEE_3_NEW_MONEY 2.899
score ADVANCE_FEE_4_NEW_MONEY 2.799
-score ADVANCE_FEE_5_NEW 2.800
-score AMAZON_IMG_NOT_RCVD_AMZN 2.500
-score AXB_XMAILER_MIMEOLE_OL_024C2 2.597
+score ADVANCE_FEE_5_NEW 1.897
+score AMAZON_IMG_NOT_RCVD_AMZN 2.499
+score AXB_XMAILER_MIMEOLE_OL_024C2 2.599
score BITCOIN_DEADLINE 2.999
-score BITCOIN_EXTORT_01 3.743
-score BITCOIN_MALF_HTML 3.500
-score BITCOIN_SPAM_02 1.512
-score BITCOIN_SPAM_04 1.500
-score BITCOIN_SPAM_08 1.736
-score BITCOIN_XPRIO 1.253
-score BITCOIN_YOUR_INFO 1.326
-score BODY_URI_ONLY 1.000
+score BITCOIN_EXTORT_01 4.559
+score BITCOIN_MALF_HTML 3.499
+score BITCOIN_SPAM_02 1.919
+score BITCOIN_SPAM_04 1.499
+score BITCOIN_XPRIO 1.251
+score BITCOIN_YOUR_INFO 1.392
+score BODY_URI_ONLY 0.999
score CK_HELO_DYNAMIC_SPLIT_IP 1.499
-score CK_HELO_GENERIC 0.250
-score CTE_8BIT_MISMATCH 0.999
-score CTYPE_NULL 2.601
-score DOTGOV_IMAGE 3.000
+score CK_HELO_GENERIC 0.249
+score CTE_8BIT_MISMATCH 1.000
+score CTYPE_NULL 2.600
+score DOTGOV_IMAGE 2.999
score DSN_NO_MIMEVERSION 1.999
-score DX_TEXT_03 0.899
-score END_FUTURE_EMAILS 2.100
-score FILL_THIS_FORM 1.199
-score FONT_INVIS_DIRECT 0.001 # force non-zero
-score FONT_INVIS_DOTGOV 3.001
+score DX_TEXT_03 0.799
+score END_FUTURE_EMAILS 2.099
+score FILL_THIS_FORM 1.201
+score FONT_INVIS_DIRECT 1.706
+score FONT_INVIS_DOTGOV 1.113
score FONT_INVIS_LONG_LINE 0.001
-score FONT_INVIS_MSGID 1.999
-score FONT_INVIS_POSTEXTRAS 0.505
+score FONT_INVIS_MSGID 2.182
+score FONT_INVIS_POSTEXTRAS 0.001
score FORGED_RELAY_MUA_TO_MX 4.099
score FORM_FRAUD 0.999
-score FORM_FRAUD_5 2.999
+score FORM_FRAUD_5 1.954
score FOUND_YOU 3.249
score FREEMAIL_FORGED_FROMDOMAIN 0.249
-score FROM_2_EMAILS_SHORT 1.999
-score FROM_MISSPACED 1.999
-score FROM_MISSP_DYNIP 0.326
+score FROM_2_EMAILS_SHORT 2.000
+score FROM_ADDR_WS 2.526
+score FROM_MISSPACED 2.000
+score FROM_MISSP_DYNIP 1.564
score FROM_MISSP_EH_MATCH 1.999
-score FROM_MISSP_FREEMAIL 2.549
-score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_REPLYTO 1.949
-score FROM_MISSP_TO_UNDISC 0.001
+score FROM_MISSP_FREEMAIL 1.998
+score FROM_MISSP_MSFT 0.546
+score FROM_MISSP_REPLYTO 2.499
+score FROM_MISSP_TO_UNDISC 1.544
score FROM_MISSP_USER 0.001
score FROM_MISSP_XPRIO 0.001
score FROM_NAME_EQ_TO_G_DRIVE 0.001
-score FROM_NTLD_REPLY_FREEMAIL 1.999
-score FROM_SUSPICIOUS_NTLD 0.500
-score FROM_SUSPICIOUS_NTLD_FP 2.000
-score FROM_UNBAL1 3.500
-score FROM_URI 1.684
+score FROM_NTLD_REPLY_FREEMAIL 1.303
+score FROM_SUSPICIOUS_NTLD 0.499
+score FROM_SUSPICIOUS_NTLD_FP 1.999
+score FROM_UNBAL1 2.473
+score FROM_URI 1.718
score FROM_WORDY 0.001
-score FROM_WWW 2.102
+score FROM_WWW 2.069
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FSL_THIS_IS_ADV 2.045
-score GB_BITCOIN_CP 1.248
-score GB_BITCOIN_NH 2.614
-score GB_FREEMAIL_DISPTO 0.499
+score FSL_THIS_IS_ADV 2.163
+score GB_BITCOIN_CP 1.563
+score GB_FREEMAIL_DISPTO 0.500
score GB_GOOGLE_OBFUS 0.749
score HDRS_LCASE 0.100
score HDRS_LCASE_IMGONLY 0.099
score HDR_ORDER_FTSDMCXX_DIRECT 1.999
-score HDR_ORDER_FTSDMCXX_NORDNS 2.600
+score HDR_ORDER_FTSDMCXX_NORDNS 2.601
score HEADER_FROM_DIFFERENT_DOMAINS 0.250
-score HELO_MISC_IP 0.250
+score HELO_MISC_IP 0.249
score HELO_NO_DOMAIN 0.001
-score HK_RANDOM_FROM 0.997
-score HK_RANDOM_REPLYTO 0.999
-score HK_SCAM 1.607
+score HK_RANDOM_FROM 0.950
+score HK_RANDOM_REPLYTO 1.000
+score HK_SCAM 1.569
score HOSTED_IMG_DIRECT_MX 3.499
-score HTML_OFF_PAGE 0.100
-score HTML_SINGLET_MANY 1.388
-score HTML_TEXT_INVISIBLE_FONT 2.897
-score HTML_TEXT_INVISIBLE_STYLE 1.689
-score IMG_ONLY_FM_DOM_INFO 2.199
-score KB_FORGED_MOZ4 4.500
-score KHOP_FAKE_EBAY 0.005
+score HTML_OFF_PAGE 0.102
+score HTML_SINGLET_MANY 0.247
+score HTML_TEXT_INVISIBLE_FONT 2.590
+score HTML_TEXT_INVISIBLE_STYLE 2.251
+score IMG_ONLY_FM_DOM_INFO 1.699
+score KB_FORGED_MOZ4 4.499
+score KHOP_FAKE_EBAY 0.001
score KHOP_HELO_FCRDNS 0.400
-score LH_URI_DOM_IN_PATH 2.699
-score LIST_PRTL_SAME_USER 0.001
-score LONG_HEX_URI 2.200
+score LH_URI_DOM_IN_PATH 2.700
+score LIST_PRTL_SAME_USER 0.001 # force non-zero
+score LONG_HEX_URI 2.249
score LOTS_OF_MONEY 0.010
-score MANY_SPAN_IN_TEXT 2.763
+score MANY_SPAN_IN_TEXT 3.099
score MAY_BE_FORGED 2.699
score MILLION_HUNDRED 0.001
score MIMEOLE_DIRECT_TO_MX 0.001
score MIME_NO_TEXT 0.001
-score MIXED_ES 2.699
-score MONEY_FORM_SHORT 1.692
+score MIXED_ES 2.700
+score MONEY_FORM_SHORT 2.042
score MONEY_FRAUD_3 2.599
-score MONEY_FRAUD_5 2.592
-score MONEY_FRAUD_8 1.882
+score MONEY_FRAUD_5 2.284
+score MONEY_FRAUD_8 2.237
score MONEY_FROM_MISSP 1.999
-score MSM_PRIO_REPTO 2.419
-score NICE_REPLY_A -0.340
-score NORDNS_LOW_CONTRAST 1.786
+score MSM_PRIO_REPTO 2.499
+score NICE_REPLY_A -0.300
+score NORDNS_LOW_CONTRAST 1.887
score NO_FM_NAME_IP_HOSTN 0.001
-score NSL_RCVD_FROM_USER 0.001 # force non-zero
-score NSL_RCVD_HELO_USER 0.103
+score NSL_RCVD_FROM_USER 0.001
+score NSL_RCVD_HELO_USER 1.635
score OFFER_ONLY_AMERICA 1.999
-score PDS_BTC_ID 0.500
-score PDS_BTC_MSGID 0.001
+score PDS_BTC_ID 0.499
+score PDS_BTC_MSGID 0.001 # force non-zero
score PDS_EMPTYSUBJ_URISHRT 1.499
score PDS_FREEMAIL_REPLYTO_URISHRT 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
@@ -118,55 +117,58 @@
score PDS_SHORTFWD_URISHRT 1.500
score PDS_TINYSUBJ_URISHRT 1.499
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
-score PDS_TO_EQ_FROM_NAME 0.001 # force non-zero
+score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 2.000
+score PDS_TONAME_EQ_TOLOCAL_VSHORT 1.000
+score PDS_TO_EQ_FROM_NAME 0.001
+score PHP_ORIG_SCRIPT 2.499
score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RATWARE_NO_RDNS 0.700
+score RATWARE_NO_RDNS 2.131
score RISK_FREE 2.999
score SENDGRID_REDIR 1.999
-score SENDGRID_REDIR_PHISH 2.816
-score SERGIO_SUBJECT_VIAGRA01 2.869
+score SENDGRID_REDIR_PHISH 3.226
+score SERGIO_SUBJECT_VIAGRA01 2.870
score SHORTENED_URL_SRC 2.999
-score SHORTENER_SHORT_IMG 0.001
-score SHORT_BODY_G_DRIVE_DYN 0.383
+score SHORTENER_SHORT_IMG 1.022
+score SHORT_BODY_G_DRIVE_DYN 1.096
score SHORT_SHORTNER 1.999
-score SHORT_URL 2.348
+score SHORT_URL 2.317
score SINGLETS_LOW_CONTRAST 0.001
score SPOOFED_FREEMAIL_NO_RDNS 1.499
score STATIC_XPRIO_OLE 1.999
-score STOCK_LOW_CONTRAST 2.499
-score STOX_BOUND_090909_B 1.976
+score STOCK_LOW_CONTRAST 2.500
+score STOX_BOUND_090909_B 1.932
score SUBJ_OBFU_PUNCT_FEW 0.001
-score SUBJ_OBFU_PUNCT_MANY 1.749
+score SUBJ_OBFU_PUNCT_MANY 1.750
score SUSP_UTF8_WORD_COMBO 0.001
-score SUSP_UTF8_WORD_FROM 1.999
+score SUSP_UTF8_WORD_FROM 2.000
score SUSP_UTF8_WORD_SUBJ 1.999
-score THIS_AD 1.300
+score THIS_AD 1.299
score THIS_IS_ADV_SUSP_NTLD 0.001
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.500
score TO_EQ_FM_DOM_HTML_IMG 0.001
-score TO_EQ_FM_DOM_HTML_ONLY 1.517
-score TO_EQ_FM_HTML_ONLY 0.320
-score TO_IN_SUBJ 0.100
+score TO_EQ_FM_DOM_HTML_ONLY 1.436
+score TO_EQ_FM_HTML_ONLY 0.431
+score TO_IN_SUBJ 0.099
score TO_NO_BRKTS_FROM_MSSP 2.499
score TO_NO_BRKTS_HTML_ONLY 1.999
score TO_NO_BRKTS_MSFT 2.499
score TO_NO_BRKTS_NORDNS_HTML 1.999
score TVD_RCVD_SPACE_BRACKET 4.299
-score TVD_SPACE_ENCODED 1.111
-score TVD_SPACE_RATIO_MINFP 1.601
-score UPGRADE_MAILBOX 1.267
+score TVD_SPACE_ENCODED 0.610
+score TVD_SPACE_RATIO_MINFP 1.648
+score UPGRADE_MAILBOX 1.273
score URI_DOTEDU 1.999
-score URI_DOTEDU_ENTITY 2.925
+score URI_DOTEDU_ENTITY 2.999
score URI_DOTEDU_LONG 2.287
-score URI_GOOGLE_PROXY 0.105
-score URI_IMG_WP_REDIR 2.890
-score URI_IN_URI_10 2.051
-score URI_IN_URI_5 2.439
+score URI_GOOGLE_PROXY 0.108
+score URI_IMG_WP_REDIR 2.649
+score URI_IN_URI_10 2.207
+score URI_IN_URI_5 2.440
score URI_ONLY_MSGID_MALF 1.999
-score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 1.936
+score URI_PHISH 2.248
+score URI_PHP_REDIR 3.500
+score URI_TRY_3LD 1.938
+score URI_WPADMIN 2.799
score URI_WP_DIRINDEX 3.499
score URI_WP_HACKED 3.499
score URI_WP_HACKED_2 2.499
@@ -195,6 +197,7 @@
score BITCOIN_SPAM_03 1.000
score BITCOIN_SPAM_06 1.000
score BITCOIN_SPAM_07 1.000
+score BITCOIN_SPAM_08 1.000
score BITCOIN_SPAM_09 1.000
score BITCOIN_SPAM_10 1.000
score BITCOIN_SPAM_11 1.000
@@ -217,10 +220,10 @@
score FORM_LOW_CONTRAST 1.000
score FREEM_FRNUM_UNICD_EMPTY 1.000
score FRNAME_IN_MSG_XPRIO_NO_SUB 1.000
-score FROM_ADDR_WS 1.000
score FROM_NTLD_LINKBAIT 1.000
score FROM_WORDY_SHORT 1.000
score GAPPY_SALES_LEADS_FREEM 1.000
+score GB_BITCOIN_NH 1.000
score GB_FORGED_MUA_POSTFIX 1.000
score GB_FREEMAIL_DISPTO_NOTFREEM 0.500
score GB_GOOGLE_OBFUR 0.750
@@ -256,7 +259,6 @@
score OBFU_BITCOIN 1.000
score PHOTO_EDITING_DIRECT 1.000
score PHP_NOVER_MUA 1.000
-score PHP_ORIG_SCRIPT 1.000
score PHP_SCRIPT_MUA 1.000
score PP_TOO_MUCH_UNICODE02 0.500
score PP_TOO_MUCH_UNICODE05 1.000
@@ -283,11 +285,9 @@
score URI_DATA 1.000
score URI_HEX_IP 1.000
score URI_OPTOUT_3LD 1.000
-score URI_PHISH 1.000
score USB_DRIVES 1.000
score VPS_NO_NTLD 1.000
score WALMART_IMG_NOT_RCVD_WAL 1.000
-score XPRIO_URL_SHORTNER 1.000
# in active.list but have no hits in recent corpus
score BITCOIN_SPAM_05 0.001 # force non-zero
score BITCOIN_SPF_ONLYALL 0.001 # force non-zero
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index 4e821d9..5c7efa0 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -3,193 +3,192 @@
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001 # force non-zero
-score AC_FROM_MANY_DOTS 2.294
+score AC_FROM_MANY_DOTS 1.251
score AC_HTML_NONSENSE_TAGS 1.999
score AC_POST_EXTRAS 0.001
-score ADMITS_SPAM 0.532
-score ADVANCE_FEE_2_NEW_MONEY 1.617
+score ADMITS_SPAM 0.543
+score ADVANCE_FEE_2_NEW_MONEY 1.999
score ADVANCE_FEE_3_NEW 3.499
score ADVANCE_FEE_3_NEW_MONEY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 2.399
-score ADVANCE_FEE_5_NEW 2.398
+score ADVANCE_FEE_4_NEW_MONEY 1.989
+score ADVANCE_FEE_5_NEW 2.599
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
-score AXB_XMAILER_MIMEOLE_OL_024C2 3.529
-score BITCOIN_EXTORT_01 4.212
-score BITCOIN_MALF_HTML 3.500
-score BITCOIN_SPAM_02 0.221
-score BITCOIN_SPAM_05 1.906
-score BITCOIN_SPAM_08 1.026
-score BITCOIN_SPAM_09 1.214
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 # force non-zero
+score BITCOIN_EXTORT_01 3.826
+score BITCOIN_MALF_HTML 3.499
+score BITCOIN_SPAM_02 1.968
+score BITCOIN_SPAM_05 1.662
+score BITCOIN_SPAM_08 1.308
+score BITCOIN_SPAM_09 0.975
score BODY_URI_ONLY 0.999
-score BOGUS_MIME_VERSION 1.761
+score BOGUS_MIME_VERSION 1.763
score CK_HELO_DYNAMIC_SPLIT_IP 0.001
-score CK_HELO_GENERIC 0.001 # force non-zero
+score CK_HELO_GENERIC 0.001
score CTE_8BIT_MISMATCH 0.999
-score CTYPE_NULL 2.400
+score CTYPE_NULL 1.500
score DKIMWL_BL 2.999
-score DKIMWL_WL_HIGH -2.999
+score DKIMWL_WL_HIGH -2.996
score DKIMWL_WL_MED -0.001
-score DOTGOV_IMAGE 0.159
-score DSN_NO_MIMEVERSION 1.999
+score DOTGOV_IMAGE 1.468
+score DSN_NO_MIMEVERSION 2.000
score DX_TEXT_03 0.199
score END_FUTURE_EMAILS 2.499
-score FILL_THIS_FORM 1.094
+score FILL_THIS_FORM 0.526
score FONT_INVIS_DIRECT 0.001
-score FONT_INVIS_DOTGOV 0.001
+score FONT_INVIS_DOTGOV 0.372
score FONT_INVIS_LONG_LINE 0.001 # force non-zero
score FONT_INVIS_MSGID 0.001
-score FONT_INVIS_POSTEXTRAS 2.982
-score FORGED_RELAY_MUA_TO_MX 3.693
-score FORGED_SPF_HELO 0.939
-score FORM_FRAUD 0.999
-score FORM_FRAUD_5 2.700
+score FONT_INVIS_POSTEXTRAS 1.898
+score FORGED_RELAY_MUA_TO_MX 3.709
+score FORGED_SPF_HELO 0.941
+score FORM_FRAUD 0.001 # force non-zero
+score FORM_FRAUD_5 2.699
score FOUND_YOU 3.249
score FREEMAIL_FORGED_FROMDOMAIN 0.249
score FROM_2_EMAILS_SHORT 1.999
score FROM_ADDR_WS 2.999
-score FROM_FMBLA_NEWDOM 1.499
+score FROM_FMBLA_NEWDOM 1.498
score FROM_FMBLA_NEWDOM14 0.999
score FROM_FMBLA_NEWDOM28 0.799
-score FROM_GOV_DKIM_AU -0.453
+score FROM_GOV_DKIM_AU -0.448
score FROM_GOV_SPOOF 0.999
-score FROM_MISSPACED 1.073
-score FROM_MISSP_DYNIP 1.533
-score FROM_MISSP_EH_MATCH 1.551
-score FROM_MISSP_FREEMAIL 1.143
-score FROM_MISSP_MSFT 2.155
-score FROM_MISSP_REPLYTO 2.499
+score FROM_MISSPACED 0.001
+score FROM_MISSP_DYNIP 2.599
+score FROM_MISSP_EH_MATCH 0.001
+score FROM_MISSP_FREEMAIL 1.131
+score FROM_MISSP_MSFT 0.001
+score FROM_MISSP_REPLYTO 0.112
score FROM_MISSP_SPF_FAIL 1.999
-score FROM_MISSP_USER 0.381
-score FROM_MISSP_XPRIO 2.499
-score FROM_NAME_EQ_TO_G_DRIVE 0.922
-score FROM_NTLD_REPLY_FREEMAIL 1.973
-score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_URI 2.126
-score FROM_WORDY 1.072
-score FROM_WWW 1.303
-score FSL_BULK_SIG 0.001 # force non-zero
-score FSL_CTYPE_WIN1251 2.983
-score FSL_NEW_HELO_USER 1.999
-score FSL_THIS_IS_ADV 0.497
-score GB_BITCOIN_CP 2.307
-score GB_BITCOIN_NH 2.774
-score GB_FREEMAIL_DISPTO 0.001
-score GB_GOOGLE_OBFUS 0.749
+score FROM_MISSP_USER 0.001
+score FROM_MISSP_XPRIO 0.001
+score FROM_NAME_EQ_TO_G_DRIVE 0.882
+score FROM_NTLD_REPLY_FREEMAIL 0.768
+score FROM_SUSPICIOUS_NTLD 0.498
+score FROM_SUSPICIOUS_NTLD_FP 1.997
+score FROM_URI 1.698
+score FROM_WORDY 2.113
+score FROM_WWW 1.335
+score FSL_BULK_SIG 0.001
+score FSL_CTYPE_WIN1251 0.001 # force non-zero
+score FSL_NEW_HELO_USER 0.001 # force non-zero
+score FSL_THIS_IS_ADV 0.105
+score GB_BITCOIN_CP 1.723
+score GB_BITCOIN_NH 0.848
+score GB_FREEMAIL_DISPTO 0.001 # force non-zero
+score GB_GOOGLE_OBFUS 0.750
score HDRS_LCASE 0.099
score HDRS_LCASE_IMGONLY 0.099
-score HDR_ORDER_FTSDMCXX_DIRECT 1.728
-score HDR_ORDER_FTSDMCXX_NORDNS 3.297
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250
-score HELO_MISC_IP 0.001 # force non-zero
-score HELO_NO_DOMAIN 0.001
-score HK_RANDOM_FROM 1.000
+score HDR_ORDER_FTSDMCXX_DIRECT 0.888
+score HDR_ORDER_FTSDMCXX_NORDNS 3.165
+score HEADER_FROM_DIFFERENT_DOMAINS 0.248
+score HELO_MISC_IP 0.001
+score HELO_NO_DOMAIN 0.001 # force non-zero
+score HK_RANDOM_FROM 0.997
score HK_RANDOM_REPLYTO 0.001
-score HK_SCAM 1.035
-score HOSTED_IMG_DIRECT_MX 1.546
-score HTML_OFF_PAGE 1.072
-score HTML_SINGLET_MANY 1.155
-score HTML_TEXT_INVISIBLE_FONT 2.196
-score HTML_TEXT_INVISIBLE_STYLE 1.590
-score IMG_ONLY_FM_DOM_INFO 2.447
-score KB_FORGED_MOZ4 3.994
-score KHOP_FAKE_EBAY 0.899
-score KHOP_HELO_FCRDNS 0.400
-score LH_URI_DOM_IN_PATH 1.420
-score LIST_PRTL_SAME_USER 0.750
+score HK_SCAM 1.022
+score HOSTED_IMG_DIRECT_MX 1.608
+score HTML_OFF_PAGE 1.043
+score HTML_SINGLET_MANY 2.499
+score HTML_TEXT_INVISIBLE_FONT 1.564
+score HTML_TEXT_INVISIBLE_STYLE 1.973
+score IMG_ONLY_FM_DOM_INFO 2.499
+score KB_FORGED_MOZ4 4.499
+score KHOP_FAKE_EBAY 0.120
+score KHOP_HELO_FCRDNS 0.399
+score LH_URI_DOM_IN_PATH 1.812
+score LIST_PRTL_SAME_USER 0.609
score LONG_HEX_URI 0.001
score LONG_IMG_URI 0.001
score LOTS_OF_MONEY 0.010
-score MANY_SPAN_IN_TEXT 2.799
-score MILLION_HUNDRED 0.001 # force non-zero
-score MIMEOLE_DIRECT_TO_MX 1.094
+score MANY_SPAN_IN_TEXT 1.892
+score MILLION_HUNDRED 0.511
+score MIMEOLE_DIRECT_TO_MX 1.717
score MIME_NO_TEXT 0.001
-score MIXED_ES 0.001
+score MIXED_ES 0.924
score MONEY_FORM_SHORT 0.001
-score MONEY_FRAUD_3 2.297
-score MONEY_FRAUD_5 0.486
-score MONEY_FRAUD_8 0.001
-score MONEY_FROM_MISSP 1.999
-score MSM_PRIO_REPTO 0.994
-score NICE_REPLY_A -1.869
+score MONEY_FRAUD_3 1.896
+score MONEY_FRAUD_5 0.478
+score MONEY_FRAUD_8 0.538
+score MONEY_FROM_MISSP 1.006
+score MSM_PRIO_REPTO 2.308
+score NICE_REPLY_A -0.001
score NORDNS_LOW_CONTRAST 0.910
-score NO_FM_NAME_IP_HOSTN 0.001 # force non-zero
-score NSL_RCVD_FROM_USER 0.284
-score NSL_RCVD_HELO_USER 0.001
-score OFFER_ONLY_AMERICA 1.078
-score PDS_BTC_ID 0.500
+score NO_FM_NAME_IP_HOSTN 0.001
+score NSL_RCVD_FROM_USER 0.001
+score NSL_RCVD_HELO_USER 0.438
+score OFFER_ONLY_AMERICA 0.001 # force non-zero
+score PDS_BTC_ID 0.499
score PDS_BTC_MSGID 0.999
-score PDS_EMPTYSUBJ_URISHRT 0.225
+score PDS_EMPTYSUBJ_URISHRT 0.224
score PDS_FREEMAIL_REPLYTO_URISHRT 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 1.049
+score PDS_FROM_2_EMAILS 1.048
score PDS_FROM_NAME_TO_DOMAIN 0.999
score PDS_NAKED_TO_NUMERO 1.999
-score PDS_SHORTFWD_URISHRT 1.296
+score PDS_SHORTFWD_URISHRT 1.500
score PDS_TINYSUBJ_URISHRT 0.001
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.071
+score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
-score PDS_TO_EQ_FROM_NAME 3.399
-score PP_MIME_FAKE_ASCII_TEXT 0.111
-score RATWARE_NO_RDNS 1.283
+score PDS_TO_EQ_FROM_NAME 1.679
+score PP_MIME_FAKE_ASCII_TEXT 0.108
+score RATWARE_NO_RDNS 2.770
score RCVD_DOTEDU_SHORT 2.499
-score RCVD_DOTEDU_SUSP_URI 2.999
+score RCVD_DOTEDU_SUSP_URI 0.001
score RCVD_IN_MSPIKE_H2 -0.001
-score RDNS_NUM_TLD_XM 2.999
+score RDNS_NUM_TLD_XM 0.001
score RISK_FREE 2.599
-score SENDGRID_REDIR 2.569
-score SERGIO_SUBJECT_VIAGRA01 3.600
-score SHORTENED_URL_SRC 3.999
-score SHORTENER_SHORT_IMG 1.484
+score SENDGRID_REDIR 2.396
+score SERGIO_SUBJECT_VIAGRA01 3.599
+score SHORTENED_URL_SRC 3.899
+score SHORTENER_SHORT_IMG 1.273
score SHORT_SHORTNER 1.999
-score SHORT_URL 1.210
+score SHORT_URL 0.933
score SINGLETS_LOW_CONTRAST 0.001
-score SPOOFED_FREEMAIL 1.999
+score SPOOFED_FREEMAIL 1.997
score SPOOFED_FREEMAIL_NO_RDNS 0.001
-score SPOOFED_FREEM_REPTO 0.672
-score SPOOFED_FREEM_REPTO_CHN 3.022
+score SPOOFED_FREEM_REPTO 1.791
+score SPOOFED_FREEM_REPTO_CHN 1.828
score STATIC_XPRIO_OLE 1.999
score STOCK_LOW_CONTRAST 0.001
-score STOX_BOUND_090909_B 2.495
-score SUBJ_OBFU_PUNCT_FEW 0.133
-score SUBJ_OBFU_PUNCT_MANY 0.226
-score SUSP_UTF8_WORD_COMBO 3.000
+score STOX_BOUND_090909_B 2.485
+score SUBJ_OBFU_PUNCT_FEW 0.001
+score SUBJ_OBFU_PUNCT_MANY 0.344
+score SUSP_UTF8_WORD_COMBO 2.999
score SUSP_UTF8_WORD_FROM 1.999
score SUSP_UTF8_WORD_SUBJ 1.999
score THIS_AD 0.799
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 0.378
-score TO_EQ_FM_DOM_HTML_IMG 0.173
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 0.560
+score TO_EQ_FM_DOM_HTML_IMG 0.025
score TO_EQ_FM_DOM_HTML_ONLY 1.799
score TO_EQ_FM_DOM_SPF_FAIL 0.001
-score TO_EQ_FM_HTML_ONLY 0.965
+score TO_EQ_FM_HTML_ONLY 1.526
score TO_EQ_FM_SPF_FAIL 0.001
score TO_IN_SUBJ 0.100
-score TO_NO_BRKTS_FROM_MSSP 2.499
-score TO_NO_BRKTS_HTML_IMG 0.099
+score TO_NO_BRKTS_FROM_MSSP 2.497
+score TO_NO_BRKTS_HTML_IMG 1.999
score TO_NO_BRKTS_HTML_ONLY 1.999
-score TO_NO_BRKTS_MSFT 2.500
+score TO_NO_BRKTS_MSFT 1.214
score TO_NO_BRKTS_NORDNS_HTML 1.999
-score TO_NO_BRKTS_PCNT 2.398
-score TVD_RCVD_SPACE_BRACKET 4.027
+score TO_NO_BRKTS_PCNT 2.499
+score TVD_RCVD_SPACE_BRACKET 4.006
score TVD_SPACE_ENCODED 2.499
-score TVD_SPACE_RATIO_MINFP 1.486
+score TVD_SPACE_RATIO_MINFP 1.619
score UPGRADE_MAILBOX 0.001
-score URI_DOTEDU 0.001 # force non-zero
-score URI_DOTEDU_ENTITY 2.115
-score URI_GOOGLE_PROXY 0.632
+score URI_DOTEDU 0.001
+score URI_DOTEDU_ENTITY 2.142
+score URI_GOOGLE_PROXY 0.635
score URI_IMG_WP_REDIR 2.999
-score URI_IN_URI_10 1.229
-score URI_IN_URI_5 3.464
-score URI_ONLY_MSGID_MALF 0.001 # force non-zero
+score URI_IN_URI_10 3.373
+score URI_IN_URI_5 2.518
+score URI_ONLY_MSGID_MALF 0.001
score URI_PHISH 3.999
-score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 1.999
-score URI_WP_DIRINDEX 2.596
+score URI_PHP_REDIR 3.496
+score URI_TRY_3LD 1.997
+score URI_WP_DIRINDEX 2.181
score URI_WP_HACKED 3.499
-score URI_WP_HACKED_2 1.598
-score XPRIO_SHORT_SUBJ 2.422
-score XPRIO_URL_SHORTNER 0.999
+score URI_WP_HACKED_2 1.596
+score XPRIO_SHORT_SUBJ 2.499
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
score AC_SPAMMY_URI_PATTERNS11 1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index 5037296..5d17272 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: 853184 42.868% (99.634% of non-spam corpus)
-# Correctly spam: 955718 48.019% (84.281% of spam corpus)
-# False positives: 3132 0.157% (0.366% of nonspam, 133150 weighted)
-# False negatives: 178246 8.956% (15.719% of spam, 444494 weighted)
-# Average score for spam: 9.4 nonspam: 0.5
-# Average for false-pos: 6.4 false-neg: 2.5
-# TOTAL: 1990280 100.00%
+# Correctly non-spam: 852442 44.014% (99.671% of non-spam corpus)
+# Correctly spam: 909540 46.962% (84.099% of spam corpus)
+# False positives: 2810 0.145% (0.329% of nonspam, 108817 weighted)
+# False negatives: 171967 8.879% (15.901% of spam, 415436 weighted)
+# Average score for spam: 9.1 nonspam: 0.5
+# Average for false-pos: 6.1 false-neg: 2.4
+# TOTAL: 1936759 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 106292 99.50%
-# Correctly spam: 119421 84.38%
-# False positives: 533 0.50%
-# False negatives: 22105 15.62%
-# TCR(l=50): 2.902800 SpamRecall: 84.381% SpamPrec: 99.556%
+# Correctly non-spam: 106261 99.60%
+# Correctly spam: 113873 84.41%
+# False positives: 425 0.40%
+# False negatives: 21036 15.59%
+# TCR(l=50): 3.190394 SpamRecall: 84.407% SpamPrec: 99.628%
##### 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: 847307 98.95%
-# Correctly spam: 379157 33.44%
-# False positives: 9009 1.05%
-# False negatives: 754807 66.56%
-# TCR(l=50): 0.940848 SpamRecall: 33.436% SpamPrec: 97.679%
+# Correctly non-spam: 846513 98.98%
+# Correctly spam: 359731 33.26%
+# False positives: 8739 1.02%
+# False negatives: 721776 66.74%
+# TCR(l=50): 0.933359 SpamRecall: 33.262% SpamPrec: 97.628%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 105699 98.95%
-# Correctly spam: 47353 33.46%
-# False positives: 1126 1.05%
-# False negatives: 94173 66.54%
-# TCR(l=50): 0.940541 SpamRecall: 33.459% SpamPrec: 97.677%
+# Correctly non-spam: 105540 98.93%
+# Correctly spam: 45204 33.51%
+# False positives: 1146 1.07%
+# False negatives: 89705 66.49%
+# TCR(l=50): 0.917717 SpamRecall: 33.507% SpamPrec: 97.528%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index 24dc2a8..7c177dc 100644
--- a/rulesrc/scores/stats-set1
+++ b/rulesrc/scores/stats-set1
@@ -1,40 +1,40 @@
##### WITH NEW RULES AND SCORES #####
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 185354 13.488% (99.202% of non-spam corpus)
-# Correctly spam: 1123152 81.730% (94.590% of spam corpus)
-# False positives: 1491 0.108% (0.798% of nonspam, 781931 weighted)
-# False negatives: 64233 4.674% (5.410% of spam, 130770 weighted)
-# Average score for spam: 16.2 nonspam: -1.1
-# Average for false-pos: 8.3 false-neg: 2.0
-# TOTAL: 1374230 100.00%
+# Correctly non-spam: 185340 13.487% (99.201% of non-spam corpus)
+# Correctly spam: 1119205 81.446% (94.262% of spam corpus)
+# False positives: 1493 0.109% (0.799% of nonspam, 788248 weighted)
+# False negatives: 68134 4.958% (5.738% of spam, 150312 weighted)
+# Average score for spam: 16.8 nonspam: -1.0
+# Average for false-pos: 8.3 false-neg: 2.2
+# TOTAL: 1374172 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 23268 99.21%
-# Correctly spam: 140297 94.59%
-# False positives: 186 0.79%
-# False negatives: 8021 5.41%
-# TCR(l=50): 8.562901 SpamRecall: 94.592% SpamPrec: 99.868%
+# Correctly non-spam: 23266 99.20%
+# Correctly spam: 140303 94.60%
+# False positives: 187 0.80%
+# False negatives: 8012 5.40%
+# TCR(l=50): 8.542507 SpamRecall: 94.598% SpamPrec: 99.867%
##### 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: 184435 98.71%
-# Correctly spam: 721961 60.80%
-# False positives: 2410 1.29%
-# False negatives: 465424 39.20%
-# TCR(l=50): 2.026517 SpamRecall: 60.803% SpamPrec: 99.667%
+# Correctly non-spam: 184387 98.69%
+# Correctly spam: 721788 60.79%
+# False positives: 2446 1.31%
+# False negatives: 465551 39.21%
+# TCR(l=50): 2.019796 SpamRecall: 60.790% SpamPrec: 99.662%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 23169 98.78%
-# Correctly spam: 90262 60.86%
-# False positives: 285 1.22%
-# False negatives: 58056 39.14%
-# TCR(l=50): 2.051254 SpamRecall: 60.857% SpamPrec: 99.685%
+# Correctly non-spam: 23188 98.87%
+# Correctly spam: 90335 60.91%
+# False positives: 265 1.13%
+# False negatives: 57980 39.09%
+# TCR(l=50): 2.082199 SpamRecall: 60.908% SpamPrec: 99.708%
