updated scores for revision 1888502 active rules added since last mass-check
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1888540 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index 9b205f9..d608c92 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf
@@ -13,40 +13,40 @@
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 4.200 4.062 4.200 4.062
+score ADMITS_SPAM 4.199 4.064 4.199 4.064
score ADVANCE_FEE_2_NEW_FORM 1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_FRM_MNY 1.536 2.499 1.536 2.499
+score ADVANCE_FEE_2_NEW_FRM_MNY 2.499 2.499 2.499 2.499
score ADVANCE_FEE_2_NEW_MONEY 1.999 0.001 1.999 0.001
-score ADVANCE_FEE_3_NEW 3.499 0.001 3.499 0.001
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.001 0.809 0.001 0.809
-score ADVANCE_FEE_3_NEW_MONEY 2.492 2.491 2.492 2.491
-score ADVANCE_FEE_4_NEW 2.699 2.518 2.699 2.518
-score ADVANCE_FEE_4_NEW_FRM_MNY 0.001 1.262 0.001 1.262
-score ADVANCE_FEE_4_NEW_MONEY 0.244 0.001 0.244 0.001
+score ADVANCE_FEE_3_NEW 3.500 0.001 3.500 0.001
+score ADVANCE_FEE_3_NEW_FRM_MNY 1.608 0.894 1.608 0.894
+score ADVANCE_FEE_3_NEW_MONEY 2.504 2.491 2.504 2.491
+score ADVANCE_FEE_4_NEW 2.699 2.517 2.699 2.517
+score ADVANCE_FEE_4_NEW_FRM_MNY 0.001 1.544 0.001 1.544
+score ADVANCE_FEE_4_NEW_MONEY 0.248 0.001 0.248 0.001
score ADVANCE_FEE_5_NEW 2.499 2.699 2.499 2.699
-score ADVANCE_FEE_5_NEW_FRM_MNY 0.001 0.001 0.001 0.001
+score ADVANCE_FEE_5_NEW_FRM_MNY 2.033 0.001 2.033 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001 0.001 0.001 0.001
score AD_PREFS 0.250 0.250 0.250 0.250
-score ALIBABA_IMG_NOT_RCVD_ALI 1.073 2.499 1.073 2.499
+score ALIBABA_IMG_NOT_RCVD_ALI 2.499 2.499 2.499 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.226 1.999 1.226 1.999
+score APP_DEVELOPMENT_NORDNS 1.221 1.999 1.221 1.999
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 0.001 0.001 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.367 1.046 1.367 1.046
-score BIGNUM_EMAILS_FREEM 2.999 1.118 2.999 1.118
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.588 1.399 1.588 1.399
+score BIGNUM_EMAILS_FREEM 2.999 1.500 2.999 1.500
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 1.702 2.999 1.702 2.999
-score BITCOIN_EXTORT_01 1.691 1.373 1.691 1.373
+score BITCOIN_DEADLINE 1.664 2.999 1.664 2.999
+score BITCOIN_EXTORT_01 1.700 0.999 1.700 0.999
score BITCOIN_EXTORT_02 1.000 1.000 1.000 1.000
-score BITCOIN_IMGUR 2.998 3.304 2.998 3.304
-score BITCOIN_MALF_HTML 3.499 3.499 3.499 3.499
-score BITCOIN_MALWARE 2.798 0.001 2.798 0.001
+score BITCOIN_IMGUR 2.508 2.043 2.508 2.043
+score BITCOIN_MALF_HTML 3.499 3.500 3.499 3.500
+score BITCOIN_MALWARE 2.837 0.001 2.837 0.001
score BITCOIN_OBFU_SUBJ 1.000 1.000 1.000 1.000
score BITCOIN_ONAN 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.971 0.343 1.971 0.343
+score BITCOIN_SPAM_02 1.742 1.451 1.742 1.451
score BITCOIN_SPAM_03 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_04 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_05 0.001 0.001 0.001 0.001
@@ -58,24 +58,23 @@
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 2.499 1.006 2.499 1.006
-score BITCOIN_YOUR_INFO 1.000 2.999 1.000 2.999
-score BODY_SINGLE_URI 0.735 0.001 0.735 0.001
-score BODY_SINGLE_WORD 0.243 0.001 0.243 0.001
-score BODY_URI_ONLY 1.806 1.569 1.806 1.569
-score BOGUS_MIME_VERSION 3.499 3.180 3.499 3.180
+score BITCOIN_XPRIO 2.499 1.004 2.499 1.004
+score BITCOIN_YOUR_INFO 2.512 2.999 2.512 2.999
+score BODY_SINGLE_URI 2.499 0.001 2.499 0.001
+score BODY_SINGLE_WORD 0.244 0.001 0.244 0.001
+score BODY_URI_ONLY 1.956 1.570 1.956 1.570
+score BOGUS_MIME_VERSION 3.499 3.181 3.499 3.181
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 0.999 1.000 0.999
+score BULK_RE_SUSP_NTLD 0.999 0.999 0.999 0.999
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 COMMENT_GIBBERISH 1.000 1.000 1.000 1.000
-score COMPENSATION 1.000 1.000 1.000 1.000
-score CONTENT_AFTER_HTML 2.499 2.499 2.499 2.499
-score CTE_8BIT_MISMATCH 1.000 0.999 1.000 0.999
-score DATE_IN_FUTURE_96_Q 2.398 2.499 2.398 2.499
+score COMPENSATION 1.499 1.000 1.499 1.000
+score CONTENT_AFTER_HTML 2.500 2.499 2.500 2.499
+score CTE_8BIT_MISMATCH 0.999 0.999 0.999 0.999
+score DATE_IN_FUTURE_96_Q 2.499 2.499 2.499 2.499
score DAY_I_EARNED 1.000 1.000 1.000 1.000
score DEAR_BENEFICIARY 0.001 0.001 0.001 0.001
score DKIMWL_BL 0.001 2.999 0.001 2.999
@@ -86,28 +85,28 @@
score DOTGOV_IMAGE 1.000 1.000 1.000 1.000
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.596 2.475 2.596 2.475
+score EBAY_IMG_NOT_RCVD_EBAY 2.546 2.182 2.546 2.182
score ENCRYPTED_MESSAGE -1.000 -1.000 -1.000 -1.000
-score END_FUTURE_EMAILS 2.098 1.818 2.098 1.818
+score END_FUTURE_EMAILS 2.098 1.815 2.098 1.815
score ENVFROM_GOOG_TRIX 1.000 1.000 1.000 1.000
-score FAKE_REPLY_A1 4.099 3.761 4.099 3.761
-score FAKE_REPLY_B 3.999 3.899 3.999 3.899
+score FAKE_REPLY_A1 3.966 3.674 3.966 3.674
+score FAKE_REPLY_B 3.999 2.244 3.999 2.244
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 0.001 1.199 0.001
-score FONT_INVIS_DIRECT 1.531 3.118 1.531 3.118
+score FONT_INVIS_DIRECT 2.209 3.499 2.209 3.499
score FONT_INVIS_DOTGOV 1.000 1.000 1.000 1.000
score FONT_INVIS_HTML_NOHTML 2.999 2.999 2.999 2.999
-score FONT_INVIS_LONG_LINE 2.999 1.000 2.999 1.000
-score FONT_INVIS_MSGID 2.499 1.293 2.499 1.293
-score FONT_INVIS_NORDNS 2.500 2.499 2.500 2.499
-score FONT_INVIS_POSTEXTRAS 3.179 1.000 3.179 1.000
+score FONT_INVIS_LONG_LINE 2.313 1.000 2.313 1.000
+score FONT_INVIS_MSGID 2.499 1.285 2.499 1.285
+score FONT_INVIS_NORDNS 2.499 2.500 2.499 2.500
+score FONT_INVIS_POSTEXTRAS 3.176 1.000 3.176 1.000
score FORM_FRAUD 0.999 0.999 0.999 0.999
score FORM_FRAUD_3 0.001 0.001 0.001 0.001
score FORM_FRAUD_5 0.001 0.001 0.001 0.001
score FORM_LOW_CONTRAST 1.000 1.000 1.000 1.000
-score FOUND_YOU 1.000 3.249 1.000 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.249 0.250 0.249 0.250
+score FOUND_YOU 3.249 3.250 3.249 3.250
+score FREEMAIL_FORGED_FROMDOMAIN 0.250 0.250 0.250 0.250
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 2.999 2.999 2.999 2.999
@@ -119,34 +118,34 @@
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.999 0.001 0.999
-score FROM_MISSPACED 1.141 0.001 1.141 0.001
-score FROM_MISSP_DYNIP 0.001 2.500 0.001 2.500
+score FROM_GOV_SPOOF 0.001 1.000 0.001 1.000
+score FROM_MISSPACED 0.001 0.001 0.001 0.001
+score FROM_MISSP_DYNIP 0.001 2.499 0.001 2.499
score FROM_MISSP_EH_MATCH 0.001 0.001 0.001 0.001
-score FROM_MISSP_FREEMAIL 0.001 0.001 0.001 0.001
+score FROM_MISSP_FREEMAIL 1.566 0.001 1.566 0.001
score FROM_MISSP_MSFT 0.001 0.001 0.001 0.001
-score FROM_MISSP_REPLYTO 1.801 0.001 1.801 0.001
+score FROM_MISSP_REPLYTO 1.802 0.001 1.802 0.001
score FROM_MISSP_SPF_FAIL 0.001 0.001 0.001 0.001
-score FROM_MISSP_TO_UNDISC 1.185 1.791 1.185 1.791
+score FROM_MISSP_TO_UNDISC 0.001 1.771 0.001 1.771
score FROM_MISSP_USER 0.001 0.001 0.001 0.001
-score FROM_MULTI_NORDNS 0.354 3.013 0.354 3.013
+score FROM_MULTI_NORDNS 0.347 3.939 0.347 3.939
score FROM_NEWDOM_BTC 0.001 1.000 0.001 1.000
-score FROM_NTLD_LINKBAIT 0.510 0.001 0.510 0.001
-score FROM_NTLD_REPLY_FREEMAIL 1.358 1.579 1.358 1.579
+score FROM_NTLD_LINKBAIT 0.903 0.542 0.903 0.542
+score FROM_NTLD_REPLY_FREEMAIL 1.999 1.999 1.999 1.999
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 1.599 0.001 1.599
-score FROM_SUSPICIOUS_NTLD 0.499 0.500 0.499 0.500
-score FROM_SUSPICIOUS_NTLD_FP 2.000 0.421 2.000 0.421
+score FROM_SUSPICIOUS_NTLD 0.499 0.499 0.499 0.499
+score FROM_SUSPICIOUS_NTLD_FP 1.999 0.402 1.999 0.402
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.700 2.499 2.700 2.499
-score FUZZY_BITCOIN 2.399 0.061 2.399 0.061
+score FUZZY_AMAZON 2.699 2.499 2.699 2.499
+score FUZZY_BITCOIN 2.399 0.012 2.399 0.012
score GAPPY_SALES_LEADS_FREEM 1.000 1.000 1.000 1.000
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.486 0.499 0.486 0.499
+score GB_FREEMAIL_DISPTO 0.499 0.499 0.499 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
@@ -154,60 +153,59 @@
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.602 2.648 2.602 2.648
-score GOOG_STO_HTML_PHISH 2.212 1.224 2.212 1.224
+score GOOG_REDIR_NORDNS 2.601 2.651 2.601 2.651
+score GOOG_STO_HTML_PHISH 2.644 1.395 2.644 1.395
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 2.499 2.499 2.499 2.499
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 2.963 1.934 2.963 1.934
-score HDRS_LCASE 0.099 0.099 0.099 0.099
-score HDRS_LCASE_IMGONLY 0.099 0.099 0.099 0.099
-score HDRS_MISSP 2.499 0.924 2.499 0.924
-score HDR_ORDER_FTSDMCXX_DIRECT 1.999 1.812 1.999 1.812
-score HDR_ORDER_FTSDMCXX_NORDNS 3.499 3.499 3.499 3.499
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250 0.250 0.250 0.250
-score HELO_MISC_IP 0.001 0.173 0.001 0.173
+score HAS_X_OUTGOING_SPAM_STAT 2.803 2.358 2.803 2.358
+score HDRS_LCASE 0.100 0.099 0.100 0.099
+score HDRS_LCASE_IMGONLY 0.100 0.099 0.100 0.099
+score HDRS_MISSP 2.499 0.923 2.499 0.923
+score HDR_ORDER_FTSDMCXX_DIRECT 1.999 1.810 1.999 1.810
+score HDR_ORDER_FTSDMCXX_NORDNS 3.028 3.500 3.028 3.500
+score HEADER_FROM_DIFFERENT_DOMAINS 0.249 0.249 0.249 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_NAME_FM_MR_MRS 1.499 1.319 1.499 1.319
+score HK_NAME_FM_MR_MRS 1.500 1.395 1.500 1.395
score HK_NAME_MR_MRS 0.999 0.999 0.999 0.999
-score HK_RANDOM_FROM 0.501 0.999 0.501 0.999
+score HK_RANDOM_FROM 0.261 1.000 0.261 1.000
score HK_RANDOM_REPLYTO 0.001 0.001 0.001 0.001
score HK_RCVD_IP_MULTICAST 1.000 1.000 1.000 1.000
score HK_SCAM 0.001 0.001 0.001 0.001
score HK_WIN 0.999 0.999 0.999 0.999
-score HOSTED_IMG_DIRECT_MX 2.768 1.679 2.768 1.679
+score HOSTED_IMG_DIRECT_MX 2.460 2.573 2.460 2.573
score HOSTED_IMG_DQ_UNSUB 1.000 1.000 1.000 1.000
score HOSTED_IMG_FREEM 3.499 3.499 3.499 3.499
-score HOSTED_IMG_MULTI 2.059 2.110 2.059 2.110
-score HOSTED_IMG_MULTI_PUB_01 2.600 2.999 2.600 2.999
+score HOSTED_IMG_MULTI 2.058 0.585 2.058 0.585
+score HOSTED_IMG_MULTI_PUB_01 2.597 2.999 2.597 2.999
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 2.999 2.999 2.999 2.999
-score HTML_SHRT_CMNT_OBFU_MANY 0.816 2.226 0.816 2.226
-score HTML_SINGLET_MANY 2.499 2.430 2.499 2.430
+score HTML_SHRT_CMNT_OBFU_MANY 0.766 1.901 0.766 1.901
+score HTML_SINGLET_MANY 2.499 2.483 2.499 2.483
score HTML_TEXT_INVISIBLE_FONT 1.999 1.999 1.999 1.999
-score HTML_TEXT_INVISIBLE_STYLE 1.866 1.415 1.866 1.415
-score IMG_ONLY_FM_DOM_INFO 0.001 2.499 0.001 2.499
-score JH_SPAMMY_HEADERS 3.500 3.499 3.500 3.499
+score HTML_TEXT_INVISIBLE_STYLE 0.299 1.416 0.299 1.416
+score IMG_ONLY_FM_DOM_INFO 0.041 2.499 0.041 2.499
+score JH_SPAMMY_HEADERS 3.499 3.499 3.499 3.499
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.174 0.999 0.174 0.999
-score KHOP_HELO_FCRDNS 0.400 0.399 0.400 0.399
+score KHOP_FAKE_EBAY 0.007 0.999 0.007 0.999
+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.738 0.001 0.738
-score LONG_HEX_URI 2.411 0.001 2.411 0.001
-score LONG_IMG_URI 0.639 1.615 0.639 1.615
-score LONG_INVISIBLE_TEXT 1.423 1.079 1.423 1.079
+score LIST_PRTL_SAME_USER 0.001 0.748 0.001 0.748
+score LONG_HEX_URI 1.787 0.001 1.787 0.001
+score LONG_IMG_URI 0.507 1.615 0.507 1.615
+score LONG_INVISIBLE_TEXT 1.876 1.082 1.876 1.082
score LOTS_OF_MONEY 0.010 0.010 0.010 0.010
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.299 1.237 3.299 1.237
+score MALFORMED_FREEMAIL 3.299 1.235 3.299 1.235
score MALF_HTML_B64 1.000 1.000 1.000 1.000
-score MALWARE_NORDNS 0.001 0.533 0.001 0.533
+score MALWARE_NORDNS 0.001 0.675 0.001 0.675
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.299 2.199 2.299 2.199
@@ -216,10 +214,10 @@
score MILLION_USD 0.001 0.001 0.001 0.001
score MIMEOLE_DIRECT_TO_MX 1.999 0.001 1.999 0.001
score MIME_NO_TEXT 1.999 1.999 1.999 1.999
-score MIXED_AREA_CASE 1.286 1.141 1.286 1.141
+score MIXED_AREA_CASE 0.805 2.126 0.805 2.126
score MIXED_CENTER_CASE 2.499 2.499 2.499 2.499
-score MIXED_CTYPE_CASE 3.599 0.916 3.599 0.916
-score MIXED_ES 2.400 2.199 2.400 2.199
+score MIXED_CTYPE_CASE 1.855 2.622 1.855 2.622
+score MIXED_ES 2.399 2.199 2.399 2.199
score MIXED_FONT_CASE 1.637 2.499 1.637 2.499
score MIXED_HREF_CASE 1.999 1.999 1.999 1.999
score MIXED_IMG_CASE 2.999 2.999 2.999 2.999
@@ -229,73 +227,74 @@
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 0.001 0.001 0.001 0.001
+score MONEY_FORM_SHORT 1.243 0.001 1.243 0.001
score MONEY_FRAUD_3 2.799 2.699 2.799 2.699
score MONEY_FRAUD_5 0.001 0.001 0.001 0.001
score MONEY_FRAUD_8 0.001 0.001 0.001 0.001
-score MONEY_FREEMAIL_REPTO 2.999 0.523 2.999 0.523
-score MONEY_FROM_41 1.999 1.999 1.999 1.999
+score MONEY_FREEMAIL_REPTO 2.999 0.447 2.999 0.447
+score MONEY_FROM_41 1.989 1.999 1.989 1.999
score MONEY_FROM_MISSP 0.001 0.001 0.001 0.001
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 2.910 3.499 2.910 3.499
-score MSGID_NOFQDN1 0.393 0.960 0.393 0.960
-score MSMAIL_PRI_ABNORMAL 0.576 0.766 0.576 0.766
+score MSGID_HDR_MALF 2.727 3.500 2.727 3.500
+score MSGID_NOFQDN1 0.499 1.166 0.499 1.166
+score MSMAIL_PRI_ABNORMAL 1.276 1.499 1.276 1.499
score MSM_PRIO_REPTO 1.000 0.001 1.000 0.001
-score NAME_EMAIL_DIFF 1.141 1.067 1.141 1.067
-score NA_DOLLARS 1.499 1.500 1.499 1.500
+score NAME_EMAIL_DIFF 1.450 0.932 1.450 0.932
+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.001 -0.001 -0.001 -0.001
-score NORDNS_LOW_CONTRAST 1.886 2.312 1.886 2.312
-score NO_FM_NAME_IP_HOSTN 0.001 0.001 0.001 0.001
+score NORDNS_LOW_CONTRAST 1.884 2.311 1.884 2.311
+score NO_FM_NAME_IP_HOSTN 0.041 0.001 0.041 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.128 0.490 0.128 0.490
+score NUMBEREND_LINKBAIT 0.661 0.476 0.661 0.476
score OBFU_BITCOIN 0.001 1.000 0.001 1.000
score OBFU_UNSUB_UL 2.299 0.001 2.299 0.001
-score ODD_FREEM_REPTO 3.000 2.999 3.000 2.999
-score OFFER_ONLY_AMERICA 0.924 1.124 0.924 1.124
-score ORDER_TODAY 2.412 2.499 2.412 2.499
-score PDS_BAD_THREAD_QP_64 0.999 0.999 0.999 0.999
+score ODD_FREEM_REPTO 2.999 2.895 2.999 2.895
+score OFFER_ONLY_AMERICA 0.693 1.202 0.693 1.202
+score ORDER_TODAY 2.469 2.499 2.469 2.499
+score PDS_BAD_THREAD_QP_64 1.000 0.999 1.000 0.999
score PDS_BTC_ID 0.499 0.499 0.499 0.499
score PDS_BTC_MSGID 0.001 0.001 0.001 0.001
-score PDS_DBL_URL_TNB_RUNON 0.898 0.001 0.898 0.001
-score PDS_EMPTYSUBJ_URISHRT 0.001 0.103 0.001 0.103
-score PDS_FRNOM_TODOM_DBL_URL 1.441 1.499 1.441 1.499
+score PDS_DBL_URL_TNB_RUNON 1.186 0.001 1.186 0.001
+score PDS_EMPTYSUBJ_URISHRT 0.001 0.121 0.001 0.121
+score PDS_FRNOM_TODOM_DBL_URL 1.432 1.499 1.432 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499 1.499 1.499 1.499
-score PDS_FROM_2_EMAILS 1.995 1.777 1.995 1.777
-score PDS_FROM_2_EMAILS_SHRTNER 0.001 1.244 0.001 1.244
+score PDS_FROM_2_EMAILS 1.687 1.913 1.687 1.913
+score PDS_FROM_2_EMAILS_SHRTNER 1.039 1.499 1.039 1.499
score PDS_FROM_NAME_TO_DOMAIN 1.999 1.999 1.999 1.999
score PDS_HELO_SPF_FAIL 0.001 1.000 0.001 1.000
-score PDS_NO_FULL_NAME_SPOOFED_URL 0.749 0.749 0.749 0.749
+score PDS_NAKED_TO_NUMERO 1.999 1.383 1.999 1.383
+score PDS_NO_FULL_NAME_SPOOFED_URL 0.144 0.749 0.144 0.749
score PDS_OTHER_BAD_TLD 1.999 1.999 1.999 1.999
-score PDS_SHORTFWD_URISHRT_FP 1.500 1.499 1.500 1.499
-score PDS_SHORT_SPOOFED_URL 1.999 1.999 1.999 1.999
-score PDS_TINYSUBJ_URISHRT 1.499 0.309 1.499 0.309
+score PDS_SHORTFWD_URISHRT_FP 1.499 1.499 1.499 1.499
+score PDS_SHORT_SPOOFED_URL 1.124 1.999 1.124 1.999
+score PDS_TINYSUBJ_URISHRT 1.400 0.007 1.400 0.007
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.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 PDS_TO_EQ_FROM_NAME 3.199 0.700 3.199 0.700
+score PDS_TO_EQ_FROM_NAME 3.099 0.702 3.099 0.702
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 0.034 0.001 0.034 0.001
-score PHP_SCRIPT 2.215 2.499 2.215 2.499
+score PHP_ORIG_SCRIPT 0.001 0.001 0.001 0.001
+score PHP_SCRIPT 2.339 2.499 2.339 2.499
score PHP_SCRIPT_MUA 1.000 1.000 1.000 1.000
-score PP_MIME_FAKE_ASCII_TEXT 0.999 0.862 0.999 0.862
+score PP_MIME_FAKE_ASCII_TEXT 1.000 0.438 1.000 0.438
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.999 2.999 2.999
+score RAND_HEADER_LIST_SPOOF 3.000 2.999 3.000 2.999
score RAND_HEADER_MANY 1.000 1.000 1.000 1.000
score RAND_MKTG_HEADER 1.999 1.999 1.999 1.999
-score RATWARE_NO_RDNS 2.057 2.693 2.057 2.693
+score RATWARE_NO_RDNS 0.973 2.243 0.973 2.243
score RCVD_DOTEDU_SHORT 1.000 1.000 1.000 1.000
-score RCVD_DOTEDU_SUSP_URI 3.000 2.999 3.000 2.999
+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
@@ -311,72 +310,73 @@
score RCVD_IN_RP_RNBL 0.001 0.001 0.001 0.001
score RCVD_IN_RP_SAFE 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 2.225 1.000 2.225 1.000
-score READY_TO_SHIP 0.914 0.474 0.914 0.474
+score RDNS_NUM_TLD_XM 2.335 1.000 2.335 1.000
+score READY_TO_SHIP 0.001 0.775 0.001 0.775
score REPTO_419_FRAUD 1.000 1.000 1.000 1.000
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.319 2.999 2.319
+score REPTO_419_FRAUD_GM 2.999 2.520 2.999 2.520
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.561 2.999 2.561
+score REPTO_419_FRAUD_QQ 3.000 2.999 3.000 2.999
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 1.000 1.000 1.000 1.000
score REPTO_419_FRAUD_YN 1.000 1.000 1.000 1.000
-score RISK_FREE 2.899 2.899 2.899 2.899
-score SENDGRID_REDIR 1.499 0.001 1.499 0.001
+score RISK_FREE 2.799 2.899 2.799 2.899
+score SENDGRID_REDIR 1.500 0.001 1.500 0.001
score SENDGRID_REDIR_PHISH 1.000 1.000 1.000 1.000
score SEO_SUSP_NTLD 1.000 1.000 1.000 1.000
-score SERGIO_SUBJECT_VIAGRA01 3.956 3.999 3.956 3.999
+score SERGIO_SUBJECT_VIAGRA01 3.556 3.999 3.556 3.999
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.050 2.999 2.050
+score SHORTENER_SHORT_SUBJ 2.999 2.306 2.999 2.306
score SHORT_IMG_SUSP_NTLD 0.001 0.001 0.001 0.001
-score SHORT_SHORTNER 1.999 0.970 1.999 0.970
+score SHORT_SHORTNER 1.999 0.998 1.999 0.998
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_NO_RDNS 1.499 0.159 1.499 0.159
+score SPOOFED_FREEMAIL_NO_RDNS 1.499 0.166 1.499 0.166
score SPOOFED_FREEM_REPTO 0.001 1.998 0.001 1.998
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.500 1.499 1.500 1.499
-score STATIC_XPRIO_OLE 1.999 2.000 1.999 2.000
-score STOCK_LOW_CONTRAST 0.614 0.001 0.614 0.001
+score SPOOF_GMAIL_MID 1.499 1.499 1.499 1.499
+score STATIC_XPRIO_OLE 1.999 1.999 1.999 1.999
+score STOCK_LOW_CONTRAST 1.240 0.001 1.240 0.001
score STOCK_TIP 1.000 1.000 1.000 1.000
-score STOX_BOUND_090909_B 0.001 1.789 0.001 1.789
+score SUBJ_ATTENTION 0.499 0.001 0.499 0.001
score SURBL_BLOCKED 0.001 0.001 0.001 0.001
score SYSADMIN 1.000 1.000 1.000 1.000
-score THIS_AD 1.299 0.876 1.299 0.876
-score THIS_IS_ADV_SUSP_NTLD 0.456 1.262 0.456 1.262
+score THIS_AD 1.199 0.873 1.199 0.873
+score THIS_IS_ADV_SUSP_NTLD 1.499 1.499 1.499 1.499
+score THREAD_INDEX_HEX 0.865 0.001 0.865 0.001
score TONLINE_FAKE_DKIM 1.000 1.000 1.000 1.000
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499 1.500 1.499 1.500
-score TO_EQ_FM_DIRECT_MX 0.001 2.499 0.001 2.499
-score TO_EQ_FM_DOM_HTML_IMG 0.001 0.391 0.001 0.391
-score TO_EQ_FM_DOM_HTML_ONLY 1.699 0.490 1.699 0.490
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499 1.499 1.499 1.499
+score TO_EQ_FM_DIRECT_MX 0.001 2.500 0.001 2.500
+score TO_EQ_FM_DOM_HTML_IMG 0.001 0.593 0.001 0.593
+score TO_EQ_FM_DOM_HTML_ONLY 1.699 0.483 1.699 0.483
score TO_EQ_FM_DOM_SPF_FAIL 0.001 0.001 0.001 0.001
-score TO_EQ_FM_HTML_ONLY 1.289 1.399 1.289 1.399
+score TO_EQ_FM_HTML_ONLY 1.288 1.399 1.288 1.399
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_NAME_SUBJ_NO_RDNS 2.499 2.242 2.499 2.242
-score TO_NO_BRKTS_FROM_MSSP 1.956 0.001 1.956 0.001
-score TO_NO_BRKTS_HTML_IMG 1.999 1.865 1.999 1.865
+score TO_NAME_SUBJ_NO_RDNS 1.932 2.238 1.932 2.238
+score TO_NO_BRKTS_FROM_MSSP 2.499 0.001 2.499 0.001
+score TO_NO_BRKTS_HTML_IMG 1.999 1.870 1.999 1.870
score TO_NO_BRKTS_HTML_ONLY 1.999 1.999 1.999 1.999
-score TO_NO_BRKTS_MSFT 0.488 0.001 0.488 0.001
-score TO_NO_BRKTS_NORDNS_HTML 1.999 1.999 1.999 1.999
+score TO_NO_BRKTS_MSFT 0.491 0.001 0.491 0.001
+score TO_NO_BRKTS_NORDNS_HTML 2.000 2.000 2.000 2.000
score TO_NO_BRKTS_PCNT 2.499 2.499 2.499 2.499
-score TVD_IP_HEX 3.099 1.236 3.099 1.236
-score TVD_IP_SING_HEX 2.531 0.288 2.531 0.288
-score TVD_RCVD_SPACE_BRACKET 2.799 0.532 2.799 0.532
-score TVD_SPACE_ENCODED 2.500 2.114 2.500 2.114
-score TVD_SPACE_RATIO_MINFP 2.499 0.167 2.499 0.167
+score TVD_IP_HEX 3.036 2.028 3.036 2.028
+score TVD_IP_SING_HEX 0.145 2.353 0.145 2.353
+score TVD_RCVD_SPACE_BRACKET 2.799 0.298 2.799 0.298
+score TVD_SPACE_ENCODED 2.499 2.499 2.499 2.499
+score TVD_SPACE_RATIO_MINFP 2.499 0.166 2.499 0.166
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 2.999 2.799 2.999 2.799
-score UNDISC_MONEY 3.399 1.860 3.399 1.860
+score UNDISC_MONEY 3.399 1.805 3.399 1.805
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.099 0.001 1.099 0.001
@@ -384,39 +384,39 @@
score URI_AZURE_CLOUDAPP 1.000 1.000 1.000 1.000
score URI_DASHGOVEDU 1.000 1.000 1.000 1.000
score URI_DATA 1.000 1.000 1.000 1.000
-score URI_DOTDOT_LOW_CNTRST 2.499 1.259 2.499 1.259
+score URI_DOTDOT_LOW_CNTRST 0.440 1.056 0.440 1.056
score URI_DOTEDU 1.999 0.001 1.999 0.001
score URI_DOTEDU_ENTITY 1.000 1.000 1.000 1.000
score URI_FIREBASEAPP 2.999 2.999 2.999 2.999
-score URI_GOOGLE_PROXY 3.099 1.628 3.099 1.628
-score URI_GOOG_STO_SPAMMY 2.916 1.856 2.916 1.856
-score URI_HEX_IP 1.389 2.063 1.389 2.063
+score URI_GOOGLE_PROXY 3.100 1.630 3.100 1.630
+score URI_GOOG_STO_SPAMMY 2.158 2.900 2.158 2.900
+score URI_HEX_IP 2.499 0.361 2.499 0.361
score URI_IMG_WP_REDIR 1.000 1.000 1.000 1.000
-score URI_LONG_REPEAT 1.538 1.000 1.538 1.000
-score URI_ONLY_MSGID_MALF 1.999 1.390 1.999 1.390
+score URI_LONG_REPEAT 1.734 1.000 1.734 1.000
+score URI_ONLY_MSGID_MALF 1.999 1.502 1.999 1.502
score URI_OPTOUT_3LD 1.000 1.000 1.000 1.000
-score URI_PHISH 3.999 2.340 3.999 2.340
+score URI_PHISH 4.000 2.331 4.000 2.331
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 3.299 3.099 3.299 3.099
-score URI_WP_DIRINDEX 3.499 3.499 3.499 3.499
-score URI_WP_HACKED 3.499 0.310 3.499 0.310
+score URI_WP_DIRINDEX 2.399 3.499 2.399 3.499
+score URI_WP_HACKED 3.499 0.324 3.499 0.324
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 0.001 2.905 0.001 2.905
+score VFY_ACCT_NORDNS 0.005 2.907 0.005 2.907
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 2.499 2.499 2.499 2.499
-score WIKI_IMG 3.199 2.565 3.199 2.565
+score WANT_TO_ORDER 2.500 2.499 2.500 2.499
+score WIKI_IMG 3.199 2.698 3.199 2.698
score WORD_INVIS 1.000 1.000 1.000 1.000
score WORD_INVIS_MANY 1.000 1.000 1.000 1.000
-score XFER_LOTSA_MONEY 0.001 0.999 0.001 0.999
-score XM_DIGITS_ONLY 2.055 2.992 2.055 2.992
+score XFER_LOTSA_MONEY 0.242 0.999 0.242 0.999
+score XM_DIGITS_ONLY 2.360 1.454 2.360 1.454
score XM_RANDOM 2.999 2.999 2.999 2.999
-score XM_RECPTID 2.999 2.526 2.999 2.526
+score XM_RECPTID 2.999 2.527 2.999 2.527
score XPRIO 0.001 1.000 0.001 1.000
score XPRIO_SHORT_SUBJ 1.000 1.000 1.000 1.000
-score XPRIO_URL_SHORTNER 0.999 0.001 0.999 0.001
+score XPRIO_URL_SHORTNER 0.999 0.792 0.999 0.792
score YOUR_DELIVERY_ADDRESS 1.249 1.249 1.249 1.249
-score YOU_INHERIT 2.300 2.699 2.300 2.699
+score YOU_INHERIT 2.399 2.699 2.399 2.699
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index a6748b2..0045980 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -1,259 +1,262 @@
-# Using score set 0 logs for revision 1888465 from:
-# ham-axb-coi-bulk.r1888465.log ham-axb-generic.r1888465.log ham-axb-ham-misc.r1888465.log ham-darxus.r1888465.log ham-ena-week0.r1888465.log ham-ena-week1.r1888465.log ham-ena-week2.r1888465.log ham-ena-week3.r1888465.log ham-ena-week4.r1888465.log ham-giovanni-ham.r1888465.log ham-giovanni-spammy.r1888465.log ham-giovanni-spam.r1888465.log ham-grenier.r1888465.log ham-jhardin.r1888465.log ham-llanga.r1888465.log ham-mmiroslaw-mails-ham.r1888465.log ham-mmiroslaw-mails-spam.r1888465.log ham-pds.r1888465.log ham-sihde.r1888465.log ham-spamsponge.r1888465.log ham-thendrikx.r1888465.log spam-axb-coi-bulk.r1888465.log spam-axb-generic.r1888465.log spam-axb-ham-misc.r1888465.log spam-darxus.r1888465.log spam-ena-week0.r1888465.log spam-ena-week1.r1888465.log spam-ena-week2.r1888465.log spam-ena-week3.r1888465.log spam-ena-week4.r1888465.log spam-giovanni-ham.r1888465.log spam-giovanni-spammy.r1888465.log spam-giovanni-spam.r1888465.log spam-grenier.r1888465.log spam-jhardin.r1888465.log spam-llanga.r1888465.log spam-mmiroslaw-mails-ham.r1888465.log spam-mmiroslaw-mails-spam.r1888465.log spam-pds.r1888465.log spam-sihde.r1888465.log spam-spamsponge.r1888465.log spam-thendrikx.r1888465.log
+# Using score set 0 logs for revision 1888502 from:
+# ham-axb-coi-bulk.r1888502.log ham-axb-generic.r1888502.log ham-axb-ham-misc.r1888502.log ham-darxus.r1888502.log ham-ena-week0.r1888502.log ham-ena-week1.r1888502.log ham-ena-week2.r1888502.log ham-ena-week3.r1888502.log ham-ena-week4.r1888502.log ham-giovanni-ham.r1888502.log ham-giovanni-spammy.r1888502.log ham-giovanni-spam.r1888502.log ham-grenier.r1888502.log ham-jhardin.r1888502.log ham-llanga.r1888502.log ham-mmiroslaw-mails-ham.r1888502.log ham-mmiroslaw-mails-spam.r1888502.log ham-pds.r1888502.log ham-sihde.r1888502.log ham-spamsponge.r1888502.log ham-thendrikx.r1888502.log spam-axb-coi-bulk.r1888502.log spam-axb-generic.r1888502.log spam-axb-ham-misc.r1888502.log spam-darxus.r1888502.log spam-ena-week0.r1888502.log spam-ena-week1.r1888502.log spam-ena-week2.r1888502.log spam-ena-week3.r1888502.log spam-ena-week4.r1888502.log spam-giovanni-ham.r1888502.log spam-giovanni-spammy.r1888502.log spam-giovanni-spam.r1888502.log spam-grenier.r1888502.log spam-jhardin.r1888502.log spam-llanga.r1888502.log spam-mmiroslaw-mails-ham.r1888502.log spam-mmiroslaw-mails-spam.r1888502.log spam-pds.r1888502.log spam-sihde.r1888502.log spam-spamsponge.r1888502.log spam-thendrikx.r1888502.log
score ACCT_PHISHING_MANY 2.999
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001
score AC_FROM_MANY_DOTS 2.999
score AC_HTML_NONSENSE_TAGS 1.999
-score ADMITS_SPAM 4.200
-score ADVANCE_FEE_2_NEW_FRM_MNY 1.536
+score ADMITS_SPAM 4.199
+score ADVANCE_FEE_2_NEW_FRM_MNY 2.499
score ADVANCE_FEE_2_NEW_MONEY 1.999
-score ADVANCE_FEE_3_NEW 3.499
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_3_NEW_MONEY 2.492
+score ADVANCE_FEE_3_NEW 3.500
+score ADVANCE_FEE_3_NEW_FRM_MNY 1.608
+score ADVANCE_FEE_3_NEW_MONEY 2.504
score ADVANCE_FEE_4_NEW 2.699
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 0.244
+score ADVANCE_FEE_4_NEW_MONEY 0.248
score ADVANCE_FEE_5_NEW 2.499
-score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
+score ADVANCE_FEE_5_NEW_FRM_MNY 2.033
score ADVANCE_FEE_5_NEW_MONEY 0.001
-score ALIBABA_IMG_NOT_RCVD_ALI 1.073
+score ALIBABA_IMG_NOT_RCVD_ALI 2.499
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
-score APP_DEVELOPMENT_NORDNS 1.226
+score APP_DEVELOPMENT_NORDNS 1.221
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.367
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.588
score BIGNUM_EMAILS_FREEM 2.999
-score BITCOIN_DEADLINE 1.702
-score BITCOIN_EXTORT_01 1.691
-score BITCOIN_IMGUR 2.998
+score BITCOIN_DEADLINE 1.664
+score BITCOIN_EXTORT_01 1.700
+score BITCOIN_IMGUR 2.508
score BITCOIN_MALF_HTML 3.499
-score BITCOIN_MALWARE 2.798
-score BITCOIN_SPAM_02 1.971
+score BITCOIN_MALWARE 2.837
+score BITCOIN_SPAM_02 1.742
score BITCOIN_SPAM_07 3.499
score BITCOIN_XPRIO 2.499
-score BODY_SINGLE_URI 0.735
-score BODY_SINGLE_WORD 0.243
-score BODY_URI_ONLY 1.806
+score BITCOIN_YOUR_INFO 2.512
+score BODY_SINGLE_URI 2.499
+score BODY_SINGLE_WORD 0.244
+score BODY_URI_ONLY 1.956
score BOGUS_MIME_VERSION 3.499
-score BULK_RE_SUSP_NTLD 1.000
-score CK_HELO_GENERIC 0.250
-score CONTENT_AFTER_HTML 2.499
-score CTE_8BIT_MISMATCH 1.000
-score DATE_IN_FUTURE_96_Q 2.398
+score BULK_RE_SUSP_NTLD 0.999
+score COMPENSATION 1.499
+score CONTENT_AFTER_HTML 2.500
+score CTE_8BIT_MISMATCH 0.999
+score DATE_IN_FUTURE_96_Q 2.499
score DEAR_BENEFICIARY 0.001
score DSN_NO_MIMEVERSION 1.999
-score EBAY_IMG_NOT_RCVD_EBAY 2.596
+score EBAY_IMG_NOT_RCVD_EBAY 2.546
score END_FUTURE_EMAILS 2.098
-score FAKE_REPLY_A1 4.099
+score FAKE_REPLY_A1 3.966
score FAKE_REPLY_B 3.999
score FILL_THIS_FORM 1.199
-score FONT_INVIS_DIRECT 1.531
+score FONT_INVIS_DIRECT 2.209
score FONT_INVIS_HTML_NOHTML 2.999
-score FONT_INVIS_LONG_LINE 2.999
+score FONT_INVIS_LONG_LINE 2.313
score FONT_INVIS_MSGID 2.499
-score FONT_INVIS_NORDNS 2.500
-score FONT_INVIS_POSTEXTRAS 3.179
+score FONT_INVIS_NORDNS 2.499
+score FONT_INVIS_POSTEXTRAS 3.176
score FORM_FRAUD 0.999
score FORM_FRAUD_3 0.001
-score FORM_FRAUD_5 0.001
-score FREEMAIL_FORGED_FROMDOMAIN 0.249
+score FORM_FRAUD_5 0.001 # force non-zero
+score FOUND_YOU 3.249
+score FREEMAIL_FORGED_FROMDOMAIN 0.250
score FROM_2_EMAILS_SHORT 2.999
score FROM_ADDR_WS 2.999
-score FROM_MISSPACED 1.141
+score FROM_MISSPACED 0.001
score FROM_MISSP_DYNIP 0.001
score FROM_MISSP_EH_MATCH 0.001
-score FROM_MISSP_FREEMAIL 0.001
+score FROM_MISSP_FREEMAIL 1.566
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_REPLYTO 1.801
-score FROM_MISSP_TO_UNDISC 1.185
+score FROM_MISSP_REPLYTO 1.802
+score FROM_MISSP_TO_UNDISC 0.001
score FROM_MISSP_USER 0.001
-score FROM_MULTI_NORDNS 0.354
-score FROM_NTLD_LINKBAIT 0.510
-score FROM_NTLD_REPLY_FREEMAIL 1.358
+score FROM_MULTI_NORDNS 0.347
+score FROM_NTLD_LINKBAIT 0.903
+score FROM_NTLD_REPLY_FREEMAIL 1.999
score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 2.000
+score FROM_SUSPICIOUS_NTLD_FP 1.999
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FUZZY_AMAZON 2.700
+score FUZZY_AMAZON 2.699
score FUZZY_BITCOIN 2.399
score GB_FAKE_RF_SHORT 1.999
-score GB_FREEMAIL_DISPTO 0.486
+score GB_FREEMAIL_DISPTO 0.499
score GB_FREEMAIL_DISPTO_NOTFREEM 0.500
score GOOGLE_DOC_SUSP 2.999
-score GOOG_REDIR_NORDNS 2.602
-score GOOG_STO_HTML_PHISH 2.212
+score GOOG_REDIR_NORDNS 2.601
+score GOOG_STO_HTML_PHISH 2.644
score GOOG_STO_IMG_HTML 2.999
score GOOG_STO_IMG_NOHTML 2.499
score GOOG_STO_NOIMG_HTML 2.999
-score HAS_X_OUTGOING_SPAM_STAT 2.963
-score HDRS_LCASE 0.099
-score HDRS_LCASE_IMGONLY 0.099
+score HAS_X_OUTGOING_SPAM_STAT 2.803
+score HDRS_LCASE 0.100
+score HDRS_LCASE_IMGONLY 0.100
score HDRS_MISSP 2.499
score HDR_ORDER_FTSDMCXX_DIRECT 1.999
-score HDR_ORDER_FTSDMCXX_NORDNS 3.499
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250
-score HELO_MISC_IP 0.001
+score HDR_ORDER_FTSDMCXX_NORDNS 3.028
+score HEADER_FROM_DIFFERENT_DOMAINS 0.249
score HELO_NO_DOMAIN 0.001
-score HK_NAME_FM_MR_MRS 1.499
+score HK_NAME_FM_MR_MRS 1.500
score HK_NAME_MR_MRS 0.999
-score HK_RANDOM_FROM 0.501
+score HK_RANDOM_FROM 0.261
score HK_RANDOM_REPLYTO 0.001
score HK_SCAM 0.001
score HK_WIN 0.999
-score HOSTED_IMG_DIRECT_MX 2.768
+score HOSTED_IMG_DIRECT_MX 2.460
score HOSTED_IMG_FREEM 3.499
-score HOSTED_IMG_MULTI 2.059
-score HOSTED_IMG_MULTI_PUB_01 2.600
+score HOSTED_IMG_MULTI 2.058
+score HOSTED_IMG_MULTI_PUB_01 2.597
score HTML_OFF_PAGE 2.999
-score HTML_SHRT_CMNT_OBFU_MANY 0.816
+score HTML_SHRT_CMNT_OBFU_MANY 0.766
score HTML_SINGLET_MANY 2.499
score HTML_TEXT_INVISIBLE_FONT 1.999
-score HTML_TEXT_INVISIBLE_STYLE 1.866
-score IMG_ONLY_FM_DOM_INFO 0.001
-score JH_SPAMMY_HEADERS 3.500
-score KHOP_FAKE_EBAY 0.174
-score KHOP_HELO_FCRDNS 0.400
+score HTML_TEXT_INVISIBLE_STYLE 0.299
+score IMG_ONLY_FM_DOM_INFO 0.041
+score JH_SPAMMY_HEADERS 3.499
+score KHOP_FAKE_EBAY 0.007
+score KHOP_HELO_FCRDNS 0.399
score LIST_PRTL_SAME_USER 0.001
-score LONG_HEX_URI 2.411
-score LONG_IMG_URI 0.639
-score LONG_INVISIBLE_TEXT 1.423
+score LONG_HEX_URI 1.787
+score LONG_IMG_URI 0.507
+score LONG_INVISIBLE_TEXT 1.876
score LOTS_OF_MONEY 0.010
score LOTTO_DEPT 0.001
score MALFORMED_FREEMAIL 3.299
-score MALWARE_NORDNS 0.001 # force non-zero
+score MALWARE_NORDNS 0.001
score MANY_SPAN_IN_TEXT 2.299
score MAY_BE_FORGED 2.491
score MILLION_HUNDRED 0.001
score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 1.999
score MIME_NO_TEXT 1.999
-score MIXED_AREA_CASE 1.286
+score MIXED_AREA_CASE 0.805
score MIXED_CENTER_CASE 2.499
-score MIXED_CTYPE_CASE 3.599
-score MIXED_ES 2.400
+score MIXED_CTYPE_CASE 1.855
+score MIXED_ES 2.399
score MIXED_FONT_CASE 1.637
score MIXED_HREF_CASE 1.999
score MIXED_IMG_CASE 2.999
score MONEY_ATM_CARD 0.001
score MONEY_FORM 0.001
-score MONEY_FORM_SHORT 0.001
+score MONEY_FORM_SHORT 1.243
score MONEY_FRAUD_3 2.799
score MONEY_FRAUD_5 0.001
-score MONEY_FRAUD_8 0.001
+score MONEY_FRAUD_8 0.001 # force non-zero
score MONEY_FREEMAIL_REPTO 2.999
-score MONEY_FROM_41 1.999
+score MONEY_FROM_41 1.989
score MONEY_FROM_MISSP 0.001
score MONEY_NOHTML 2.499
-score MSGID_HDR_MALF 2.910
-score MSGID_NOFQDN1 0.393
-score MSMAIL_PRI_ABNORMAL 0.576
-score NAME_EMAIL_DIFF 1.141
+score MSGID_HDR_MALF 2.727
+score MSGID_NOFQDN1 0.499
+score MSMAIL_PRI_ABNORMAL 1.276
+score NAME_EMAIL_DIFF 1.450
score NA_DOLLARS 1.499
score NICE_REPLY_A -0.001
-score NORDNS_LOW_CONTRAST 1.886
-score NO_FM_NAME_IP_HOSTN 0.001
+score NORDNS_LOW_CONTRAST 1.884
+score NO_FM_NAME_IP_HOSTN 0.041
score NSL_RCVD_FROM_USER 0.001
score NSL_RCVD_HELO_USER 0.001
-score NUMBEREND_LINKBAIT 0.128
+score NUMBEREND_LINKBAIT 0.661
score OBFU_BITCOIN 0.001
score OBFU_UNSUB_UL 2.299
-score ODD_FREEM_REPTO 3.000
-score OFFER_ONLY_AMERICA 0.924
-score ORDER_TODAY 2.412
-score PDS_BAD_THREAD_QP_64 0.999
+score ODD_FREEM_REPTO 2.999
+score OFFER_ONLY_AMERICA 0.693
+score ORDER_TODAY 2.469
+score PDS_BAD_THREAD_QP_64 1.000
score PDS_BTC_ID 0.499
score PDS_BTC_MSGID 0.001
-score PDS_DBL_URL_TNB_RUNON 0.898
+score PDS_DBL_URL_TNB_RUNON 1.186
score PDS_EMPTYSUBJ_URISHRT 0.001
-score PDS_FRNOM_TODOM_DBL_URL 1.441
+score PDS_FRNOM_TODOM_DBL_URL 1.432
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 1.995
-score PDS_FROM_2_EMAILS_SHRTNER 0.001
+score PDS_FROM_2_EMAILS 1.687
+score PDS_FROM_2_EMAILS_SHRTNER 1.039
score PDS_FROM_NAME_TO_DOMAIN 1.999
-score PDS_NO_FULL_NAME_SPOOFED_URL 0.749
+score PDS_NAKED_TO_NUMERO 1.999
+score PDS_NO_FULL_NAME_SPOOFED_URL 0.144
score PDS_OTHER_BAD_TLD 1.999
-score PDS_SHORTFWD_URISHRT_FP 1.500
-score PDS_SHORT_SPOOFED_URL 1.999
-score PDS_TINYSUBJ_URISHRT 1.499
+score PDS_SHORTFWD_URISHRT_FP 1.499
+score PDS_SHORT_SPOOFED_URL 1.124
+score PDS_TINYSUBJ_URISHRT 1.400
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 PDS_TO_EQ_FROM_NAME 3.199
-score PHP_ORIG_SCRIPT 0.034
-score PHP_SCRIPT 2.215
-score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RAND_HEADER_LIST_SPOOF 2.999
+score PDS_TO_EQ_FROM_NAME 3.099
+score PHP_ORIG_SCRIPT 0.001
+score PHP_SCRIPT 2.339
+score PP_MIME_FAKE_ASCII_TEXT 1.000
+score RAND_HEADER_LIST_SPOOF 3.000
score RAND_MKTG_HEADER 1.999
-score RATWARE_NO_RDNS 2.057
-score RCVD_DOTEDU_SUSP_URI 3.000
-score RDNS_NUM_TLD_XM 2.225
-score READY_TO_SHIP 0.914
+score RATWARE_NO_RDNS 0.973
+score RCVD_DOTEDU_SUSP_URI 2.999
+score RDNS_NUM_TLD_XM 2.335
+score READY_TO_SHIP 0.001
score REPTO_419_FRAUD_GM 2.999
-score REPTO_419_FRAUD_QQ 2.999
-score RISK_FREE 2.899
-score SENDGRID_REDIR 1.499
-score SERGIO_SUBJECT_VIAGRA01 3.956
+score REPTO_419_FRAUD_QQ 3.000
+score RISK_FREE 2.799
+score SENDGRID_REDIR 1.500
+score SERGIO_SUBJECT_VIAGRA01 3.556
score SHOPIFY_IMG_NOT_RCVD_SFY 2.499
score SHORTENER_SHORT_SUBJ 2.999
score SHORT_IMG_SUSP_NTLD 0.001
score SHORT_SHORTNER 1.999
score SINGLETS_LOW_CONTRAST 0.001
score SPOOFED_FREEMAIL_NO_RDNS 1.499
-score SPOOF_GMAIL_MID 1.500
+score SPOOF_GMAIL_MID 1.499
score STATIC_XPRIO_OLE 1.999
-score STOCK_LOW_CONTRAST 0.614
-score STOX_BOUND_090909_B 0.001
-score THIS_AD 1.299
-score THIS_IS_ADV_SUSP_NTLD 0.456
+score STOCK_LOW_CONTRAST 1.240
+score SUBJ_ATTENTION 0.499
+score THIS_AD 1.199
+score THIS_IS_ADV_SUSP_NTLD 1.499
+score THREAD_INDEX_HEX 0.865
score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
-score TO_EQ_FM_DIRECT_MX 0.001
-score TO_EQ_FM_DOM_HTML_IMG 0.001 # force non-zero
+score TO_EQ_FM_DIRECT_MX 0.001 # force non-zero
+score TO_EQ_FM_DOM_HTML_IMG 0.001
score TO_EQ_FM_DOM_HTML_ONLY 1.699
-score TO_EQ_FM_HTML_ONLY 1.289
+score TO_EQ_FM_HTML_ONLY 1.288
score TO_IN_SUBJ 0.100
-score TO_NAME_SUBJ_NO_RDNS 2.499
-score TO_NO_BRKTS_FROM_MSSP 1.956
+score TO_NAME_SUBJ_NO_RDNS 1.932
+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 0.488
-score TO_NO_BRKTS_NORDNS_HTML 1.999
+score TO_NO_BRKTS_MSFT 0.491
+score TO_NO_BRKTS_NORDNS_HTML 2.000
score TO_NO_BRKTS_PCNT 2.499
-score TVD_IP_HEX 3.099
-score TVD_IP_SING_HEX 2.531
+score TVD_IP_HEX 3.036
+score TVD_IP_SING_HEX 0.145
score TVD_RCVD_SPACE_BRACKET 2.799
-score TVD_SPACE_ENCODED 2.500
+score TVD_SPACE_ENCODED 2.499
score TVD_SPACE_RATIO_MINFP 2.499
score UNDISC_FREEM 2.999
score UNDISC_MONEY 3.399
score UPGRADE_MAILBOX 1.099
-score URI_DOTDOT_LOW_CNTRST 2.499
+score URI_DOTDOT_LOW_CNTRST 0.440
score URI_DOTEDU 1.999
score URI_FIREBASEAPP 2.999
-score URI_GOOGLE_PROXY 3.099
-score URI_GOOG_STO_SPAMMY 2.916
-score URI_HEX_IP 1.389
-score URI_LONG_REPEAT 1.538
+score URI_GOOGLE_PROXY 3.100
+score URI_GOOG_STO_SPAMMY 2.158
+score URI_HEX_IP 2.499
+score URI_LONG_REPEAT 1.734
score URI_ONLY_MSGID_MALF 1.999
-score URI_PHISH 3.999
+score URI_PHISH 4.000
score URI_PHP_REDIR 3.499
score URI_TRY_3LD 1.999
score URI_WPADMIN 3.299
-score URI_WP_DIRINDEX 3.499
+score URI_WP_DIRINDEX 2.399
score URI_WP_HACKED 3.499
score URI_WP_HACKED_2 2.499
-score VFY_ACCT_NORDNS 0.001
-score WANT_TO_ORDER 2.499
+score VFY_ACCT_NORDNS 0.005
+score WANT_TO_ORDER 2.500
score WIKI_IMG 3.199
-score XFER_LOTSA_MONEY 0.001
-score XM_DIGITS_ONLY 2.055
+score XFER_LOTSA_MONEY 0.242
+score XM_DIGITS_ONLY 2.360
score XM_RANDOM 2.999
score XM_RECPTID 2.999
score XPRIO 0.001
score XPRIO_URL_SHORTNER 0.999
score YOUR_DELIVERY_ADDRESS 1.249
-score YOU_INHERIT 2.300
+score YOU_INHERIT 2.399
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
@@ -282,14 +285,12 @@
score BITCOIN_SPAM_10 1.000
score BITCOIN_SPAM_11 1.000
score BITCOIN_SPAM_12 1.000
-score BITCOIN_YOUR_INFO 1.000
score BOGUS_MSM_HDRS 1.000
score BOMB_FREEM 1.000
score BOMB_MONEY 1.000
score BTC_ORG 1.000
score CANT_SEE_AD 1.000
score COMMENT_GIBBERISH 1.000
-score COMPENSATION 1.000
score DAY_I_EARNED 1.000
score DOTGOV_IMAGE 1.000
score DYNAMIC_IMGUR 1.000
@@ -299,7 +300,6 @@
score FBI_SPOOF 1.000
score FONT_INVIS_DOTGOV 1.000
score FORM_LOW_CONTRAST 1.000
-score FOUND_YOU 1.000
score FREEM_FRNUM_UNICD_EMPTY 1.000
score FRNAME_IN_MSG_XPRIO_NO_SUB 1.000
score FROM_NUMERIC_TLD 1.000
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index 9677f58..1abdc81 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -6,15 +6,15 @@
score AC_DIV_BONANZA 0.001 # force non-zero
score AC_FROM_MANY_DOTS 2.999
score AC_HTML_NONSENSE_TAGS 1.999
-score ADMITS_SPAM 4.062
+score ADMITS_SPAM 4.064
score ADVANCE_FEE_2_NEW_FRM_MNY 2.499
score ADVANCE_FEE_2_NEW_MONEY 0.001
score ADVANCE_FEE_3_NEW 0.001
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.809
+score ADVANCE_FEE_3_NEW_FRM_MNY 0.894
score ADVANCE_FEE_3_NEW_MONEY 2.491
-score ADVANCE_FEE_4_NEW 2.518
-score ADVANCE_FEE_4_NEW_FRM_MNY 1.262
-score ADVANCE_FEE_4_NEW_MONEY 0.001
+score ADVANCE_FEE_4_NEW 2.517
+score ADVANCE_FEE_4_NEW_FRM_MNY 1.544
+score ADVANCE_FEE_4_NEW_MONEY 0.001 # force non-zero
score ADVANCE_FEE_5_NEW 2.699
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001
@@ -22,46 +22,45 @@
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
score APP_DEVELOPMENT_NORDNS 1.999
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.046
-score BIGNUM_EMAILS_FREEM 1.118
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.399
+score BIGNUM_EMAILS_FREEM 1.500
score BITCOIN_DEADLINE 2.999
-score BITCOIN_EXTORT_01 1.373
-score BITCOIN_IMGUR 3.304
-score BITCOIN_MALF_HTML 3.499
+score BITCOIN_EXTORT_01 0.999
+score BITCOIN_IMGUR 2.043
+score BITCOIN_MALF_HTML 3.500
score BITCOIN_MALWARE 0.001
-score BITCOIN_SPAM_02 0.343
+score BITCOIN_SPAM_02 1.451
score BITCOIN_SPAM_05 0.001
score BITCOIN_SPAM_07 3.499
-score BITCOIN_XPRIO 1.006
+score BITCOIN_XPRIO 1.004
score BITCOIN_YOUR_INFO 2.999
-score BODY_SINGLE_URI 0.001
+score BODY_SINGLE_URI 0.001 # force non-zero
score BODY_SINGLE_WORD 0.001
-score BODY_URI_ONLY 1.569
-score BOGUS_MIME_VERSION 3.180
+score BODY_URI_ONLY 1.570
+score BOGUS_MIME_VERSION 3.181
score BULK_RE_SUSP_NTLD 0.999
-score CK_HELO_GENERIC 0.001
score CONTENT_AFTER_HTML 2.499
score CTE_8BIT_MISMATCH 0.999
score DATE_IN_FUTURE_96_Q 2.499
-score DEAR_BENEFICIARY 0.001 # force non-zero
+score DEAR_BENEFICIARY 0.001
score DKIMWL_BL 2.999
-score DKIMWL_WL_HIGH -0.001 # force non-zero
+score DKIMWL_WL_HIGH -0.001
score DKIMWL_WL_MED -0.001 # force non-zero
score DSN_NO_MIMEVERSION 1.999
-score EBAY_IMG_NOT_RCVD_EBAY 2.475
-score END_FUTURE_EMAILS 1.818
-score FAKE_REPLY_A1 3.761
-score FAKE_REPLY_B 3.899
+score EBAY_IMG_NOT_RCVD_EBAY 2.182
+score END_FUTURE_EMAILS 1.815
+score FAKE_REPLY_A1 3.674
+score FAKE_REPLY_B 2.244
score FILL_THIS_FORM 0.001
-score FONT_INVIS_DIRECT 3.118
+score FONT_INVIS_DIRECT 3.499
score FONT_INVIS_HTML_NOHTML 2.999
-score FONT_INVIS_MSGID 1.293
-score FONT_INVIS_NORDNS 2.499
+score FONT_INVIS_MSGID 1.285
+score FONT_INVIS_NORDNS 2.500
score FORGED_SPF_HELO 3.099
score FORM_FRAUD 0.999
-score FORM_FRAUD_3 0.001
+score FORM_FRAUD_3 0.001 # force non-zero
score FORM_FRAUD_5 0.001
-score FOUND_YOU 3.249
+score FOUND_YOU 3.250
score FREEMAIL_FORGED_FROMDOMAIN 0.250
score FROM_2_EMAILS_SHORT 2.999
score FROM_ADDR_WS 2.999
@@ -69,79 +68,78 @@
score FROM_FMBLA_NEWDOM14 0.999
score FROM_FMBLA_NEWDOM28 0.799
score FROM_GOV_DKIM_AU -0.001
-score FROM_GOV_SPOOF 0.999
+score FROM_GOV_SPOOF 1.000
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 2.500
+score FROM_MISSP_DYNIP 2.499
score FROM_MISSP_EH_MATCH 0.001
score FROM_MISSP_FREEMAIL 0.001
score FROM_MISSP_MSFT 0.001
score FROM_MISSP_REPLYTO 0.001
score FROM_MISSP_SPF_FAIL 0.001
-score FROM_MISSP_TO_UNDISC 1.791
+score FROM_MISSP_TO_UNDISC 1.771
score FROM_MISSP_USER 0.001
-score FROM_MULTI_NORDNS 3.013
-score FROM_NTLD_LINKBAIT 0.001
-score FROM_NTLD_REPLY_FREEMAIL 1.579
+score FROM_MULTI_NORDNS 3.939
+score FROM_NTLD_LINKBAIT 0.542
+score FROM_NTLD_REPLY_FREEMAIL 1.999
score FROM_PAYPAL_SPOOF 1.599
-score FROM_SUSPICIOUS_NTLD 0.500
-score FROM_SUSPICIOUS_NTLD_FP 0.421
+score FROM_SUSPICIOUS_NTLD 0.499
+score FROM_SUSPICIOUS_NTLD_FP 0.402
score FSL_BULK_SIG 0.001
score FSL_CTYPE_WIN1251 0.001
-score FSL_NEW_HELO_USER 0.001 # force non-zero
+score FSL_NEW_HELO_USER 0.001
score FUZZY_AMAZON 2.499
-score FUZZY_BITCOIN 0.061
+score FUZZY_BITCOIN 0.012
score GB_FAKE_RF_SHORT 1.999
score GB_FREEMAIL_DISPTO 0.499
score GOOGLE_DOC_SUSP 2.999
-score GOOG_REDIR_NORDNS 2.648
-score GOOG_STO_HTML_PHISH 1.224
+score GOOG_REDIR_NORDNS 2.651
+score GOOG_STO_HTML_PHISH 1.395
score GOOG_STO_IMG_HTML 2.999
score GOOG_STO_IMG_NOHTML 2.499
score GOOG_STO_NOIMG_HTML 2.999
-score HAS_X_OUTGOING_SPAM_STAT 1.934
+score HAS_X_OUTGOING_SPAM_STAT 2.358
score HDRS_LCASE 0.099
score HDRS_LCASE_IMGONLY 0.099
-score HDRS_MISSP 0.924
-score HDR_ORDER_FTSDMCXX_DIRECT 1.812
-score HDR_ORDER_FTSDMCXX_NORDNS 3.499
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250
-score HELO_MISC_IP 0.173
+score HDRS_MISSP 0.923
+score HDR_ORDER_FTSDMCXX_DIRECT 1.810
+score HDR_ORDER_FTSDMCXX_NORDNS 3.500
+score HEADER_FROM_DIFFERENT_DOMAINS 0.249
score HELO_NO_DOMAIN 0.001
-score HK_NAME_FM_MR_MRS 1.319
+score HK_NAME_FM_MR_MRS 1.395
score HK_NAME_MR_MRS 0.999
-score HK_RANDOM_FROM 0.999
+score HK_RANDOM_FROM 1.000
score HK_RANDOM_REPLYTO 0.001
score HK_SCAM 0.001
score HK_WIN 0.999
-score HOSTED_IMG_DIRECT_MX 1.679
+score HOSTED_IMG_DIRECT_MX 2.573
score HOSTED_IMG_FREEM 3.499
-score HOSTED_IMG_MULTI 2.110
+score HOSTED_IMG_MULTI 0.585
score HOSTED_IMG_MULTI_PUB_01 2.999
score HTML_OFF_PAGE 2.999
-score HTML_SHRT_CMNT_OBFU_MANY 2.226
-score HTML_SINGLET_MANY 2.430
+score HTML_SHRT_CMNT_OBFU_MANY 1.901
+score HTML_SINGLET_MANY 2.483
score HTML_TEXT_INVISIBLE_FONT 1.999
-score HTML_TEXT_INVISIBLE_STYLE 1.415
+score HTML_TEXT_INVISIBLE_STYLE 1.416
score IMG_ONLY_FM_DOM_INFO 2.499
score JH_SPAMMY_HEADERS 3.499
score KHOP_FAKE_EBAY 0.999
score KHOP_HELO_FCRDNS 0.399
-score LIST_PRTL_SAME_USER 0.738
+score LIST_PRTL_SAME_USER 0.748
score LONG_HEX_URI 0.001
score LONG_IMG_URI 1.615
-score LONG_INVISIBLE_TEXT 1.079
+score LONG_INVISIBLE_TEXT 1.082
score LOTS_OF_MONEY 0.010
-score MALFORMED_FREEMAIL 1.237
-score MALWARE_NORDNS 0.533
+score MALFORMED_FREEMAIL 1.235
+score MALWARE_NORDNS 0.675
score MANY_SPAN_IN_TEXT 2.199
score MAY_BE_FORGED 2.799
score MILLION_HUNDRED 0.001
-score MILLION_USD 0.001 # force non-zero
+score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 0.001
score MIME_NO_TEXT 1.999
-score MIXED_AREA_CASE 1.141
+score MIXED_AREA_CASE 2.126
score MIXED_CENTER_CASE 2.499
-score MIXED_CTYPE_CASE 0.916
+score MIXED_CTYPE_CASE 2.622
score MIXED_ES 2.199
score MIXED_FONT_CASE 2.499
score MIXED_HREF_CASE 1.999
@@ -152,121 +150,121 @@
score MONEY_FRAUD_3 2.699
score MONEY_FRAUD_5 0.001
score MONEY_FRAUD_8 0.001
-score MONEY_FREEMAIL_REPTO 0.523
+score MONEY_FREEMAIL_REPTO 0.447
score MONEY_FROM_41 1.999
score MONEY_FROM_MISSP 0.001
score MONEY_NOHTML 2.499
-score MSGID_HDR_MALF 3.499
-score MSGID_NOFQDN1 0.960
-score MSMAIL_PRI_ABNORMAL 0.766
+score MSGID_HDR_MALF 3.500
+score MSGID_NOFQDN1 1.166
+score MSMAIL_PRI_ABNORMAL 1.499
score MSM_PRIO_REPTO 0.001
-score NAME_EMAIL_DIFF 1.067
-score NA_DOLLARS 1.500
+score NAME_EMAIL_DIFF 0.932
+score NA_DOLLARS 1.499
score NICE_REPLY_A -0.001
-score NORDNS_LOW_CONTRAST 2.312
+score NORDNS_LOW_CONTRAST 2.311
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
score NSL_RCVD_HELO_USER 0.001
-score NUMBEREND_LINKBAIT 0.490
-score ODD_FREEM_REPTO 2.999
-score OFFER_ONLY_AMERICA 1.124
+score NUMBEREND_LINKBAIT 0.476
+score ODD_FREEM_REPTO 2.895
+score OFFER_ONLY_AMERICA 1.202
score ORDER_TODAY 2.499
score PDS_BAD_THREAD_QP_64 0.999
score PDS_BTC_ID 0.499
-score PDS_BTC_MSGID 0.001 # force non-zero
+score PDS_BTC_MSGID 0.001
score PDS_DBL_URL_TNB_RUNON 0.001 # force non-zero
-score PDS_EMPTYSUBJ_URISHRT 0.103
+score PDS_EMPTYSUBJ_URISHRT 0.121
score PDS_FRNOM_TODOM_DBL_URL 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 1.777
-score PDS_FROM_2_EMAILS_SHRTNER 1.244
+score PDS_FROM_2_EMAILS 1.913
+score PDS_FROM_2_EMAILS_SHRTNER 1.499
score PDS_FROM_NAME_TO_DOMAIN 1.999
+score PDS_NAKED_TO_NUMERO 1.383
score PDS_NO_FULL_NAME_SPOOFED_URL 0.749
score PDS_OTHER_BAD_TLD 1.999
score PDS_SHORTFWD_URISHRT_FP 1.499
score PDS_SHORT_SPOOFED_URL 1.999
-score PDS_TINYSUBJ_URISHRT 0.309
+score PDS_TINYSUBJ_URISHRT 0.007
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 PDS_TO_EQ_FROM_NAME 0.700
+score PDS_TO_EQ_FROM_NAME 0.702
score PHP_ORIG_SCRIPT 0.001
score PHP_SCRIPT 2.499
-score PP_MIME_FAKE_ASCII_TEXT 0.862
+score PP_MIME_FAKE_ASCII_TEXT 0.438
score RAND_HEADER_LIST_SPOOF 2.999
score RAND_MKTG_HEADER 1.999
-score RATWARE_NO_RDNS 2.693
+score RATWARE_NO_RDNS 2.243
score RCVD_DOTEDU_SUSP_URI 2.999
score RCVD_IN_MSPIKE_H2 -0.001
score RCVD_IN_RP_CERTIFIED -0.001
score RCVD_IN_RP_RNBL 0.001
score RCVD_IN_RP_SAFE -0.001
-score READY_TO_SHIP 0.474
-score REPTO_419_FRAUD_GM 2.319
-score REPTO_419_FRAUD_QQ 2.561
+score READY_TO_SHIP 0.775
+score REPTO_419_FRAUD_GM 2.520
+score REPTO_419_FRAUD_QQ 2.999
score RISK_FREE 2.899
score SENDGRID_REDIR 0.001
score SERGIO_SUBJECT_VIAGRA01 3.999
score SHOPIFY_IMG_NOT_RCVD_SFY 2.499
-score SHORTENER_SHORT_SUBJ 2.050
+score SHORTENER_SHORT_SUBJ 2.306
score SHORT_IMG_SUSP_NTLD 0.001
-score SHORT_SHORTNER 0.970
+score SHORT_SHORTNER 0.998
score SINGLETS_LOW_CONTRAST 0.001
score SPOOFED_FREEMAIL 1.999
-score SPOOFED_FREEMAIL_NO_RDNS 0.159
+score SPOOFED_FREEMAIL_NO_RDNS 0.166
score SPOOFED_FREEM_REPTO 1.998
score SPOOF_GMAIL_MID 1.499
-score STATIC_XPRIO_OLE 2.000
+score STATIC_XPRIO_OLE 1.999
score STOCK_LOW_CONTRAST 0.001
-score STOX_BOUND_090909_B 1.789
-score THIS_AD 0.876
-score THIS_IS_ADV_SUSP_NTLD 1.262
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.500
-score TO_EQ_FM_DIRECT_MX 2.499
-score TO_EQ_FM_DOM_HTML_IMG 0.391
-score TO_EQ_FM_DOM_HTML_ONLY 0.490
+score THIS_AD 0.873
+score THIS_IS_ADV_SUSP_NTLD 1.499
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
+score TO_EQ_FM_DIRECT_MX 2.500
+score TO_EQ_FM_DOM_HTML_IMG 0.593
+score TO_EQ_FM_DOM_HTML_ONLY 0.483
score TO_EQ_FM_DOM_SPF_FAIL 0.001
score TO_EQ_FM_HTML_ONLY 1.399
score TO_EQ_FM_SPF_FAIL 0.001
score TO_IN_SUBJ 0.100
-score TO_NAME_SUBJ_NO_RDNS 2.242
+score TO_NAME_SUBJ_NO_RDNS 2.238
score TO_NO_BRKTS_FROM_MSSP 0.001
-score TO_NO_BRKTS_HTML_IMG 1.865
+score TO_NO_BRKTS_HTML_IMG 1.870
score TO_NO_BRKTS_HTML_ONLY 1.999
score TO_NO_BRKTS_MSFT 0.001
-score TO_NO_BRKTS_NORDNS_HTML 1.999
+score TO_NO_BRKTS_NORDNS_HTML 2.000
score TO_NO_BRKTS_PCNT 2.499
-score TVD_IP_HEX 1.236
-score TVD_IP_SING_HEX 0.288
-score TVD_RCVD_SPACE_BRACKET 0.532
-score TVD_SPACE_ENCODED 2.114
-score TVD_SPACE_RATIO_MINFP 0.167
+score TVD_IP_HEX 2.028
+score TVD_IP_SING_HEX 2.353
+score TVD_RCVD_SPACE_BRACKET 0.298
+score TVD_SPACE_ENCODED 2.499
+score TVD_SPACE_RATIO_MINFP 0.166
score UNDISC_FREEM 2.799
-score UNDISC_MONEY 1.860
+score UNDISC_MONEY 1.805
score UPGRADE_MAILBOX 0.001
-score URI_DOTDOT_LOW_CNTRST 1.259
-score URI_DOTEDU 0.001 # force non-zero
+score URI_DOTDOT_LOW_CNTRST 1.056
+score URI_DOTEDU 0.001
score URI_FIREBASEAPP 2.999
-score URI_GOOGLE_PROXY 1.628
-score URI_GOOG_STO_SPAMMY 1.856
-score URI_HEX_IP 2.063
-score URI_ONLY_MSGID_MALF 1.390
-score URI_PHISH 2.340
+score URI_GOOGLE_PROXY 1.630
+score URI_GOOG_STO_SPAMMY 2.900
+score URI_HEX_IP 0.361
+score URI_ONLY_MSGID_MALF 1.502
+score URI_PHISH 2.331
score URI_PHP_REDIR 3.499
score URI_TRY_3LD 1.999
score URI_WPADMIN 3.099
score URI_WP_DIRINDEX 3.499
-score URI_WP_HACKED 0.310
+score URI_WP_HACKED 0.324
score URI_WP_HACKED_2 2.499
-score VFY_ACCT_NORDNS 2.905
+score VFY_ACCT_NORDNS 2.907
score WANT_TO_ORDER 2.499
-score WIKI_IMG 2.565
+score WIKI_IMG 2.698
score XFER_LOTSA_MONEY 0.999
-score XM_DIGITS_ONLY 2.992
+score XM_DIGITS_ONLY 1.454
score XM_RANDOM 2.999
-score XM_RECPTID 2.526
-score XPRIO_URL_SHORTNER 0.001
+score XM_RECPTID 2.527
+score XPRIO_URL_SHORTNER 0.792
score YOUR_DELIVERY_ADDRESS 1.249
score YOU_INHERIT 2.699
score AC_POST_EXTRAS 1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index a6748b2..0045980 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -1,259 +1,262 @@
-# Using score set 0 logs for revision 1888465 from:
-# ham-axb-coi-bulk.r1888465.log ham-axb-generic.r1888465.log ham-axb-ham-misc.r1888465.log ham-darxus.r1888465.log ham-ena-week0.r1888465.log ham-ena-week1.r1888465.log ham-ena-week2.r1888465.log ham-ena-week3.r1888465.log ham-ena-week4.r1888465.log ham-giovanni-ham.r1888465.log ham-giovanni-spammy.r1888465.log ham-giovanni-spam.r1888465.log ham-grenier.r1888465.log ham-jhardin.r1888465.log ham-llanga.r1888465.log ham-mmiroslaw-mails-ham.r1888465.log ham-mmiroslaw-mails-spam.r1888465.log ham-pds.r1888465.log ham-sihde.r1888465.log ham-spamsponge.r1888465.log ham-thendrikx.r1888465.log spam-axb-coi-bulk.r1888465.log spam-axb-generic.r1888465.log spam-axb-ham-misc.r1888465.log spam-darxus.r1888465.log spam-ena-week0.r1888465.log spam-ena-week1.r1888465.log spam-ena-week2.r1888465.log spam-ena-week3.r1888465.log spam-ena-week4.r1888465.log spam-giovanni-ham.r1888465.log spam-giovanni-spammy.r1888465.log spam-giovanni-spam.r1888465.log spam-grenier.r1888465.log spam-jhardin.r1888465.log spam-llanga.r1888465.log spam-mmiroslaw-mails-ham.r1888465.log spam-mmiroslaw-mails-spam.r1888465.log spam-pds.r1888465.log spam-sihde.r1888465.log spam-spamsponge.r1888465.log spam-thendrikx.r1888465.log
+# Using score set 0 logs for revision 1888502 from:
+# ham-axb-coi-bulk.r1888502.log ham-axb-generic.r1888502.log ham-axb-ham-misc.r1888502.log ham-darxus.r1888502.log ham-ena-week0.r1888502.log ham-ena-week1.r1888502.log ham-ena-week2.r1888502.log ham-ena-week3.r1888502.log ham-ena-week4.r1888502.log ham-giovanni-ham.r1888502.log ham-giovanni-spammy.r1888502.log ham-giovanni-spam.r1888502.log ham-grenier.r1888502.log ham-jhardin.r1888502.log ham-llanga.r1888502.log ham-mmiroslaw-mails-ham.r1888502.log ham-mmiroslaw-mails-spam.r1888502.log ham-pds.r1888502.log ham-sihde.r1888502.log ham-spamsponge.r1888502.log ham-thendrikx.r1888502.log spam-axb-coi-bulk.r1888502.log spam-axb-generic.r1888502.log spam-axb-ham-misc.r1888502.log spam-darxus.r1888502.log spam-ena-week0.r1888502.log spam-ena-week1.r1888502.log spam-ena-week2.r1888502.log spam-ena-week3.r1888502.log spam-ena-week4.r1888502.log spam-giovanni-ham.r1888502.log spam-giovanni-spammy.r1888502.log spam-giovanni-spam.r1888502.log spam-grenier.r1888502.log spam-jhardin.r1888502.log spam-llanga.r1888502.log spam-mmiroslaw-mails-ham.r1888502.log spam-mmiroslaw-mails-spam.r1888502.log spam-pds.r1888502.log spam-sihde.r1888502.log spam-spamsponge.r1888502.log spam-thendrikx.r1888502.log
score ACCT_PHISHING_MANY 2.999
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001
score AC_FROM_MANY_DOTS 2.999
score AC_HTML_NONSENSE_TAGS 1.999
-score ADMITS_SPAM 4.200
-score ADVANCE_FEE_2_NEW_FRM_MNY 1.536
+score ADMITS_SPAM 4.199
+score ADVANCE_FEE_2_NEW_FRM_MNY 2.499
score ADVANCE_FEE_2_NEW_MONEY 1.999
-score ADVANCE_FEE_3_NEW 3.499
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_3_NEW_MONEY 2.492
+score ADVANCE_FEE_3_NEW 3.500
+score ADVANCE_FEE_3_NEW_FRM_MNY 1.608
+score ADVANCE_FEE_3_NEW_MONEY 2.504
score ADVANCE_FEE_4_NEW 2.699
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 0.244
+score ADVANCE_FEE_4_NEW_MONEY 0.248
score ADVANCE_FEE_5_NEW 2.499
-score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
+score ADVANCE_FEE_5_NEW_FRM_MNY 2.033
score ADVANCE_FEE_5_NEW_MONEY 0.001
-score ALIBABA_IMG_NOT_RCVD_ALI 1.073
+score ALIBABA_IMG_NOT_RCVD_ALI 2.499
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
-score APP_DEVELOPMENT_NORDNS 1.226
+score APP_DEVELOPMENT_NORDNS 1.221
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.367
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.588
score BIGNUM_EMAILS_FREEM 2.999
-score BITCOIN_DEADLINE 1.702
-score BITCOIN_EXTORT_01 1.691
-score BITCOIN_IMGUR 2.998
+score BITCOIN_DEADLINE 1.664
+score BITCOIN_EXTORT_01 1.700
+score BITCOIN_IMGUR 2.508
score BITCOIN_MALF_HTML 3.499
-score BITCOIN_MALWARE 2.798
-score BITCOIN_SPAM_02 1.971
+score BITCOIN_MALWARE 2.837
+score BITCOIN_SPAM_02 1.742
score BITCOIN_SPAM_07 3.499
score BITCOIN_XPRIO 2.499
-score BODY_SINGLE_URI 0.735
-score BODY_SINGLE_WORD 0.243
-score BODY_URI_ONLY 1.806
+score BITCOIN_YOUR_INFO 2.512
+score BODY_SINGLE_URI 2.499
+score BODY_SINGLE_WORD 0.244
+score BODY_URI_ONLY 1.956
score BOGUS_MIME_VERSION 3.499
-score BULK_RE_SUSP_NTLD 1.000
-score CK_HELO_GENERIC 0.250
-score CONTENT_AFTER_HTML 2.499
-score CTE_8BIT_MISMATCH 1.000
-score DATE_IN_FUTURE_96_Q 2.398
+score BULK_RE_SUSP_NTLD 0.999
+score COMPENSATION 1.499
+score CONTENT_AFTER_HTML 2.500
+score CTE_8BIT_MISMATCH 0.999
+score DATE_IN_FUTURE_96_Q 2.499
score DEAR_BENEFICIARY 0.001
score DSN_NO_MIMEVERSION 1.999
-score EBAY_IMG_NOT_RCVD_EBAY 2.596
+score EBAY_IMG_NOT_RCVD_EBAY 2.546
score END_FUTURE_EMAILS 2.098
-score FAKE_REPLY_A1 4.099
+score FAKE_REPLY_A1 3.966
score FAKE_REPLY_B 3.999
score FILL_THIS_FORM 1.199
-score FONT_INVIS_DIRECT 1.531
+score FONT_INVIS_DIRECT 2.209
score FONT_INVIS_HTML_NOHTML 2.999
-score FONT_INVIS_LONG_LINE 2.999
+score FONT_INVIS_LONG_LINE 2.313
score FONT_INVIS_MSGID 2.499
-score FONT_INVIS_NORDNS 2.500
-score FONT_INVIS_POSTEXTRAS 3.179
+score FONT_INVIS_NORDNS 2.499
+score FONT_INVIS_POSTEXTRAS 3.176
score FORM_FRAUD 0.999
score FORM_FRAUD_3 0.001
-score FORM_FRAUD_5 0.001
-score FREEMAIL_FORGED_FROMDOMAIN 0.249
+score FORM_FRAUD_5 0.001 # force non-zero
+score FOUND_YOU 3.249
+score FREEMAIL_FORGED_FROMDOMAIN 0.250
score FROM_2_EMAILS_SHORT 2.999
score FROM_ADDR_WS 2.999
-score FROM_MISSPACED 1.141
+score FROM_MISSPACED 0.001
score FROM_MISSP_DYNIP 0.001
score FROM_MISSP_EH_MATCH 0.001
-score FROM_MISSP_FREEMAIL 0.001
+score FROM_MISSP_FREEMAIL 1.566
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_REPLYTO 1.801
-score FROM_MISSP_TO_UNDISC 1.185
+score FROM_MISSP_REPLYTO 1.802
+score FROM_MISSP_TO_UNDISC 0.001
score FROM_MISSP_USER 0.001
-score FROM_MULTI_NORDNS 0.354
-score FROM_NTLD_LINKBAIT 0.510
-score FROM_NTLD_REPLY_FREEMAIL 1.358
+score FROM_MULTI_NORDNS 0.347
+score FROM_NTLD_LINKBAIT 0.903
+score FROM_NTLD_REPLY_FREEMAIL 1.999
score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 2.000
+score FROM_SUSPICIOUS_NTLD_FP 1.999
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FUZZY_AMAZON 2.700
+score FUZZY_AMAZON 2.699
score FUZZY_BITCOIN 2.399
score GB_FAKE_RF_SHORT 1.999
-score GB_FREEMAIL_DISPTO 0.486
+score GB_FREEMAIL_DISPTO 0.499
score GB_FREEMAIL_DISPTO_NOTFREEM 0.500
score GOOGLE_DOC_SUSP 2.999
-score GOOG_REDIR_NORDNS 2.602
-score GOOG_STO_HTML_PHISH 2.212
+score GOOG_REDIR_NORDNS 2.601
+score GOOG_STO_HTML_PHISH 2.644
score GOOG_STO_IMG_HTML 2.999
score GOOG_STO_IMG_NOHTML 2.499
score GOOG_STO_NOIMG_HTML 2.999
-score HAS_X_OUTGOING_SPAM_STAT 2.963
-score HDRS_LCASE 0.099
-score HDRS_LCASE_IMGONLY 0.099
+score HAS_X_OUTGOING_SPAM_STAT 2.803
+score HDRS_LCASE 0.100
+score HDRS_LCASE_IMGONLY 0.100
score HDRS_MISSP 2.499
score HDR_ORDER_FTSDMCXX_DIRECT 1.999
-score HDR_ORDER_FTSDMCXX_NORDNS 3.499
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250
-score HELO_MISC_IP 0.001
+score HDR_ORDER_FTSDMCXX_NORDNS 3.028
+score HEADER_FROM_DIFFERENT_DOMAINS 0.249
score HELO_NO_DOMAIN 0.001
-score HK_NAME_FM_MR_MRS 1.499
+score HK_NAME_FM_MR_MRS 1.500
score HK_NAME_MR_MRS 0.999
-score HK_RANDOM_FROM 0.501
+score HK_RANDOM_FROM 0.261
score HK_RANDOM_REPLYTO 0.001
score HK_SCAM 0.001
score HK_WIN 0.999
-score HOSTED_IMG_DIRECT_MX 2.768
+score HOSTED_IMG_DIRECT_MX 2.460
score HOSTED_IMG_FREEM 3.499
-score HOSTED_IMG_MULTI 2.059
-score HOSTED_IMG_MULTI_PUB_01 2.600
+score HOSTED_IMG_MULTI 2.058
+score HOSTED_IMG_MULTI_PUB_01 2.597
score HTML_OFF_PAGE 2.999
-score HTML_SHRT_CMNT_OBFU_MANY 0.816
+score HTML_SHRT_CMNT_OBFU_MANY 0.766
score HTML_SINGLET_MANY 2.499
score HTML_TEXT_INVISIBLE_FONT 1.999
-score HTML_TEXT_INVISIBLE_STYLE 1.866
-score IMG_ONLY_FM_DOM_INFO 0.001
-score JH_SPAMMY_HEADERS 3.500
-score KHOP_FAKE_EBAY 0.174
-score KHOP_HELO_FCRDNS 0.400
+score HTML_TEXT_INVISIBLE_STYLE 0.299
+score IMG_ONLY_FM_DOM_INFO 0.041
+score JH_SPAMMY_HEADERS 3.499
+score KHOP_FAKE_EBAY 0.007
+score KHOP_HELO_FCRDNS 0.399
score LIST_PRTL_SAME_USER 0.001
-score LONG_HEX_URI 2.411
-score LONG_IMG_URI 0.639
-score LONG_INVISIBLE_TEXT 1.423
+score LONG_HEX_URI 1.787
+score LONG_IMG_URI 0.507
+score LONG_INVISIBLE_TEXT 1.876
score LOTS_OF_MONEY 0.010
score LOTTO_DEPT 0.001
score MALFORMED_FREEMAIL 3.299
-score MALWARE_NORDNS 0.001 # force non-zero
+score MALWARE_NORDNS 0.001
score MANY_SPAN_IN_TEXT 2.299
score MAY_BE_FORGED 2.491
score MILLION_HUNDRED 0.001
score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 1.999
score MIME_NO_TEXT 1.999
-score MIXED_AREA_CASE 1.286
+score MIXED_AREA_CASE 0.805
score MIXED_CENTER_CASE 2.499
-score MIXED_CTYPE_CASE 3.599
-score MIXED_ES 2.400
+score MIXED_CTYPE_CASE 1.855
+score MIXED_ES 2.399
score MIXED_FONT_CASE 1.637
score MIXED_HREF_CASE 1.999
score MIXED_IMG_CASE 2.999
score MONEY_ATM_CARD 0.001
score MONEY_FORM 0.001
-score MONEY_FORM_SHORT 0.001
+score MONEY_FORM_SHORT 1.243
score MONEY_FRAUD_3 2.799
score MONEY_FRAUD_5 0.001
-score MONEY_FRAUD_8 0.001
+score MONEY_FRAUD_8 0.001 # force non-zero
score MONEY_FREEMAIL_REPTO 2.999
-score MONEY_FROM_41 1.999
+score MONEY_FROM_41 1.989
score MONEY_FROM_MISSP 0.001
score MONEY_NOHTML 2.499
-score MSGID_HDR_MALF 2.910
-score MSGID_NOFQDN1 0.393
-score MSMAIL_PRI_ABNORMAL 0.576
-score NAME_EMAIL_DIFF 1.141
+score MSGID_HDR_MALF 2.727
+score MSGID_NOFQDN1 0.499
+score MSMAIL_PRI_ABNORMAL 1.276
+score NAME_EMAIL_DIFF 1.450
score NA_DOLLARS 1.499
score NICE_REPLY_A -0.001
-score NORDNS_LOW_CONTRAST 1.886
-score NO_FM_NAME_IP_HOSTN 0.001
+score NORDNS_LOW_CONTRAST 1.884
+score NO_FM_NAME_IP_HOSTN 0.041
score NSL_RCVD_FROM_USER 0.001
score NSL_RCVD_HELO_USER 0.001
-score NUMBEREND_LINKBAIT 0.128
+score NUMBEREND_LINKBAIT 0.661
score OBFU_BITCOIN 0.001
score OBFU_UNSUB_UL 2.299
-score ODD_FREEM_REPTO 3.000
-score OFFER_ONLY_AMERICA 0.924
-score ORDER_TODAY 2.412
-score PDS_BAD_THREAD_QP_64 0.999
+score ODD_FREEM_REPTO 2.999
+score OFFER_ONLY_AMERICA 0.693
+score ORDER_TODAY 2.469
+score PDS_BAD_THREAD_QP_64 1.000
score PDS_BTC_ID 0.499
score PDS_BTC_MSGID 0.001
-score PDS_DBL_URL_TNB_RUNON 0.898
+score PDS_DBL_URL_TNB_RUNON 1.186
score PDS_EMPTYSUBJ_URISHRT 0.001
-score PDS_FRNOM_TODOM_DBL_URL 1.441
+score PDS_FRNOM_TODOM_DBL_URL 1.432
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 1.995
-score PDS_FROM_2_EMAILS_SHRTNER 0.001
+score PDS_FROM_2_EMAILS 1.687
+score PDS_FROM_2_EMAILS_SHRTNER 1.039
score PDS_FROM_NAME_TO_DOMAIN 1.999
-score PDS_NO_FULL_NAME_SPOOFED_URL 0.749
+score PDS_NAKED_TO_NUMERO 1.999
+score PDS_NO_FULL_NAME_SPOOFED_URL 0.144
score PDS_OTHER_BAD_TLD 1.999
-score PDS_SHORTFWD_URISHRT_FP 1.500
-score PDS_SHORT_SPOOFED_URL 1.999
-score PDS_TINYSUBJ_URISHRT 1.499
+score PDS_SHORTFWD_URISHRT_FP 1.499
+score PDS_SHORT_SPOOFED_URL 1.124
+score PDS_TINYSUBJ_URISHRT 1.400
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 PDS_TO_EQ_FROM_NAME 3.199
-score PHP_ORIG_SCRIPT 0.034
-score PHP_SCRIPT 2.215
-score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RAND_HEADER_LIST_SPOOF 2.999
+score PDS_TO_EQ_FROM_NAME 3.099
+score PHP_ORIG_SCRIPT 0.001
+score PHP_SCRIPT 2.339
+score PP_MIME_FAKE_ASCII_TEXT 1.000
+score RAND_HEADER_LIST_SPOOF 3.000
score RAND_MKTG_HEADER 1.999
-score RATWARE_NO_RDNS 2.057
-score RCVD_DOTEDU_SUSP_URI 3.000
-score RDNS_NUM_TLD_XM 2.225
-score READY_TO_SHIP 0.914
+score RATWARE_NO_RDNS 0.973
+score RCVD_DOTEDU_SUSP_URI 2.999
+score RDNS_NUM_TLD_XM 2.335
+score READY_TO_SHIP 0.001
score REPTO_419_FRAUD_GM 2.999
-score REPTO_419_FRAUD_QQ 2.999
-score RISK_FREE 2.899
-score SENDGRID_REDIR 1.499
-score SERGIO_SUBJECT_VIAGRA01 3.956
+score REPTO_419_FRAUD_QQ 3.000
+score RISK_FREE 2.799
+score SENDGRID_REDIR 1.500
+score SERGIO_SUBJECT_VIAGRA01 3.556
score SHOPIFY_IMG_NOT_RCVD_SFY 2.499
score SHORTENER_SHORT_SUBJ 2.999
score SHORT_IMG_SUSP_NTLD 0.001
score SHORT_SHORTNER 1.999
score SINGLETS_LOW_CONTRAST 0.001
score SPOOFED_FREEMAIL_NO_RDNS 1.499
-score SPOOF_GMAIL_MID 1.500
+score SPOOF_GMAIL_MID 1.499
score STATIC_XPRIO_OLE 1.999
-score STOCK_LOW_CONTRAST 0.614
-score STOX_BOUND_090909_B 0.001
-score THIS_AD 1.299
-score THIS_IS_ADV_SUSP_NTLD 0.456
+score STOCK_LOW_CONTRAST 1.240
+score SUBJ_ATTENTION 0.499
+score THIS_AD 1.199
+score THIS_IS_ADV_SUSP_NTLD 1.499
+score THREAD_INDEX_HEX 0.865
score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
-score TO_EQ_FM_DIRECT_MX 0.001
-score TO_EQ_FM_DOM_HTML_IMG 0.001 # force non-zero
+score TO_EQ_FM_DIRECT_MX 0.001 # force non-zero
+score TO_EQ_FM_DOM_HTML_IMG 0.001
score TO_EQ_FM_DOM_HTML_ONLY 1.699
-score TO_EQ_FM_HTML_ONLY 1.289
+score TO_EQ_FM_HTML_ONLY 1.288
score TO_IN_SUBJ 0.100
-score TO_NAME_SUBJ_NO_RDNS 2.499
-score TO_NO_BRKTS_FROM_MSSP 1.956
+score TO_NAME_SUBJ_NO_RDNS 1.932
+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 0.488
-score TO_NO_BRKTS_NORDNS_HTML 1.999
+score TO_NO_BRKTS_MSFT 0.491
+score TO_NO_BRKTS_NORDNS_HTML 2.000
score TO_NO_BRKTS_PCNT 2.499
-score TVD_IP_HEX 3.099
-score TVD_IP_SING_HEX 2.531
+score TVD_IP_HEX 3.036
+score TVD_IP_SING_HEX 0.145
score TVD_RCVD_SPACE_BRACKET 2.799
-score TVD_SPACE_ENCODED 2.500
+score TVD_SPACE_ENCODED 2.499
score TVD_SPACE_RATIO_MINFP 2.499
score UNDISC_FREEM 2.999
score UNDISC_MONEY 3.399
score UPGRADE_MAILBOX 1.099
-score URI_DOTDOT_LOW_CNTRST 2.499
+score URI_DOTDOT_LOW_CNTRST 0.440
score URI_DOTEDU 1.999
score URI_FIREBASEAPP 2.999
-score URI_GOOGLE_PROXY 3.099
-score URI_GOOG_STO_SPAMMY 2.916
-score URI_HEX_IP 1.389
-score URI_LONG_REPEAT 1.538
+score URI_GOOGLE_PROXY 3.100
+score URI_GOOG_STO_SPAMMY 2.158
+score URI_HEX_IP 2.499
+score URI_LONG_REPEAT 1.734
score URI_ONLY_MSGID_MALF 1.999
-score URI_PHISH 3.999
+score URI_PHISH 4.000
score URI_PHP_REDIR 3.499
score URI_TRY_3LD 1.999
score URI_WPADMIN 3.299
-score URI_WP_DIRINDEX 3.499
+score URI_WP_DIRINDEX 2.399
score URI_WP_HACKED 3.499
score URI_WP_HACKED_2 2.499
-score VFY_ACCT_NORDNS 0.001
-score WANT_TO_ORDER 2.499
+score VFY_ACCT_NORDNS 0.005
+score WANT_TO_ORDER 2.500
score WIKI_IMG 3.199
-score XFER_LOTSA_MONEY 0.001
-score XM_DIGITS_ONLY 2.055
+score XFER_LOTSA_MONEY 0.242
+score XM_DIGITS_ONLY 2.360
score XM_RANDOM 2.999
score XM_RECPTID 2.999
score XPRIO 0.001
score XPRIO_URL_SHORTNER 0.999
score YOUR_DELIVERY_ADDRESS 1.249
-score YOU_INHERIT 2.300
+score YOU_INHERIT 2.399
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
@@ -282,14 +285,12 @@
score BITCOIN_SPAM_10 1.000
score BITCOIN_SPAM_11 1.000
score BITCOIN_SPAM_12 1.000
-score BITCOIN_YOUR_INFO 1.000
score BOGUS_MSM_HDRS 1.000
score BOMB_FREEM 1.000
score BOMB_MONEY 1.000
score BTC_ORG 1.000
score CANT_SEE_AD 1.000
score COMMENT_GIBBERISH 1.000
-score COMPENSATION 1.000
score DAY_I_EARNED 1.000
score DOTGOV_IMAGE 1.000
score DYNAMIC_IMGUR 1.000
@@ -299,7 +300,6 @@
score FBI_SPOOF 1.000
score FONT_INVIS_DOTGOV 1.000
score FORM_LOW_CONTRAST 1.000
-score FOUND_YOU 1.000
score FREEM_FRNUM_UNICD_EMPTY 1.000
score FRNAME_IN_MSG_XPRIO_NO_SUB 1.000
score FROM_NUMERIC_TLD 1.000
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index 9677f58..1abdc81 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -6,15 +6,15 @@
score AC_DIV_BONANZA 0.001 # force non-zero
score AC_FROM_MANY_DOTS 2.999
score AC_HTML_NONSENSE_TAGS 1.999
-score ADMITS_SPAM 4.062
+score ADMITS_SPAM 4.064
score ADVANCE_FEE_2_NEW_FRM_MNY 2.499
score ADVANCE_FEE_2_NEW_MONEY 0.001
score ADVANCE_FEE_3_NEW 0.001
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.809
+score ADVANCE_FEE_3_NEW_FRM_MNY 0.894
score ADVANCE_FEE_3_NEW_MONEY 2.491
-score ADVANCE_FEE_4_NEW 2.518
-score ADVANCE_FEE_4_NEW_FRM_MNY 1.262
-score ADVANCE_FEE_4_NEW_MONEY 0.001
+score ADVANCE_FEE_4_NEW 2.517
+score ADVANCE_FEE_4_NEW_FRM_MNY 1.544
+score ADVANCE_FEE_4_NEW_MONEY 0.001 # force non-zero
score ADVANCE_FEE_5_NEW 2.699
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001
@@ -22,46 +22,45 @@
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
score APP_DEVELOPMENT_NORDNS 1.999
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.046
-score BIGNUM_EMAILS_FREEM 1.118
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.399
+score BIGNUM_EMAILS_FREEM 1.500
score BITCOIN_DEADLINE 2.999
-score BITCOIN_EXTORT_01 1.373
-score BITCOIN_IMGUR 3.304
-score BITCOIN_MALF_HTML 3.499
+score BITCOIN_EXTORT_01 0.999
+score BITCOIN_IMGUR 2.043
+score BITCOIN_MALF_HTML 3.500
score BITCOIN_MALWARE 0.001
-score BITCOIN_SPAM_02 0.343
+score BITCOIN_SPAM_02 1.451
score BITCOIN_SPAM_05 0.001
score BITCOIN_SPAM_07 3.499
-score BITCOIN_XPRIO 1.006
+score BITCOIN_XPRIO 1.004
score BITCOIN_YOUR_INFO 2.999
-score BODY_SINGLE_URI 0.001
+score BODY_SINGLE_URI 0.001 # force non-zero
score BODY_SINGLE_WORD 0.001
-score BODY_URI_ONLY 1.569
-score BOGUS_MIME_VERSION 3.180
+score BODY_URI_ONLY 1.570
+score BOGUS_MIME_VERSION 3.181
score BULK_RE_SUSP_NTLD 0.999
-score CK_HELO_GENERIC 0.001
score CONTENT_AFTER_HTML 2.499
score CTE_8BIT_MISMATCH 0.999
score DATE_IN_FUTURE_96_Q 2.499
-score DEAR_BENEFICIARY 0.001 # force non-zero
+score DEAR_BENEFICIARY 0.001
score DKIMWL_BL 2.999
-score DKIMWL_WL_HIGH -0.001 # force non-zero
+score DKIMWL_WL_HIGH -0.001
score DKIMWL_WL_MED -0.001 # force non-zero
score DSN_NO_MIMEVERSION 1.999
-score EBAY_IMG_NOT_RCVD_EBAY 2.475
-score END_FUTURE_EMAILS 1.818
-score FAKE_REPLY_A1 3.761
-score FAKE_REPLY_B 3.899
+score EBAY_IMG_NOT_RCVD_EBAY 2.182
+score END_FUTURE_EMAILS 1.815
+score FAKE_REPLY_A1 3.674
+score FAKE_REPLY_B 2.244
score FILL_THIS_FORM 0.001
-score FONT_INVIS_DIRECT 3.118
+score FONT_INVIS_DIRECT 3.499
score FONT_INVIS_HTML_NOHTML 2.999
-score FONT_INVIS_MSGID 1.293
-score FONT_INVIS_NORDNS 2.499
+score FONT_INVIS_MSGID 1.285
+score FONT_INVIS_NORDNS 2.500
score FORGED_SPF_HELO 3.099
score FORM_FRAUD 0.999
-score FORM_FRAUD_3 0.001
+score FORM_FRAUD_3 0.001 # force non-zero
score FORM_FRAUD_5 0.001
-score FOUND_YOU 3.249
+score FOUND_YOU 3.250
score FREEMAIL_FORGED_FROMDOMAIN 0.250
score FROM_2_EMAILS_SHORT 2.999
score FROM_ADDR_WS 2.999
@@ -69,79 +68,78 @@
score FROM_FMBLA_NEWDOM14 0.999
score FROM_FMBLA_NEWDOM28 0.799
score FROM_GOV_DKIM_AU -0.001
-score FROM_GOV_SPOOF 0.999
+score FROM_GOV_SPOOF 1.000
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 2.500
+score FROM_MISSP_DYNIP 2.499
score FROM_MISSP_EH_MATCH 0.001
score FROM_MISSP_FREEMAIL 0.001
score FROM_MISSP_MSFT 0.001
score FROM_MISSP_REPLYTO 0.001
score FROM_MISSP_SPF_FAIL 0.001
-score FROM_MISSP_TO_UNDISC 1.791
+score FROM_MISSP_TO_UNDISC 1.771
score FROM_MISSP_USER 0.001
-score FROM_MULTI_NORDNS 3.013
-score FROM_NTLD_LINKBAIT 0.001
-score FROM_NTLD_REPLY_FREEMAIL 1.579
+score FROM_MULTI_NORDNS 3.939
+score FROM_NTLD_LINKBAIT 0.542
+score FROM_NTLD_REPLY_FREEMAIL 1.999
score FROM_PAYPAL_SPOOF 1.599
-score FROM_SUSPICIOUS_NTLD 0.500
-score FROM_SUSPICIOUS_NTLD_FP 0.421
+score FROM_SUSPICIOUS_NTLD 0.499
+score FROM_SUSPICIOUS_NTLD_FP 0.402
score FSL_BULK_SIG 0.001
score FSL_CTYPE_WIN1251 0.001
-score FSL_NEW_HELO_USER 0.001 # force non-zero
+score FSL_NEW_HELO_USER 0.001
score FUZZY_AMAZON 2.499
-score FUZZY_BITCOIN 0.061
+score FUZZY_BITCOIN 0.012
score GB_FAKE_RF_SHORT 1.999
score GB_FREEMAIL_DISPTO 0.499
score GOOGLE_DOC_SUSP 2.999
-score GOOG_REDIR_NORDNS 2.648
-score GOOG_STO_HTML_PHISH 1.224
+score GOOG_REDIR_NORDNS 2.651
+score GOOG_STO_HTML_PHISH 1.395
score GOOG_STO_IMG_HTML 2.999
score GOOG_STO_IMG_NOHTML 2.499
score GOOG_STO_NOIMG_HTML 2.999
-score HAS_X_OUTGOING_SPAM_STAT 1.934
+score HAS_X_OUTGOING_SPAM_STAT 2.358
score HDRS_LCASE 0.099
score HDRS_LCASE_IMGONLY 0.099
-score HDRS_MISSP 0.924
-score HDR_ORDER_FTSDMCXX_DIRECT 1.812
-score HDR_ORDER_FTSDMCXX_NORDNS 3.499
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250
-score HELO_MISC_IP 0.173
+score HDRS_MISSP 0.923
+score HDR_ORDER_FTSDMCXX_DIRECT 1.810
+score HDR_ORDER_FTSDMCXX_NORDNS 3.500
+score HEADER_FROM_DIFFERENT_DOMAINS 0.249
score HELO_NO_DOMAIN 0.001
-score HK_NAME_FM_MR_MRS 1.319
+score HK_NAME_FM_MR_MRS 1.395
score HK_NAME_MR_MRS 0.999
-score HK_RANDOM_FROM 0.999
+score HK_RANDOM_FROM 1.000
score HK_RANDOM_REPLYTO 0.001
score HK_SCAM 0.001
score HK_WIN 0.999
-score HOSTED_IMG_DIRECT_MX 1.679
+score HOSTED_IMG_DIRECT_MX 2.573
score HOSTED_IMG_FREEM 3.499
-score HOSTED_IMG_MULTI 2.110
+score HOSTED_IMG_MULTI 0.585
score HOSTED_IMG_MULTI_PUB_01 2.999
score HTML_OFF_PAGE 2.999
-score HTML_SHRT_CMNT_OBFU_MANY 2.226
-score HTML_SINGLET_MANY 2.430
+score HTML_SHRT_CMNT_OBFU_MANY 1.901
+score HTML_SINGLET_MANY 2.483
score HTML_TEXT_INVISIBLE_FONT 1.999
-score HTML_TEXT_INVISIBLE_STYLE 1.415
+score HTML_TEXT_INVISIBLE_STYLE 1.416
score IMG_ONLY_FM_DOM_INFO 2.499
score JH_SPAMMY_HEADERS 3.499
score KHOP_FAKE_EBAY 0.999
score KHOP_HELO_FCRDNS 0.399
-score LIST_PRTL_SAME_USER 0.738
+score LIST_PRTL_SAME_USER 0.748
score LONG_HEX_URI 0.001
score LONG_IMG_URI 1.615
-score LONG_INVISIBLE_TEXT 1.079
+score LONG_INVISIBLE_TEXT 1.082
score LOTS_OF_MONEY 0.010
-score MALFORMED_FREEMAIL 1.237
-score MALWARE_NORDNS 0.533
+score MALFORMED_FREEMAIL 1.235
+score MALWARE_NORDNS 0.675
score MANY_SPAN_IN_TEXT 2.199
score MAY_BE_FORGED 2.799
score MILLION_HUNDRED 0.001
-score MILLION_USD 0.001 # force non-zero
+score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 0.001
score MIME_NO_TEXT 1.999
-score MIXED_AREA_CASE 1.141
+score MIXED_AREA_CASE 2.126
score MIXED_CENTER_CASE 2.499
-score MIXED_CTYPE_CASE 0.916
+score MIXED_CTYPE_CASE 2.622
score MIXED_ES 2.199
score MIXED_FONT_CASE 2.499
score MIXED_HREF_CASE 1.999
@@ -152,121 +150,121 @@
score MONEY_FRAUD_3 2.699
score MONEY_FRAUD_5 0.001
score MONEY_FRAUD_8 0.001
-score MONEY_FREEMAIL_REPTO 0.523
+score MONEY_FREEMAIL_REPTO 0.447
score MONEY_FROM_41 1.999
score MONEY_FROM_MISSP 0.001
score MONEY_NOHTML 2.499
-score MSGID_HDR_MALF 3.499
-score MSGID_NOFQDN1 0.960
-score MSMAIL_PRI_ABNORMAL 0.766
+score MSGID_HDR_MALF 3.500
+score MSGID_NOFQDN1 1.166
+score MSMAIL_PRI_ABNORMAL 1.499
score MSM_PRIO_REPTO 0.001
-score NAME_EMAIL_DIFF 1.067
-score NA_DOLLARS 1.500
+score NAME_EMAIL_DIFF 0.932
+score NA_DOLLARS 1.499
score NICE_REPLY_A -0.001
-score NORDNS_LOW_CONTRAST 2.312
+score NORDNS_LOW_CONTRAST 2.311
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
score NSL_RCVD_HELO_USER 0.001
-score NUMBEREND_LINKBAIT 0.490
-score ODD_FREEM_REPTO 2.999
-score OFFER_ONLY_AMERICA 1.124
+score NUMBEREND_LINKBAIT 0.476
+score ODD_FREEM_REPTO 2.895
+score OFFER_ONLY_AMERICA 1.202
score ORDER_TODAY 2.499
score PDS_BAD_THREAD_QP_64 0.999
score PDS_BTC_ID 0.499
-score PDS_BTC_MSGID 0.001 # force non-zero
+score PDS_BTC_MSGID 0.001
score PDS_DBL_URL_TNB_RUNON 0.001 # force non-zero
-score PDS_EMPTYSUBJ_URISHRT 0.103
+score PDS_EMPTYSUBJ_URISHRT 0.121
score PDS_FRNOM_TODOM_DBL_URL 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 1.777
-score PDS_FROM_2_EMAILS_SHRTNER 1.244
+score PDS_FROM_2_EMAILS 1.913
+score PDS_FROM_2_EMAILS_SHRTNER 1.499
score PDS_FROM_NAME_TO_DOMAIN 1.999
+score PDS_NAKED_TO_NUMERO 1.383
score PDS_NO_FULL_NAME_SPOOFED_URL 0.749
score PDS_OTHER_BAD_TLD 1.999
score PDS_SHORTFWD_URISHRT_FP 1.499
score PDS_SHORT_SPOOFED_URL 1.999
-score PDS_TINYSUBJ_URISHRT 0.309
+score PDS_TINYSUBJ_URISHRT 0.007
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 PDS_TO_EQ_FROM_NAME 0.700
+score PDS_TO_EQ_FROM_NAME 0.702
score PHP_ORIG_SCRIPT 0.001
score PHP_SCRIPT 2.499
-score PP_MIME_FAKE_ASCII_TEXT 0.862
+score PP_MIME_FAKE_ASCII_TEXT 0.438
score RAND_HEADER_LIST_SPOOF 2.999
score RAND_MKTG_HEADER 1.999
-score RATWARE_NO_RDNS 2.693
+score RATWARE_NO_RDNS 2.243
score RCVD_DOTEDU_SUSP_URI 2.999
score RCVD_IN_MSPIKE_H2 -0.001
score RCVD_IN_RP_CERTIFIED -0.001
score RCVD_IN_RP_RNBL 0.001
score RCVD_IN_RP_SAFE -0.001
-score READY_TO_SHIP 0.474
-score REPTO_419_FRAUD_GM 2.319
-score REPTO_419_FRAUD_QQ 2.561
+score READY_TO_SHIP 0.775
+score REPTO_419_FRAUD_GM 2.520
+score REPTO_419_FRAUD_QQ 2.999
score RISK_FREE 2.899
score SENDGRID_REDIR 0.001
score SERGIO_SUBJECT_VIAGRA01 3.999
score SHOPIFY_IMG_NOT_RCVD_SFY 2.499
-score SHORTENER_SHORT_SUBJ 2.050
+score SHORTENER_SHORT_SUBJ 2.306
score SHORT_IMG_SUSP_NTLD 0.001
-score SHORT_SHORTNER 0.970
+score SHORT_SHORTNER 0.998
score SINGLETS_LOW_CONTRAST 0.001
score SPOOFED_FREEMAIL 1.999
-score SPOOFED_FREEMAIL_NO_RDNS 0.159
+score SPOOFED_FREEMAIL_NO_RDNS 0.166
score SPOOFED_FREEM_REPTO 1.998
score SPOOF_GMAIL_MID 1.499
-score STATIC_XPRIO_OLE 2.000
+score STATIC_XPRIO_OLE 1.999
score STOCK_LOW_CONTRAST 0.001
-score STOX_BOUND_090909_B 1.789
-score THIS_AD 0.876
-score THIS_IS_ADV_SUSP_NTLD 1.262
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.500
-score TO_EQ_FM_DIRECT_MX 2.499
-score TO_EQ_FM_DOM_HTML_IMG 0.391
-score TO_EQ_FM_DOM_HTML_ONLY 0.490
+score THIS_AD 0.873
+score THIS_IS_ADV_SUSP_NTLD 1.499
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
+score TO_EQ_FM_DIRECT_MX 2.500
+score TO_EQ_FM_DOM_HTML_IMG 0.593
+score TO_EQ_FM_DOM_HTML_ONLY 0.483
score TO_EQ_FM_DOM_SPF_FAIL 0.001
score TO_EQ_FM_HTML_ONLY 1.399
score TO_EQ_FM_SPF_FAIL 0.001
score TO_IN_SUBJ 0.100
-score TO_NAME_SUBJ_NO_RDNS 2.242
+score TO_NAME_SUBJ_NO_RDNS 2.238
score TO_NO_BRKTS_FROM_MSSP 0.001
-score TO_NO_BRKTS_HTML_IMG 1.865
+score TO_NO_BRKTS_HTML_IMG 1.870
score TO_NO_BRKTS_HTML_ONLY 1.999
score TO_NO_BRKTS_MSFT 0.001
-score TO_NO_BRKTS_NORDNS_HTML 1.999
+score TO_NO_BRKTS_NORDNS_HTML 2.000
score TO_NO_BRKTS_PCNT 2.499
-score TVD_IP_HEX 1.236
-score TVD_IP_SING_HEX 0.288
-score TVD_RCVD_SPACE_BRACKET 0.532
-score TVD_SPACE_ENCODED 2.114
-score TVD_SPACE_RATIO_MINFP 0.167
+score TVD_IP_HEX 2.028
+score TVD_IP_SING_HEX 2.353
+score TVD_RCVD_SPACE_BRACKET 0.298
+score TVD_SPACE_ENCODED 2.499
+score TVD_SPACE_RATIO_MINFP 0.166
score UNDISC_FREEM 2.799
-score UNDISC_MONEY 1.860
+score UNDISC_MONEY 1.805
score UPGRADE_MAILBOX 0.001
-score URI_DOTDOT_LOW_CNTRST 1.259
-score URI_DOTEDU 0.001 # force non-zero
+score URI_DOTDOT_LOW_CNTRST 1.056
+score URI_DOTEDU 0.001
score URI_FIREBASEAPP 2.999
-score URI_GOOGLE_PROXY 1.628
-score URI_GOOG_STO_SPAMMY 1.856
-score URI_HEX_IP 2.063
-score URI_ONLY_MSGID_MALF 1.390
-score URI_PHISH 2.340
+score URI_GOOGLE_PROXY 1.630
+score URI_GOOG_STO_SPAMMY 2.900
+score URI_HEX_IP 0.361
+score URI_ONLY_MSGID_MALF 1.502
+score URI_PHISH 2.331
score URI_PHP_REDIR 3.499
score URI_TRY_3LD 1.999
score URI_WPADMIN 3.099
score URI_WP_DIRINDEX 3.499
-score URI_WP_HACKED 0.310
+score URI_WP_HACKED 0.324
score URI_WP_HACKED_2 2.499
-score VFY_ACCT_NORDNS 2.905
+score VFY_ACCT_NORDNS 2.907
score WANT_TO_ORDER 2.499
-score WIKI_IMG 2.565
+score WIKI_IMG 2.698
score XFER_LOTSA_MONEY 0.999
-score XM_DIGITS_ONLY 2.992
+score XM_DIGITS_ONLY 1.454
score XM_RANDOM 2.999
-score XM_RECPTID 2.526
-score XPRIO_URL_SHORTNER 0.001
+score XM_RECPTID 2.527
+score XPRIO_URL_SHORTNER 0.792
score YOUR_DELIVERY_ADDRESS 1.249
score YOU_INHERIT 2.699
score AC_POST_EXTRAS 1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index fe1a2c3..436058d 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: 210829 28.564% (99.618% of non-spam corpus)
-# Correctly spam: 411314 55.726% (78.127% of spam corpus)
-# False positives: 808 0.109% (0.382% of nonspam, 64638 weighted)
-# False negatives: 115154 15.601% (21.873% of spam, 218717 weighted)
-# Average score for spam: 14.0 nonspam: 0.7
+# Correctly non-spam: 212161 28.506% (99.601% of non-spam corpus)
+# Correctly spam: 415978 55.891% (78.300% of spam corpus)
+# False positives: 850 0.114% (0.399% of nonspam, 67898 weighted)
+# False negatives: 115282 15.489% (21.700% of spam, 220462 weighted)
+# Average score for spam: 14.4 nonspam: 0.7
# Average for false-pos: 6.4 false-neg: 1.9
-# TOTAL: 738105 100.00%
+# TOTAL: 744271 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 26358 99.52%
-# Correctly spam: 51543 78.41%
-# False positives: 127 0.48%
-# False negatives: 14191 21.59%
-# TCR(l=50): 3.200136 SpamRecall: 78.411% SpamPrec: 99.754%
+# Correctly non-spam: 26541 99.53%
+# Correctly spam: 52010 78.37%
+# False positives: 124 0.47%
+# False negatives: 14353 21.63%
+# TCR(l=50): 3.228872 SpamRecall: 78.372% SpamPrec: 99.762%
##### 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: 201939 95.42%
-# Correctly spam: 252070 47.88%
-# False positives: 9698 4.58%
-# False negatives: 274398 52.12%
-# TCR(l=50): 0.693361 SpamRecall: 47.879% SpamPrec: 96.295%
+# Correctly non-spam: 203288 95.44%
+# Correctly spam: 254944 47.99%
+# False positives: 9723 4.56%
+# False negatives: 276316 52.01%
+# TCR(l=50): 0.696765 SpamRecall: 47.989% SpamPrec: 96.326%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 25253 95.35%
-# Correctly spam: 31379 47.74%
-# False positives: 1232 4.65%
-# False negatives: 34355 52.26%
-# TCR(l=50): 0.685050 SpamRecall: 47.736% SpamPrec: 96.222%
+# Correctly non-spam: 25445 95.42%
+# Correctly spam: 31733 47.82%
+# False positives: 1220 4.58%
+# False negatives: 34630 52.18%
+# TCR(l=50): 0.693956 SpamRecall: 47.817% SpamPrec: 96.298%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index 0ab9c79..4d69cbb 100644
--- a/rulesrc/scores/stats-set1
+++ b/rulesrc/scores/stats-set1
@@ -1,11 +1,11 @@
##### WITH NEW RULES AND SCORES #####
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 212131 25.535% (99.700% of non-spam corpus)
-# Correctly spam: 544317 65.521% (88.080% of spam corpus)
-# False positives: 638 0.077% (0.300% of nonspam, 114228 weighted)
-# False negatives: 73665 8.867% (11.920% of spam, 143023 weighted)
-# Average score for spam: 16.5 nonspam: -0.7
+# Correctly non-spam: 212129 25.535% (99.699% of non-spam corpus)
+# Correctly spam: 544601 65.555% (88.126% of spam corpus)
+# False positives: 640 0.077% (0.301% of nonspam, 114450 weighted)
+# False negatives: 73381 8.833% (11.874% of spam, 141507 weighted)
+# Average score for spam: 16.9 nonspam: -0.7
# Average for false-pos: 6.2 false-neg: 1.9
# TOTAL: 830751 100.00%
@@ -13,11 +13,11 @@
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 26544 99.66%
-# Correctly spam: 68051 88.16%
-# False positives: 91 0.34%
-# False negatives: 9142 11.84%
-# TCR(l=50): 5.637818 SpamRecall: 88.157% SpamPrec: 99.866%
+# Correctly non-spam: 26545 99.66%
+# Correctly spam: 68045 88.15%
+# False positives: 90 0.34%
+# False negatives: 9148 11.85%
+# TCR(l=50): 5.655994 SpamRecall: 88.149% SpamPrec: 99.868%
##### WITHOUT NEW RULES AND SCORES #####
Reading scores from "../rules-base"...