updated scores for revision 1910082 active rules added since last mass-check
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1910092 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index ac60770..a10efeb 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf
@@ -1,8 +1,8 @@
-score ACCT_PHISHING_MANY 2.996 2.999 2.996 2.999
+score ACCT_PHISHING_MANY 2.996 2.996 2.996 2.996
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.996 0.552 2.996 0.552
-score AC_HTML_NONSENSE_TAGS 1.997 1.999 1.997 1.999
+score AC_FROM_MANY_DOTS 2.996 0.497 2.996 0.497
+score AC_HTML_NONSENSE_TAGS 1.997 1.997 1.997 1.997
score AC_POST_EXTRAS 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000 1.000 1.000 1.000
@@ -13,302 +13,290 @@
score AC_SPAMMY_URI_PATTERNS4 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS8 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS9 1.000 1.000 1.000 1.000
-score ADMITS_SPAM 3.196 0.001 3.196 0.001
+score ADMITS_SPAM 3.196 0.236 3.196 0.236
score ADULT_DATING_COMPANY 10.000 10.000 10.000 10.000
score ADVANCE_FEE_2_NEW_FORM 1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_FRM_MNY 0.542 1.000 0.542 1.000
-score ADVANCE_FEE_2_NEW_MONEY 1.997 1.999 1.997 1.999
-score ADVANCE_FEE_3_NEW 2.998 3.259 2.998 3.259
-score ADVANCE_FEE_3_NEW_MONEY 3.099 2.599 3.099 2.599
+score ADVANCE_FEE_2_NEW_FRM_MNY 0.793 0.791 0.793 0.791
+score ADVANCE_FEE_2_NEW_MONEY 1.997 1.997 1.997 1.997
+score ADVANCE_FEE_3_NEW 2.993 1.780 2.993 1.780
+score ADVANCE_FEE_3_NEW_MONEY 3.099 2.938 3.099 2.938
score ADVANCE_FEE_4_NEW 2.397 2.299 2.397 2.299
-score ADVANCE_FEE_4_NEW_MONEY 2.397 2.399 2.397 2.399
-score ADVANCE_FEE_5_NEW 1.008 1.396 1.008 1.396
+score ADVANCE_FEE_4_NEW_MONEY 2.398 0.001 2.398 0.001
+score ADVANCE_FEE_5_NEW 1.000 0.896 1.000 0.896
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001 0.001 0.001 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001 0.001 0.001 0.001
-score AD_PREFS 0.498 0.096 0.498 0.096
-score ALIBABA_IMG_NOT_RCVD_ALI 0.001 1.000 0.001 1.000
+score AD_PREFS 0.498 0.498 0.498 0.498
+score ALIBABA_IMG_NOT_RCVD_ALI 0.001 0.001 0.001 0.001
score AMAZON_IMG_NOT_RCVD_AMZN 0.001 0.001 0.001 0.001
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 ARC_SIGNED 0.001 0.001 0.001 0.001
-score ARC_VALID 0.001 0.001 0.001 0.001
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 0.001 0.001 0.001
-score AXB_XM_FORGED_OL2600 0.013 0.001 0.013 0.001
+score AXB_XM_FORGED_OL2600 2.188 1.633 2.188 1.633
score BEBEE_IMG_NOT_RCVD_BB 1.000 1.000 1.000 1.000
score BIGNUM_EMAILS_FREEM 0.001 0.001 0.001 0.001
-score BIGNUM_EMAILS_MANY 2.996 2.999 2.996 2.999
+score BIGNUM_EMAILS_MANY 2.996 2.996 2.996 2.996
score BITCOIN_BOMB 1.000 1.000 1.000 1.000
-score BITCOIN_DEADLINE 1.872 2.999 1.872 2.999
-score BITCOIN_EXTORT_01 2.662 3.777 2.662 3.777
+score BITCOIN_DEADLINE 1.856 2.999 1.856 2.999
+score BITCOIN_EXTORT_01 3.178 0.786 3.178 0.786
score BITCOIN_EXTORT_02 1.000 1.000 1.000 1.000
score BITCOIN_IMGUR 1.000 1.000 1.000 1.000
-score BITCOIN_MALF_HTML 2.598 2.417 2.598 2.417
-score BITCOIN_MALWARE 0.684 1.941 0.684 1.941
+score BITCOIN_MALF_HTML 2.592 1.586 2.592 1.586
+score BITCOIN_MALWARE 1.985 2.325 1.985 2.325
score BITCOIN_OBFU_SUBJ 3.496 1.765 3.496 1.765
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 2.124 2.499 2.124 2.499
-score BITCOIN_SPAM_03 0.001 0.001 0.001 0.001
+score BITCOIN_SPAM_02 1.985 2.497 1.985 2.497
+score BITCOIN_SPAM_03 0.001 1.214 0.001 1.214
score BITCOIN_SPAM_04 1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_05 0.001 1.518 0.001 1.518
+score BITCOIN_SPAM_05 0.001 2.497 0.001 2.497
score BITCOIN_SPAM_06 1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_07 3.497 2.331 3.497 2.331
+score BITCOIN_SPAM_07 3.496 3.407 3.496 3.407
score BITCOIN_SPAM_08 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_09 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_10 1.000 1.000 1.000 1.000
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 0.001 0.650 0.001 0.650
-score BITCOIN_YOUR_INFO 2.996 2.999 2.996 2.999
-score BODY_SINGLE_URI 2.492 2.132 2.492 2.132
+score BITCOIN_XPRIO 0.001 0.001 0.001 0.001
+score BITCOIN_YOUR_INFO 2.996 2.997 2.996 2.997
+score BODY_SINGLE_URI 2.493 1.976 2.493 1.976
score BODY_SINGLE_WORD 0.001 0.001 0.001 0.001
-score BODY_URI_ONLY 2.105 0.001 2.105 0.001
+score BODY_URI_ONLY 2.091 0.001 2.091 0.001
score BOGUS_MIME_VERSION 1.000 1.000 1.000 1.000
score BOGUS_MSM_HDRS 1.000 1.000 1.000 1.000
score BOMB_FREEM 1.000 1.000 1.000 1.000
score BOMB_MONEY 1.000 1.000 1.000 1.000
score BTC_ORG 1.000 1.000 1.000 1.000
score BULK_RE_SUSP_NTLD 1.000 1.000 1.000 1.000
-score CANT_SEE_AD 0.753 1.397 0.753 1.397
-score CK_HELO_GENERIC 0.248 0.249 0.248 0.249
+score CANT_SEE_AD 1.223 1.568 1.223 1.568
+score CK_HELO_GENERIC 0.249 0.248 0.249 0.248
score COMMENT_GIBBERISH 1.000 1.000 1.000 1.000
-score COMPENSATION 1.498 1.026 1.498 1.026
+score COMPENSATION 1.498 1.498 1.498 1.498
score CONTENT_AFTER_HTML 1.000 1.000 1.000 1.000
score CONTENT_AFTER_HTML_WEAK 1.000 1.000 1.000 1.000
-score CTE_8BIT_MISMATCH 0.999 0.001 0.999 0.001
-score DATE_IN_FUTURE_Q_PLUS 3.896 3.699 3.896 3.699
+score CTE_8BIT_MISMATCH 0.998 0.001 0.998 0.001
+score DATE_IN_FUTURE_Q_PLUS 3.896 3.796 3.896 3.796
score DAY_I_EARNED 1.000 1.000 1.000 1.000
-score DEAR_BENEFICIARY 0.001 0.043 0.001 0.043
+score DEAR_BENEFICIARY 0.001 0.001 0.001 0.001
score DKIMWL_BL 0.001 1.000 0.001 1.000
score DKIMWL_BLOCKED 0.001 0.001 0.001 0.001
-score DKIMWL_WL_HIGH 0.001 -0.001 0.001 -0.001
+score DKIMWL_WL_HIGH 0.001 -0.164 0.001 -0.164
score DKIMWL_WL_MED 0.001 -0.001 0.001 -0.001
score DKIMWL_WL_MEDHI 0.001 -0.001 0.001 -0.001
score DOTGOV_IMAGE 1.000 1.000 1.000 1.000
-score DSN_NO_MIMEVERSION 1.997 1.999 1.997 1.999
+score DSN_NO_MIMEVERSION 1.997 1.997 1.997 1.997
score DYNAMIC_IMGUR 1.000 1.000 1.000 1.000
score EBAY_IMG_NOT_RCVD_EBAY 1.000 1.000 1.000 1.000
-score ENCRYPTED_MESSAGE -0.999 -0.999 -0.999 -0.999
-score END_FUTURE_EMAILS 2.497 2.499 2.497 2.499
+score ENCRYPTED_MESSAGE -0.998 -0.999 -0.998 -0.999
+score END_FUTURE_EMAILS 2.497 2.497 2.497 2.497
score ENVFROM_GOOG_TRIX 1.000 1.000 1.000 1.000
score FACEBOOK_IMG_NOT_RCVD_FB 1.000 1.000 1.000 1.000
score FAKE_REPLY_A1 0.001 0.001 0.001 0.001
score FAKE_REPLY_B 0.001 0.001 0.001 0.001
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 0.550 0.001 0.550 0.001
+score FILL_THIS_FORM 0.552 0.001 0.552 0.001
score FONT_INVIS_DIRECT 0.001 0.001 0.001 0.001
score FONT_INVIS_DOTGOV 1.000 1.000 1.000 1.000
score FONT_INVIS_HTML_NOHTML 1.000 1.000 1.000 1.000
-score FONT_INVIS_LONG_LINE 2.996 2.999 2.996 2.999
-score FONT_INVIS_MSGID 1.334 0.001 1.334 0.001
+score FONT_INVIS_LONG_LINE 2.996 2.996 2.996 2.996
+score FONT_INVIS_MSGID 1.333 0.232 1.333 0.232
score FONT_INVIS_NORDNS 1.000 1.000 1.000 1.000
-score FONT_INVIS_POSTEXTRAS 0.153 1.388 0.153 1.388
-score FORM_FRAUD 0.999 0.001 0.999 0.001
-score FORM_FRAUD_3 2.499 2.299 2.499 2.299
+score FONT_INVIS_POSTEXTRAS 0.159 2.174 0.159 2.174
+score FORGED_SPF_HELO 0.001 0.001 0.001 0.001
+score FORM_FRAUD 0.998 0.001 0.998 0.001
+score FORM_FRAUD_3 2.499 2.398 2.499 2.398
score FORM_FRAUD_5 0.001 0.001 0.001 0.001
score FOUND_YOU 1.000 1.000 1.000 1.000
-score FREEMAIL_FORGED_FROMDOMAIN 0.248 0.249 0.248 0.249
+score FREEMAIL_FORGED_FROMDOMAIN 0.249 0.248 0.249 0.248
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 0.001 0.163 0.001 0.163
-score FROM_ADDR_WS 2.996 2.127 2.996 2.127
+score FROM_2_EMAILS_SHORT 0.001 0.001 0.001 0.001
+score FROM_ADDR_WS 2.996 2.996 2.996 2.996
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 0.001 0.001 0.001
-score FROM_FMBLA_NEWDOM14 0.001 0.965 0.001 0.965
-score FROM_FMBLA_NEWDOM28 0.001 0.001 0.001 0.001
-score FROM_GOV_DKIM_AU 0.001 -0.044 0.001 -0.044
+score FROM_FMBLA_NEWDOM 0.001 0.449 0.001 0.449
+score FROM_FMBLA_NEWDOM14 0.001 0.998 0.001 0.998
+score FROM_FMBLA_NEWDOM28 0.001 0.798 0.001 0.798
+score FROM_GOV_DKIM_AU 0.001 -0.120 0.001 -0.120
score FROM_GOV_REPLYTO_FREEMAIL 0.001 1.000 0.001 1.000
score FROM_GOV_SPOOF 0.001 1.000 0.001 1.000
-score FROM_IN_TO_AND_SUBJ 1.797 1.799 1.797 1.799
+score FROM_IN_TO_AND_SUBJ 1.797 1.899 1.797 1.899
score FROM_MISSPACED 0.001 0.001 0.001 0.001
-score FROM_MISSP_DYNIP 1.401 0.917 1.401 0.917
-score FROM_MISSP_EH_MATCH 1.032 1.548 1.032 1.548
-score FROM_MISSP_FREEMAIL 2.114 2.999 2.114 2.999
+score FROM_MISSP_DYNIP 1.405 2.596 1.405 2.596
+score FROM_MISSP_EH_MATCH 0.975 0.620 0.975 0.620
+score FROM_MISSP_FREEMAIL 2.170 3.196 2.170 3.196
score FROM_MISSP_MSFT 0.001 0.001 0.001 0.001
-score FROM_MISSP_REPLYTO 1.401 0.846 1.401 0.846
+score FROM_MISSP_REPLYTO 1.497 0.001 1.497 0.001
score FROM_MISSP_SPF_FAIL 0.001 0.001 0.001 0.001
score FROM_MISSP_USER 0.001 0.001 0.001 0.001
score FROM_MULTI_NORDNS 0.001 0.001 0.001 0.001
score FROM_NEWDOM_BTC 0.001 1.000 0.001 1.000
-score FROM_NTLD_LINKBAIT 1.116 1.136 1.116 1.136
-score FROM_NTLD_REPLY_FREEMAIL 0.004 1.000 0.004 1.000
+score FROM_NTLD_LINKBAIT 1.152 1.040 1.152 1.040
+score FROM_NTLD_REPLY_FREEMAIL 0.001 1.000 0.001 1.000
score FROM_NUMBERO_NEWDOMAIN 0.001 1.000 0.001 1.000
-score FROM_PAYPAL_SPOOF 0.001 1.415 0.001 1.415
-score FROM_SUSPICIOUS_NTLD 0.498 0.192 0.498 0.192
-score FROM_SUSPICIOUS_NTLD_FP 1.997 1.999 1.997 1.999
-score FROM_UNBAL1 0.821 0.001 0.821 0.001
-score FROM_UNBAL2 3.196 0.001 3.196 0.001
-score FROM_WSP_TRAIL 3.197 2.899 3.197 2.899
+score FROM_PAYPAL_SPOOF 0.001 0.001 0.001 0.001
+score FROM_SUSPICIOUS_NTLD 0.498 0.190 0.498 0.190
+score FROM_SUSPICIOUS_NTLD_FP 1.997 1.997 1.997 1.997
+score FROM_UNBAL1 1.463 1.789 1.463 1.789
+score FROM_UNBAL2 3.196 3.096 3.196 3.096
+score FROM_WSP_TRAIL 3.196 2.687 3.196 2.687
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 0.001 0.001 0.001 0.001
score GAPPY_SALES_LEADS_FREEM 1.000 1.000 1.000 1.000
-score GB_BITCOIN_NH 1.839 1.224 1.839 1.224
-score GB_CUSTOM_HTM_URI 1.498 0.581 1.498 0.581
-score GB_FAKE_RF_SHORT 1.938 1.999 1.938 1.999
+score GB_BITCOIN_NH 1.322 2.996 1.322 2.996
+score GB_CUSTOM_HTM_URI 1.498 0.835 1.498 0.835
+score GB_FAKE_RF_SHORT 1.945 1.997 1.945 1.997
score GB_FORGED_MUA_POSTFIX 1.000 1.000 1.000 1.000
score GB_FREEMAIL_DISPTO 0.001 0.001 0.001 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_TRANSL 0.748 0.749 0.748 0.749
-score GB_HASHBL_BTC 0.001 1.811 0.001 1.811
+score GB_HASHBL_BTC 0.001 0.001 0.001 0.001
score GB_STORAGE_GOOGLE_EMAIL 1.000 1.000 1.000 1.000
score GOOGLE_DOCS_PHISH 1.000 1.000 1.000 1.000
score GOOGLE_DOCS_PHISH_MANY 1.000 1.000 1.000 1.000
score GOOGLE_DOC_SUSP 1.000 1.000 1.000 1.000
score GOOGLE_DRIVE_REPLY_BAD_NTLD 1.000 1.000 1.000 1.000
-score GOOG_MALWARE_DNLD 3.907 0.576 3.907 0.576
-score GOOG_REDIR_HTML_ONLY 1.997 2.000 1.997 2.000
-score GOOG_REDIR_NORDNS 2.503 3.099 2.503 3.099
+score GOOG_MALWARE_DNLD 3.214 2.044 3.214 2.044
+score GOOG_REDIR_HTML_ONLY 1.998 1.997 1.998 1.997
+score GOOG_REDIR_NORDNS 2.506 3.096 2.506 3.096
score GOOG_STO_EMAIL_PHISH 1.000 1.000 1.000 1.000
score GOOG_STO_HTML_PHISH 1.000 1.000 1.000 1.000
score GOOG_STO_HTML_PHISH_MANY 1.000 1.000 1.000 1.000
-score GOOG_STO_IMG_HTML 2.882 1.000 2.882 1.000
-score GOOG_STO_IMG_NOHTML 2.053 2.499 2.053 2.499
-score GOOG_STO_NOIMG_HTML 2.996 2.999 2.996 2.999
+score GOOG_STO_IMG_HTML 2.529 2.996 2.529 2.996
+score GOOG_STO_IMG_NOHTML 2.055 2.497 2.055 2.497
+score GOOG_STO_NOIMG_HTML 2.996 2.996 2.996 2.996
score HAS_X_NO_RELAY 1.000 1.000 1.000 1.000
-score HAS_X_OUTGOING_SPAM_STAT 1.287 0.972 1.287 0.972
-score HDRS_LCASE 0.098 0.099 0.098 0.099
-score HDRS_MISSP 2.094 0.276 2.094 0.276
+score HAS_X_OUTGOING_SPAM_STAT 1.285 0.800 1.285 0.800
+score HDRS_LCASE 0.098 0.098 0.098 0.098
+score HDRS_MISSP 2.092 0.001 2.092 0.001
score HDR_ORDER_FTSDMCXX_DIRECT 0.001 0.001 0.001 0.001
score HDR_ORDER_FTSDMCXX_NORDNS 0.001 0.001 0.001 0.001
-score HEADER_FROM_DIFFERENT_DOMAINS 0.249 0.250 0.249 0.250
+score HEADER_FROM_DIFFERENT_DOMAINS 0.249 0.248 0.249 0.248
score HELO_NO_DOMAIN 0.001 0.001 0.001 0.001
score HEXHASH_WORD 1.000 1.000 1.000 1.000
score HK_CTE_RAW 1.000 1.000 1.000 1.000
score HK_LOTTO 0.001 0.001 0.001 0.001
-score HK_NAME_MR_MRS 0.998 0.999 0.998 0.999
+score HK_NAME_MR_MRS 0.998 0.998 0.998 0.998
score HK_RANDOM_ENVFROM 0.001 0.001 0.001 0.001
-score HK_RANDOM_FROM 0.998 0.001 0.998 0.001
-score HK_RANDOM_REPLYTO 0.998 1.000 0.998 1.000
+score HK_RANDOM_FROM 0.999 0.001 0.999 0.001
+score HK_RANDOM_REPLYTO 0.998 0.998 0.998 0.998
score HK_RCVD_IP_MULTICAST 1.000 1.000 1.000 1.000
-score HK_SCAM 0.537 0.001 0.537 0.001
+score HK_SCAM 0.534 0.001 0.534 0.001
score HOSTED_IMG_DIRECT_MX 0.001 0.001 0.001 0.001
score HOSTED_IMG_DQ_UNSUB 1.000 1.000 1.000 1.000
-score HOSTED_IMG_FREEM 1.000 0.001 1.000 0.001
+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 HOSTED_IMG_MULTI_PUB_01 2.996 2.999 2.996 2.999
-score HTML_ENTITY_ASCII 2.997 2.999 2.997 2.999
-score HTML_ENTITY_ASCII_TINY 1.861 2.909 1.861 2.909
-score HTML_FONT_TINY_NORDNS 1.997 0.001 1.997 0.001
+score HOSTED_IMG_MULTI_PUB_01 2.996 2.996 2.996 2.996
+score HTML_ENTITY_ASCII 2.996 2.996 2.996 2.996
+score HTML_ENTITY_ASCII_TINY 1.803 1.233 1.803 1.233
+score HTML_FONT_TINY_NORDNS 1.998 0.001 1.998 0.001
score HTML_OFF_PAGE 2.151 0.001 2.151 0.001
score HTML_SHRT_CMNT_OBFU_MANY 1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY 2.497 1.000 2.497 1.000
-score HTML_TAG_BALANCE_CENTER 3.096 3.097 3.096 3.097
-score HTML_TEXT_INVISIBLE_FONT 1.996 1.999 1.996 1.999
-score HTML_TEXT_INVISIBLE_STYLE 0.501 0.001 0.501 0.001
+score HTML_SINGLET_MANY 2.498 2.497 2.498 2.497
+score HTML_TAG_BALANCE_CENTER 3.096 2.996 3.096 2.996
+score HTML_TEXT_INVISIBLE_FONT 1.180 1.755 1.180 1.755
+score HTML_TEXT_INVISIBLE_STYLE 0.500 0.001 0.500 0.001
score IMG_ONLY_FM_DOM_INFO 1.000 1.000 1.000 1.000
-score JH_SPAMMY_HEADERS 3.496 3.499 3.496 3.499
+score JH_SPAMMY_HEADERS 3.496 3.496 3.496 3.496
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_HELO_FCRDNS 0.399 0.396 0.399 0.396
+score KHOP_HELO_FCRDNS 0.399 0.399 0.399 0.399
score LINKEDIN_IMG_NOT_RCVD_LNKN 1.000 1.000 1.000 1.000
score LIST_PRTL_PUMPDUMP 1.000 1.000 1.000 1.000
score LIST_PRTL_SAME_USER 1.000 1.000 1.000 1.000
-score LONG_HEX_URI 2.996 2.947 2.996 2.947
+score LONG_HEX_URI 2.996 2.520 2.996 2.520
score LONG_IMG_URI 0.001 0.001 0.001 0.001
-score LONG_INVISIBLE_TEXT 2.996 1.828 2.996 1.828
-score LOTS_OF_MONEY 0.010 0.010 0.010 0.010
-score LOTTO_AGENT 0.530 0.001 0.530 0.001
+score LONG_INVISIBLE_TEXT 2.996 2.676 2.996 2.676
+score LOTS_OF_MONEY 0.010 0.009 0.010 0.009
+score LOTTO_AGENT 1.499 0.207 1.499 0.207
score LUCRATIVE 1.000 1.000 1.000 1.000
-score MALFORMED_FREEMAIL 2.896 0.001 2.896 0.001
+score MALFORMED_FREEMAIL 2.896 2.260 2.896 2.260
score MALF_HTML_B64 1.000 1.000 1.000 1.000
-score MALWARE_NORDNS 3.140 2.180 3.140 2.180
-score MALWARE_PASSWORD 1.498 2.129 1.498 2.129
-score MANY_HDRS_LCASE 0.062 0.001 0.062 0.001
-score MANY_SPAN_IN_TEXT 2.696 0.001 2.696 0.001
-score MILLION_HUNDRED 0.343 0.001 0.343 0.001
-score MILLION_USD 0.001 1.217 0.001 1.217
+score MALWARE_NORDNS 1.022 1.626 1.022 1.626
+score MALWARE_PASSWORD 2.918 1.000 2.918 1.000
+score MANY_HDRS_LCASE 0.001 0.098 0.001 0.098
+score MANY_SPAN_IN_TEXT 2.696 2.696 2.696 2.696
+score MILLION_HUNDRED 0.587 0.001 0.587 0.001
+score MILLION_USD 0.001 0.001 0.001 0.001
score MIMEOLE_DIRECT_TO_MX 0.001 0.001 0.001 0.001
-score MIME_NO_TEXT 1.997 1.999 1.997 1.999
+score MIME_NO_TEXT 1.997 1.672 1.997 1.672
score MIXED_AREA_CASE 1.000 1.000 1.000 1.000
-score MIXED_CENTER_CASE 2.497 2.167 2.497 2.167
-score MIXED_ES 2.498 2.499 2.498 2.499
+score MIXED_CENTER_CASE 2.497 1.892 2.497 1.892
+score MIXED_ES 2.497 2.398 2.497 2.398
score MIXED_FONT_CASE 1.000 1.000 1.000 1.000
-score MIXED_HREF_CASE 1.687 1.999 1.687 1.999
+score MIXED_HREF_CASE 1.536 1.999 1.536 1.999
score MIXED_IMG_CASE 1.000 1.000 1.000 1.000
score MONERO_DEADLINE 1.000 1.000 1.000 1.000
score MONERO_EXTORT_01 1.000 1.000 1.000 1.000
score MONERO_MALWARE 1.000 1.000 1.000 1.000
score MONERO_PAY_ME 1.000 1.000 1.000 1.000
-score MONEY_ATM_CARD 0.001 1.210 0.001 1.210
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_FRAUD_3 0.001 0.001 0.001 0.001
-score MONEY_FRAUD_5 1.889 2.599 1.889 2.599
+score MONEY_FRAUD_5 1.890 2.696 1.890 2.696
score MONEY_FRAUD_8 0.001 0.001 0.001 0.001
-score MONEY_FREEMAIL_REPTO 2.996 1.841 2.996 1.841
-score MONEY_FROM_41 1.997 1.999 1.997 1.999
-score MONEY_FROM_MISSP 0.538 0.001 0.538 0.001
+score MONEY_FREEMAIL_REPTO 2.997 1.587 2.997 1.587
+score MONEY_FROM_41 1.997 1.938 1.997 1.938
+score MONEY_FROM_MISSP 0.539 0.001 0.539 0.001
score MSGID_DOLLARS_URI_IMG 1.000 1.000 1.000 1.000
score MSGID_HDR_MALF 1.000 1.000 1.000 1.000
-score MSMAIL_PRI_ABNORMAL 1.498 0.213 1.498 0.213
-score MSM_PRIO_REPTO 0.585 1.000 0.585 1.000
-score NAME_EMAIL_DIFF 1.727 0.001 1.727 0.001
+score MSMAIL_PRI_ABNORMAL 1.498 0.451 1.498 0.451
+score MSM_PRIO_REPTO 0.650 1.466 0.650 1.466
+score NAME_EMAIL_DIFF 1.728 0.001 1.728 0.001
score NA_DOLLARS 1.498 0.001 1.498 0.001
score NEWEGG_IMG_NOT_RCVD_NEGG 1.000 1.000 1.000 1.000
score NEW_PRODUCTS 1.000 1.000 1.000 1.000
-score NICE_REPLY_A -0.005 -0.091 -0.005 -0.091
+score NICE_REPLY_A -0.005 -0.093 -0.005 -0.093
score NO_FM_NAME_IP_HOSTN 0.001 0.001 0.001 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.165 0.001 0.165 0.001
+score NUMBEREND_LINKBAIT 0.509 0.463 0.509 0.463
score OBFU_BITCOIN 1.000 1.000 1.000 1.000
-score OBFU_TEXT_ATTACH 0.984 0.325 0.984 0.325
-score ODD_FREEM_REPTO 2.996 2.538 2.996 2.538
-score PDS_BTC_ID 0.495 0.003 0.495 0.003
-score PDS_BTC_MSGID 0.001 0.553 0.001 0.553
+score OBFU_TEXT_ATTACH 0.631 0.001 0.631 0.001
+score ODD_FREEM_REPTO 2.996 2.997 2.996 2.997
+score PDS_BTC_ID 0.496 0.001 0.496 0.001
+score PDS_BTC_MSGID 0.001 0.001 0.001 0.001
score PDS_DBL_URL_TNB_RUNON 1.997 1.999 1.997 1.999
-score PDS_EMPTYSUBJ_URISHRT 1.498 0.327 1.498 0.327
-score PDS_FRNOM_TODOM_DBL_URL 1.484 1.499 1.484 1.499
-score PDS_FRNOM_TODOM_NAKED_TO 1.499 1.198 1.499 1.198
-score PDS_FROM_2_EMAILS 2.349 2.580 2.349 2.580
-score PDS_FROM_2_EMAILS_SHRTNER 0.001 0.641 0.001 0.641
-score PDS_FROM_NAME_TO_DOMAIN 1.997 1.881 1.997 1.881
+score PDS_EMPTYSUBJ_URISHRT 1.498 0.640 1.498 0.640
+score PDS_FRNOM_TODOM_DBL_URL 1.482 1.498 1.482 1.498
+score PDS_FRNOM_TODOM_NAKED_TO 1.498 1.008 1.498 1.008
+score PDS_FROM_2_EMAILS 2.348 2.465 2.348 2.465
+score PDS_FROM_2_EMAILS_SHRTNER 0.001 0.001 0.001 0.001
+score PDS_FROM_NAME_TO_DOMAIN 1.997 1.989 1.997 1.989
score PDS_HELO_SPF_FAIL 0.001 1.000 0.001 1.000
-score PDS_HP_HELO_NORDNS 0.002 0.001 0.002 0.001
+score PDS_HP_HELO_NORDNS 0.493 0.001 0.493 0.001
score PDS_RDNS_DYNAMIC_FP 0.010 0.001 0.010 0.001
-score PDS_SHORTFWD_URISHRT 0.819 1.000 0.819 1.000
-score PDS_TINYSUBJ_URISHRT 1.498 1.499 1.498 1.499
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997 0.718 1.997 0.718
-score PDS_TO_EQ_FROM_NAME 1.468 0.001 1.468 0.001
+score PDS_SHORTFWD_URISHRT 1.443 1.000 1.443 1.000
+score PDS_TINYSUBJ_URISHRT 1.498 0.542 1.498 0.542
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997 0.001 1.997 0.001
+score PDS_TO_EQ_FROM_NAME 0.940 0.001 0.940 0.001
score PHISH_AZURE_CLOUDAPP 3.500 3.500 3.500 3.500
score PHISH_FBASEAPP 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.102 0.001 1.102 0.001
-score PHP_SCRIPT 2.497 2.326 2.497 2.326
+score PHP_ORIG_SCRIPT 1.101 0.001 1.101 0.001
+score PHP_SCRIPT 2.497 2.493 2.497 2.493
score PHP_SCRIPT_MUA 1.000 1.000 1.000 1.000
-score POSSIBLE_GMAIL_PHISHER 0.545 2.499 0.545 2.499
-score PP_MIME_FAKE_ASCII_TEXT 0.999 0.001 0.999 0.001
+score POSSIBLE_GMAIL_PHISHER 0.525 2.258 0.525 2.258
+score PP_MIME_FAKE_ASCII_TEXT 0.998 0.001 0.998 0.001
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 1.000 1.000 1.000 1.000
-score RAND_HEADER_MANY 1.000 0.043 1.000 0.043
-score RAND_MKTG_HEADER 1.997 1.999 1.997 1.999
+score RAND_HEADER_MANY 1.000 1.000 1.000 1.000
+score RAND_MKTG_HEADER 1.997 1.997 1.997 1.997
score RATWARE_NO_RDNS 0.001 0.001 0.001 0.001
score RCVD_DOTEDU_SHORT 1.000 1.000 1.000 1.000
score RCVD_DOTEDU_SUSP_URI 1.000 1.000 1.000 1.000
-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
-score RCVD_IN_MSPIKE_H4 0.001 0.001 0.001 0.001
-score RCVD_IN_MSPIKE_H5 0.001 0.001 0.001 0.001
-score RCVD_IN_MSPIKE_L2 0.001 0.001 0.001 0.001
-score RCVD_IN_MSPIKE_L3 0.001 0.001 0.001 0.001
-score RCVD_IN_MSPIKE_L4 0.001 0.001 0.001 0.001
-score RCVD_IN_MSPIKE_L5 0.001 0.001 0.001 0.001
-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 1.000 1.000 1.000
-score READY_TO_SHIP 1.249 0.001 1.249 0.001
+score READY_TO_SHIP 0.706 0.417 0.706 0.417
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
@@ -326,102 +314,101 @@
score REPTO_INFONUMSCOM 1.000 1.000 1.000 1.000
score RISK_FREE 0.001 0.001 0.001 0.001
score SCC_BODY_SINGLE_WORD 0.001 0.001 0.001 0.001
-score SCC_BODY_URI_ONLY 1.404 1.172 1.404 1.172
-score SCC_CANSPAM_1 2.361 1.156 2.361 1.156
-score SCC_CANSPAM_2 3.296 2.899 3.296 2.899
+score SCC_BODY_URI_ONLY 1.403 0.657 1.403 0.657
+score SCC_CANSPAM_1 3.051 2.363 3.051 2.363
+score SCC_CANSPAM_2 3.296 3.196 3.296 3.196
score SCC_ISEMM_LID_1 1.000 1.000 1.000 1.000
score SCC_ISEMM_LID_1A 1.000 1.000 1.000 1.000
-score SCC_ISEMM_LID_1B 1.498 1.499 1.498 1.499
-score SCC_SPAMMER_ADDR_2 0.919 0.001 0.919 0.001
-score SCC_SPECIAL_GUID 0.001 0.001 0.001 0.001
-score SENDGRID_REDIR 1.498 1.068 1.498 1.068
+score SCC_ISEMM_LID_1B 1.498 1.498 1.498 1.498
+score SCC_SPAMMER_ADDR_2 1.021 1.606 1.021 1.606
+score SCC_SPECIAL_GUID 2.299 2.199 2.299 2.199
+score SENDGRID_REDIR 1.498 1.067 1.498 1.067
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_PORN014 2.799 0.001 2.799 0.001
+score SERGIO_SUBJECT_PORN014 2.670 0.574 2.670 0.574
score SERGIO_SUBJECT_VIAGRA01 0.001 0.001 0.001 0.001
-score SHOPIFY_IMG_NOT_RCVD_SFY 2.497 2.499 2.497 2.499
-score SHORTENED_URL_SRC 2.696 0.001 2.696 0.001
+score SHOPIFY_IMG_NOT_RCVD_SFY 2.498 2.497 2.498 2.497
+score SHORTENED_URL_SRC 2.696 2.696 2.696 2.696
score SHORTENER_SHORT_IMG 0.001 0.001 0.001 0.001
score SHORT_IMG_SUSP_NTLD 1.000 1.000 1.000 1.000
-score SHORT_SHORTNER 1.997 1.039 1.997 1.039
+score SHORT_SHORTNER 1.997 1.829 1.997 1.829
score SPOOFED_FREEMAIL 0.001 0.001 0.001 0.001
-score SPOOFED_FREEMAIL_NO_RDNS 1.098 0.001 1.098 0.001
-score SPOOFED_FREEM_REPTO 0.001 2.499 0.001 2.499
+score SPOOFED_FREEMAIL_NO_RDNS 0.606 0.001 0.606 0.001
+score SPOOFED_FREEM_REPTO 0.001 2.497 0.001 2.497
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.498 0.001 1.498 0.001
-score STATIC_XPRIO_OLE 0.001 1.861 0.001 1.861
+score STATIC_XPRIO_OLE 0.001 0.001 0.001 0.001
score STOCK_TIP 1.000 1.000 1.000 1.000
score SUBJ_BRKN_WORDNUMS 1.000 1.000 1.000 1.000
-score SURBL_BLOCKED 0.001 0.001 0.001 0.001
-score SUSP_UTF8_WORD_COMBO 2.996 2.261 2.996 2.261
-score SUSP_UTF8_WORD_SUBJ 1.760 0.676 1.760 0.676
+score SUSP_UTF8_WORD_COMBO 2.996 2.996 2.996 2.996
+score SUSP_UTF8_WORD_SUBJ 1.750 0.471 1.750 0.471
score SYSADMIN 1.000 1.000 1.000 1.000
score TAGSTAT_IMG_NOT_RCVD_TGST 1.000 1.000 1.000 1.000
score TARINGANET_IMG_NOT_RCVD_TN 1.000 1.000 1.000 1.000
-score THIS_AD 1.198 1.099 1.198 1.099
-score THIS_IS_ADV_SUSP_NTLD 1.000 1.000 1.000 1.000
+score THIS_AD 1.098 1.199 1.098 1.199
+score THIS_IS_ADV_SUSP_NTLD 1.000 1.499 1.000 1.499
score TONLINE_FAKE_DKIM 1.000 1.000 1.000 1.000
score TO_EQ_FM_DIRECT_MX 0.001 0.001 0.001 0.001
-score TO_EQ_FM_DOM_HTML_IMG 2.297 2.299 2.297 2.299
+score TO_EQ_FM_DOM_HTML_IMG 2.297 2.103 2.297 2.103
score TO_EQ_FM_DOM_SPF_FAIL 0.001 0.001 0.001 0.001
-score TO_EQ_FM_HTML_ONLY 0.001 2.137 0.001 2.137
+score TO_EQ_FM_HTML_ONLY 0.001 2.132 0.001 2.132
score TO_EQ_FM_SPF_FAIL 0.001 0.001 0.001 0.001
-score TO_IN_SUBJ 0.099 0.099 0.099 0.099
-score TO_NAME_SUBJ_NO_RDNS 2.999 2.999 2.999 2.999
-score TO_NO_BRKTS_FROM_MSSP 2.498 1.753 2.498 1.753
-score TO_NO_BRKTS_HTML_IMG 1.997 1.999 1.997 1.999
-score TO_NO_BRKTS_HTML_ONLY 1.997 1.999 1.997 1.999
-score TO_NO_BRKTS_MSFT 0.151 0.001 0.151 0.001
-score TO_NO_BRKTS_NORDNS_HTML 1.997 1.999 1.997 1.999
-score TO_NO_BRKTS_PCNT 2.497 2.499 2.497 2.499
-score TVD_IP_HEX 2.597 0.001 2.597 0.001
-score TVD_IP_SING_HEX 1.451 0.001 1.451 0.001
-score TVD_PH_SUBJ_META 2.797 2.699 2.797 2.699
-score TVD_SPACE_ENCODED 2.497 0.001 2.497 0.001
-score TVD_SPACE_RATIO_MINFP 1.100 0.001 1.100 0.001
+score TO_IN_SUBJ 0.098 0.099 0.098 0.099
+score TO_NAME_SUBJ_NO_RDNS 2.816 2.996 2.816 2.996
+score TO_NO_BRKTS_FROM_MSSP 2.497 1.801 2.497 1.801
+score TO_NO_BRKTS_HTML_IMG 1.997 1.997 1.997 1.997
+score TO_NO_BRKTS_HTML_ONLY 1.997 1.997 1.997 1.997
+score TO_NO_BRKTS_MSFT 0.642 0.001 0.642 0.001
+score TO_NO_BRKTS_NORDNS_HTML 1.997 1.997 1.997 1.997
+score TO_NO_BRKTS_PCNT 2.497 2.497 2.497 2.497
+score TVD_IP_HEX 2.497 2.497 2.497 2.497
+score TVD_IP_SING_HEX 2.062 1.971 2.062 1.971
+score TVD_PH_SUBJ_META 2.796 2.610 2.796 2.610
+score TVD_SPACE_ENCODED 2.497 1.331 2.497 1.331
+score TVD_SPACE_RATIO_MINFP 1.101 0.001 1.101 0.001
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.896 2.799 2.896 2.799
-score UNDISC_MONEY 2.896 2.699 2.896 2.699
-score UNICODE_OBFU_ASC 2.497 2.499 2.497 2.499
+score UNDISC_FREEM 2.996 2.996 2.996 2.996
+score UNDISC_MONEY 2.896 2.896 2.896 2.896
+score UNICODE_OBFU_ASC 2.497 2.497 2.497 2.497
score UNICODE_OBFU_ZW 1.000 1.000 1.000 1.000
score UNSUB_GOOG_FORM 1.000 1.000 1.000 1.000
score URI_ADOBESPARK 1.000 1.000 1.000 1.000
-score URI_AZURE_CLOUDAPP 2.996 1.000 2.996 1.000
-score URI_BUFFLY 1.102 1.000 1.102 1.000
+score URI_AZURE_CLOUDAPP 2.996 2.996 2.996 2.996
+score URI_BUFFLY 0.624 1.826 0.624 1.826
score URI_DASHGOVEDU 1.000 1.000 1.000 1.000
score URI_DATA 1.000 1.000 1.000 1.000
-score URI_DOTEDU 1.997 1.999 1.997 1.999
+score URI_DOTEDU 1.997 1.997 1.997 1.997
score URI_DOTEDU_ENTITY 1.000 1.000 1.000 1.000
score URI_FIREBASEAPP 1.000 1.000 1.000 1.000
-score URI_GOOGLE_PROXY 2.297 2.400 2.297 2.400
+score URI_GOOGLE_PROXY 2.298 2.397 2.298 2.397
score URI_GOOG_STO_SPAMMY 3.000 3.000 3.000 3.000
-score URI_HEX_IP 1.957 1.000 1.957 1.000
+score URI_HEX_IP 1.916 0.870 1.916 0.870
score URI_IMG_WP_REDIR 1.000 1.000 1.000 1.000
-score URI_IN_URI_10 2.297 0.001 2.297 0.001
+score URI_IN_URI_10 2.297 2.297 2.297 2.297
score URI_LONG_REPEAT 1.000 1.000 1.000 1.000
-score URI_ONLY_MSGID_MALF 0.359 1.999 0.359 1.999
+score URI_ONLY_MSGID_MALF 0.397 1.997 0.397 1.997
score URI_OPTOUT_3LD 1.000 1.000 1.000 1.000
-score URI_PHISH 3.996 3.993 3.996 3.993
+score URI_PHISH 3.995 3.987 3.995 3.987
score URI_PHP_REDIR 1.000 1.000 1.000 1.000
-score URI_TRY_3LD 1.997 1.999 1.997 1.999
+score URI_TRY_3LD 1.997 1.514 1.997 1.514
score URI_TRY_USME 1.000 1.000 1.000 1.000
-score URI_WPADMIN 2.397 2.299 2.397 2.299
-score URI_WP_DIRINDEX 3.496 3.499 3.496 3.499
-score URI_WP_HACKED 3.496 0.854 3.496 0.854
-score URI_WP_HACKED_2 1.100 2.500 1.100 2.500
+score URI_WPADMIN 2.397 2.397 2.397 2.397
+score URI_WP_DIRINDEX 3.497 3.496 3.497 3.496
+score URI_WP_HACKED 3.496 1.216 3.496 1.216
+score URI_WP_HACKED_2 1.101 2.497 1.101 2.497
score USB_DRIVES 1.000 1.000 1.000 1.000
-score VFY_ACCT_NORDNS 2.395 0.001 2.395 0.001
+score VFY_ACCT_NORDNS 1.944 0.001 1.944 0.001
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 WORD_INVIS 0.001 0.521 0.001 0.521
-score WORD_INVIS_MANY 2.184 2.992 2.184 2.992
+score WORD_INVIS 0.001 0.803 0.001 0.803
+score WORD_INVIS_MANY 2.996 2.997 2.996 2.997
score XFER_LOTSA_MONEY 0.001 0.001 0.001 0.001
score XM_DIGITS_ONLY 1.000 1.000 1.000 1.000
score XM_RANDOM 0.001 0.001 0.001 0.001
-score XM_RECPTID 2.997 0.001 2.997 0.001
+score XM_RECPTID 2.996 1.867 2.996 1.867
score XPRIO 2.247 0.001 2.247 0.001
score XPRIO_SHORT_SUBJ 1.000 1.000 1.000 1.000
-score YOUR_PERMISSION 2.558 2.129 2.558 2.129
-score YOU_INHERIT 1.151 2.499 1.151 2.499
+score YOUR_PERMISSION 2.599 2.033 2.599 2.033
+score YOU_INHERIT 1.563 0.950 1.563 0.950
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index dddca90..6481c64 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -7,233 +7,233 @@
score AC_FROM_MANY_DOTS 2.996
score AC_HTML_NONSENSE_TAGS 1.997
score ADMITS_SPAM 3.196
-score ADVANCE_FEE_2_NEW_FRM_MNY 0.542
+score ADVANCE_FEE_2_NEW_FRM_MNY 0.793
score ADVANCE_FEE_2_NEW_MONEY 1.997
-score ADVANCE_FEE_3_NEW 2.998
+score ADVANCE_FEE_3_NEW 2.993
score ADVANCE_FEE_3_NEW_MONEY 3.099
score ADVANCE_FEE_4_NEW 2.397
-score ADVANCE_FEE_4_NEW_MONEY 2.397
-score ADVANCE_FEE_5_NEW 1.008
+score ADVANCE_FEE_4_NEW_MONEY 2.398
+score ADVANCE_FEE_5_NEW 1.000
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001
score AD_PREFS 0.498
score ALIBABA_IMG_NOT_RCVD_ALI 0.001
score AMAZON_IMG_NOT_RCVD_AMZN 0.001
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XM_FORGED_OL2600 0.013
+score AXB_XM_FORGED_OL2600 2.188
score BIGNUM_EMAILS_FREEM 0.001
score BIGNUM_EMAILS_MANY 2.996
-score BITCOIN_DEADLINE 1.872
-score BITCOIN_EXTORT_01 2.662
-score BITCOIN_MALF_HTML 2.598
-score BITCOIN_MALWARE 0.684
+score BITCOIN_DEADLINE 1.856
+score BITCOIN_EXTORT_01 3.178
+score BITCOIN_MALF_HTML 2.592
+score BITCOIN_MALWARE 1.985
score BITCOIN_OBFU_SUBJ 3.496
-score BITCOIN_SPAM_02 2.124
+score BITCOIN_SPAM_02 1.985
score BITCOIN_SPAM_03 0.001
-score BITCOIN_SPAM_07 3.497
-score BITCOIN_XPRIO 0.001 # force non-zero
+score BITCOIN_SPAM_07 3.496
+score BITCOIN_XPRIO 0.001
score BITCOIN_YOUR_INFO 2.996
-score BODY_SINGLE_URI 2.492
+score BODY_SINGLE_URI 2.493
score BODY_SINGLE_WORD 0.001
-score BODY_URI_ONLY 2.105
-score CANT_SEE_AD 0.753
-score CK_HELO_GENERIC 0.248
+score BODY_URI_ONLY 2.091
+score CANT_SEE_AD 1.223
+score CK_HELO_GENERIC 0.249
score COMPENSATION 1.498
-score CTE_8BIT_MISMATCH 0.999
+score CTE_8BIT_MISMATCH 0.998
score DATE_IN_FUTURE_Q_PLUS 3.896
score DEAR_BENEFICIARY 0.001
score DSN_NO_MIMEVERSION 1.997
-score ENCRYPTED_MESSAGE -0.999
+score ENCRYPTED_MESSAGE -0.998
score END_FUTURE_EMAILS 2.497
score FAKE_REPLY_A1 0.001
score FAKE_REPLY_B 0.001
-score FILL_THIS_FORM 0.550
+score FILL_THIS_FORM 0.552
score FONT_INVIS_DIRECT 0.001
score FONT_INVIS_LONG_LINE 2.996
-score FONT_INVIS_MSGID 1.334
-score FONT_INVIS_POSTEXTRAS 0.153
-score FORM_FRAUD 0.999
+score FONT_INVIS_MSGID 1.333
+score FONT_INVIS_POSTEXTRAS 0.159
+score FORM_FRAUD 0.998
score FORM_FRAUD_3 2.499
score FORM_FRAUD_5 0.001
-score FREEMAIL_FORGED_FROMDOMAIN 0.248
+score FREEMAIL_FORGED_FROMDOMAIN 0.249
score FROM_2_EMAILS_SHORT 0.001
score FROM_ADDR_WS 2.996
score FROM_IN_TO_AND_SUBJ 1.797
-score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 1.401
-score FROM_MISSP_EH_MATCH 1.032
-score FROM_MISSP_FREEMAIL 2.114
+score FROM_MISSPACED 0.001 # force non-zero
+score FROM_MISSP_DYNIP 1.405
+score FROM_MISSP_EH_MATCH 0.975
+score FROM_MISSP_FREEMAIL 2.170
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_REPLYTO 1.401
+score FROM_MISSP_REPLYTO 1.497
score FROM_MISSP_USER 0.001
score FROM_MULTI_NORDNS 0.001
-score FROM_NTLD_LINKBAIT 1.116
-score FROM_NTLD_REPLY_FREEMAIL 0.004
+score FROM_NTLD_LINKBAIT 1.152
+score FROM_NTLD_REPLY_FREEMAIL 0.001
score FROM_SUSPICIOUS_NTLD 0.498
score FROM_SUSPICIOUS_NTLD_FP 1.997
-score FROM_UNBAL1 0.821
+score FROM_UNBAL1 1.463
score FROM_UNBAL2 3.196
-score FROM_WSP_TRAIL 3.197
+score FROM_WSP_TRAIL 3.196
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FUZZY_AMAZON 0.001
-score GB_BITCOIN_NH 1.839
+score FUZZY_AMAZON 0.001 # force non-zero
+score GB_BITCOIN_NH 1.322
score GB_CUSTOM_HTM_URI 1.498
-score GB_FAKE_RF_SHORT 1.938
+score GB_FAKE_RF_SHORT 1.945
score GB_FREEMAIL_DISPTO 0.001
score GB_GOOGLE_TRANSL 0.748
-score GOOG_MALWARE_DNLD 3.907
-score GOOG_REDIR_HTML_ONLY 1.997
-score GOOG_REDIR_NORDNS 2.503
-score GOOG_STO_IMG_HTML 2.882
-score GOOG_STO_IMG_NOHTML 2.053
+score GOOG_MALWARE_DNLD 3.214
+score GOOG_REDIR_HTML_ONLY 1.998
+score GOOG_REDIR_NORDNS 2.506
+score GOOG_STO_IMG_HTML 2.529
+score GOOG_STO_IMG_NOHTML 2.055
score GOOG_STO_NOIMG_HTML 2.996
-score HAS_X_OUTGOING_SPAM_STAT 1.287
+score HAS_X_OUTGOING_SPAM_STAT 1.285
score HDRS_LCASE 0.098
-score HDRS_MISSP 2.094
+score HDRS_MISSP 2.092
score HDR_ORDER_FTSDMCXX_DIRECT 0.001
score HDR_ORDER_FTSDMCXX_NORDNS 0.001
score HEADER_FROM_DIFFERENT_DOMAINS 0.249
score HELO_NO_DOMAIN 0.001
score HK_LOTTO 0.001
score HK_NAME_MR_MRS 0.998
-score HK_RANDOM_ENVFROM 0.001 # force non-zero
-score HK_RANDOM_FROM 0.998
+score HK_RANDOM_ENVFROM 0.001
+score HK_RANDOM_FROM 0.999
score HK_RANDOM_REPLYTO 0.998
-score HK_SCAM 0.537
+score HK_SCAM 0.534
score HOSTED_IMG_DIRECT_MX 0.001 # force non-zero
score HOSTED_IMG_MULTI_PUB_01 2.996
-score HTML_ENTITY_ASCII 2.997
-score HTML_ENTITY_ASCII_TINY 1.861
-score HTML_FONT_TINY_NORDNS 1.997
+score HTML_ENTITY_ASCII 2.996
+score HTML_ENTITY_ASCII_TINY 1.803
+score HTML_FONT_TINY_NORDNS 1.998
score HTML_OFF_PAGE 2.151
-score HTML_SINGLET_MANY 2.497
+score HTML_SINGLET_MANY 2.498
score HTML_TAG_BALANCE_CENTER 3.096
-score HTML_TEXT_INVISIBLE_FONT 1.996
-score HTML_TEXT_INVISIBLE_STYLE 0.501
+score HTML_TEXT_INVISIBLE_FONT 1.180
+score HTML_TEXT_INVISIBLE_STYLE 0.500
score JH_SPAMMY_HEADERS 3.496
score KHOP_HELO_FCRDNS 0.399
score LONG_HEX_URI 2.996
score LONG_IMG_URI 0.001
score LONG_INVISIBLE_TEXT 2.996
score LOTS_OF_MONEY 0.010
-score LOTTO_AGENT 0.530
+score LOTTO_AGENT 1.499
score MALFORMED_FREEMAIL 2.896
-score MALWARE_NORDNS 3.140
-score MALWARE_PASSWORD 1.498
-score MANY_HDRS_LCASE 0.062
+score MALWARE_NORDNS 1.022
+score MALWARE_PASSWORD 2.918
+score MANY_HDRS_LCASE 0.001
score MANY_SPAN_IN_TEXT 2.696
-score MILLION_HUNDRED 0.343
+score MILLION_HUNDRED 0.587
score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 0.001
score MIME_NO_TEXT 1.997
score MIXED_CENTER_CASE 2.497
-score MIXED_ES 2.498
-score MIXED_HREF_CASE 1.687
-score MONEY_ATM_CARD 0.001
+score MIXED_ES 2.497
+score MIXED_HREF_CASE 1.536
score MONEY_FORM 0.001
score MONEY_FORM_SHORT 0.001
-score MONEY_FRAUD_3 0.001
-score MONEY_FRAUD_5 1.889
+score MONEY_FRAUD_3 0.001 # force non-zero
+score MONEY_FRAUD_5 1.890
score MONEY_FRAUD_8 0.001
-score MONEY_FREEMAIL_REPTO 2.996
+score MONEY_FREEMAIL_REPTO 2.997
score MONEY_FROM_41 1.997
-score MONEY_FROM_MISSP 0.538
+score MONEY_FROM_MISSP 0.539
score MSMAIL_PRI_ABNORMAL 1.498
-score MSM_PRIO_REPTO 0.585
-score NAME_EMAIL_DIFF 1.727
+score MSM_PRIO_REPTO 0.650
+score NAME_EMAIL_DIFF 1.728
score NA_DOLLARS 1.498
score NICE_REPLY_A -0.005
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.165
-score OBFU_TEXT_ATTACH 0.984
+score NUMBEREND_LINKBAIT 0.509
+score OBFU_TEXT_ATTACH 0.631
score ODD_FREEM_REPTO 2.996
-score PDS_BTC_ID 0.495
+score PDS_BTC_ID 0.496
score PDS_BTC_MSGID 0.001
score PDS_DBL_URL_TNB_RUNON 1.997
score PDS_EMPTYSUBJ_URISHRT 1.498
-score PDS_FRNOM_TODOM_DBL_URL 1.484
-score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 2.349
+score PDS_FRNOM_TODOM_DBL_URL 1.482
+score PDS_FRNOM_TODOM_NAKED_TO 1.498
+score PDS_FROM_2_EMAILS 2.348
score PDS_FROM_2_EMAILS_SHRTNER 0.001
score PDS_FROM_NAME_TO_DOMAIN 1.997
-score PDS_HP_HELO_NORDNS 0.002
+score PDS_HP_HELO_NORDNS 0.493
score PDS_RDNS_DYNAMIC_FP 0.010
-score PDS_SHORTFWD_URISHRT 0.819
+score PDS_SHORTFWD_URISHRT 1.443
score PDS_TINYSUBJ_URISHRT 1.498
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
-score PDS_TO_EQ_FROM_NAME 1.468
-score PHP_ORIG_SCRIPT 1.102
+score PDS_TO_EQ_FROM_NAME 0.940
+score PHISH_ATTACH 2.298
+score PHP_ORIG_SCRIPT 1.101
score PHP_SCRIPT 2.497
-score POSSIBLE_GMAIL_PHISHER 0.545
-score PP_MIME_FAKE_ASCII_TEXT 0.999
+score POSSIBLE_GMAIL_PHISHER 0.525
+score PP_MIME_FAKE_ASCII_TEXT 0.998
score RAND_MKTG_HEADER 1.997
score RATWARE_NO_RDNS 0.001
-score READY_TO_SHIP 1.249
-score RISK_FREE 0.001 # force non-zero
+score READY_TO_SHIP 0.706
+score RISK_FREE 0.001
score SCC_BODY_SINGLE_WORD 0.001
-score SCC_BODY_URI_ONLY 1.404
-score SCC_CANSPAM_1 2.361
+score SCC_BODY_URI_ONLY 1.403
+score SCC_CANSPAM_1 3.051
score SCC_CANSPAM_2 3.296
score SCC_ISEMM_LID_1B 1.498
-score SCC_SPAMMER_ADDR_2 0.919
-score SCC_SPECIAL_GUID 0.001
+score SCC_SPAMMER_ADDR_2 1.021
+score SCC_SPECIAL_GUID 2.299
score SENDGRID_REDIR 1.498
-score SERGIO_SUBJECT_PORN014 2.799
+score SERGIO_SUBJECT_PORN014 2.670
score SERGIO_SUBJECT_VIAGRA01 0.001
-score SHOPIFY_IMG_NOT_RCVD_SFY 2.497
+score SHOPIFY_IMG_NOT_RCVD_SFY 2.498
score SHORTENED_URL_SRC 2.696
score SHORTENER_SHORT_IMG 0.001
score SHORT_SHORTNER 1.997
-score SPOOFED_FREEMAIL_NO_RDNS 1.098
+score SPOOFED_FREEMAIL_NO_RDNS 0.606
score SPOOF_GMAIL_MID 1.498
score STATIC_XPRIO_OLE 0.001
score SUSP_UTF8_WORD_COMBO 2.996
-score SUSP_UTF8_WORD_SUBJ 1.760
-score THIS_AD 1.198
+score SUSP_UTF8_WORD_SUBJ 1.750
+score THIS_AD 1.098
score TO_EQ_FM_DIRECT_MX 0.001
score TO_EQ_FM_DOM_HTML_IMG 2.297
score TO_EQ_FM_HTML_ONLY 0.001
-score TO_IN_SUBJ 0.099
-score TO_NAME_SUBJ_NO_RDNS 2.999
-score TO_NO_BRKTS_FROM_MSSP 2.498
+score TO_IN_SUBJ 0.098
+score TO_NAME_SUBJ_NO_RDNS 2.816
+score TO_NO_BRKTS_FROM_MSSP 2.497
score TO_NO_BRKTS_HTML_IMG 1.997
score TO_NO_BRKTS_HTML_ONLY 1.997
-score TO_NO_BRKTS_MSFT 0.151
+score TO_NO_BRKTS_MSFT 0.642
score TO_NO_BRKTS_NORDNS_HTML 1.997
score TO_NO_BRKTS_PCNT 2.497
-score TVD_IP_HEX 2.597
-score TVD_IP_SING_HEX 1.451
-score TVD_PH_SUBJ_META 2.797
+score TVD_IP_HEX 2.497
+score TVD_IP_SING_HEX 2.062
+score TVD_PH_SUBJ_META 2.796
score TVD_SPACE_ENCODED 2.497
-score TVD_SPACE_RATIO_MINFP 1.100
-score UNDISC_FREEM 2.896
+score TVD_SPACE_RATIO_MINFP 1.101
+score UNDISC_FREEM 2.996
score UNDISC_MONEY 2.896
score UNICODE_OBFU_ASC 2.497
score URI_AZURE_CLOUDAPP 2.996
-score URI_BUFFLY 1.102
+score URI_BUFFLY 0.624
score URI_DOTEDU 1.997
-score URI_GOOGLE_PROXY 2.297
-score URI_HEX_IP 1.957
+score URI_GOOGLE_PROXY 2.298
+score URI_HEX_IP 1.916
score URI_IN_URI_10 2.297
-score URI_ONLY_MSGID_MALF 0.359
-score URI_PHISH 3.996
+score URI_ONLY_MSGID_MALF 0.397
+score URI_PHISH 3.995
score URI_TRY_3LD 1.997
score URI_WPADMIN 2.397
-score URI_WP_DIRINDEX 3.496
+score URI_WP_DIRINDEX 3.497
score URI_WP_HACKED 3.496
-score URI_WP_HACKED_2 1.100
-score VFY_ACCT_NORDNS 2.395
+score URI_WP_HACKED_2 1.101
+score VFY_ACCT_NORDNS 1.944
score WORD_INVIS 0.001
-score WORD_INVIS_MANY 2.184
-score XFER_LOTSA_MONEY 0.001
-score XM_RANDOM 0.001 # force non-zero
-score XM_RECPTID 2.997
+score WORD_INVIS_MANY 2.996
+score XFER_LOTSA_MONEY 0.001 # force non-zero
+score XM_RANDOM 0.001
+score XM_RECPTID 2.996
score XPRIO 2.247
-score YOUR_PERMISSION 2.558
-score YOU_INHERIT 1.151
+score YOUR_PERMISSION 2.599
+score YOU_INHERIT 1.563
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index 3ebf9fa..60da22a 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -1,229 +1,254 @@
-# Using score set 1 logs for revision 1909948 from:
-# ham-net-ena-week0.r1909948.log ham-net-ena-week1.r1909948.log ham-net-ena-week2.r1909948.log ham-net-ena-week3.r1909948.log ham-net-ena-week4.r1909948.log ham-net-giovanni-ham.r1909948.log ham-net-giovanni-spammy.r1909948.log ham-net-giovanni-spam.r1909948.log ham-net-grenier.r1909948.log ham-net-hege.r1909948.log ham-net-jhardin.r1909948.log ham-net-llanga.r1909948.log ham-net-mmiroslaw-mails-ham.r1909948.log ham-net-mmiroslaw-mails-spam.r1909948.log ham-net-spamsponge.r1909948.log ham-net-thendrikx.r1909948.log ham-net-tsz-corpus.r1909948.log spam-net-ena-week0.r1909948.log spam-net-ena-week1.r1909948.log spam-net-ena-week2.r1909948.log spam-net-ena-week3.r1909948.log spam-net-ena-week4.r1909948.log spam-net-giovanni-ham.r1909948.log spam-net-giovanni-spammy.r1909948.log spam-net-giovanni-spam.r1909948.log spam-net-grenier.r1909948.log spam-net-hege.r1909948.log spam-net-jhardin.r1909948.log spam-net-llanga.r1909948.log spam-net-mmiroslaw-mails-ham.r1909948.log spam-net-mmiroslaw-mails-spam.r1909948.log spam-net-spamsponge.r1909948.log spam-net-thendrikx.r1909948.log spam-net-tsz-corpus.r1909948.log
+# Using score set 1 logs for revision 1910082 from:
+# ham-net-ena-week0.r1910082.log ham-net-ena-week1.r1910082.log ham-net-ena-week2.r1910082.log ham-net-ena-week3.r1910082.log ham-net-ena-week4.r1910082.log ham-net-giovanni-ham.r1910082.log ham-net-giovanni-spammy.r1910082.log ham-net-giovanni-spam.r1910082.log ham-net-grenier.r1910082.log ham-net-hege.r1910082.log ham-net-jhardin.r1910082.log ham-net-llanga.r1910082.log ham-net-mmiroslaw-mails-ham.r1910082.log ham-net-mmiroslaw-mails-spam.r1910082.log ham-net-spamsponge.r1910082.log ham-net-thendrikx.r1910082.log ham-net-tsz-corpus.r1910082.log spam-net-ena-week0.r1910082.log spam-net-ena-week1.r1910082.log spam-net-ena-week2.r1910082.log spam-net-ena-week3.r1910082.log spam-net-ena-week4.r1910082.log spam-net-giovanni-ham.r1910082.log spam-net-giovanni-spammy.r1910082.log spam-net-giovanni-spam.r1910082.log spam-net-grenier.r1910082.log spam-net-hege.r1910082.log spam-net-jhardin.r1910082.log spam-net-llanga.r1910082.log spam-net-mmiroslaw-mails-ham.r1910082.log spam-net-mmiroslaw-mails-spam.r1910082.log spam-net-spamsponge.r1910082.log spam-net-thendrikx.r1910082.log spam-net-tsz-corpus.r1910082.log
-score ACCT_PHISHING_MANY 2.999
+score ACCT_PHISHING_MANY 2.996
score AC_BR_BONANZA 0.001 # force non-zero
score AC_DIV_BONANZA 0.001
-score AC_FROM_MANY_DOTS 0.552
-score AC_HTML_NONSENSE_TAGS 1.999
-score ADMITS_SPAM 0.001
-score ADVANCE_FEE_2_NEW_MONEY 1.999
-score ADVANCE_FEE_3_NEW 3.259
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.001 # force non-zero
-score ADVANCE_FEE_3_NEW_MONEY 2.599
+score AC_FROM_MANY_DOTS 0.497
+score AC_HTML_NONSENSE_TAGS 1.997
+score ADMITS_SPAM 0.236
+score ADVANCE_FEE_2_NEW_FRM_MNY 0.791
+score ADVANCE_FEE_2_NEW_MONEY 1.997
+score ADVANCE_FEE_3_NEW 1.780
+score ADVANCE_FEE_3_NEW_MONEY 2.938
score ADVANCE_FEE_4_NEW 2.299
-score ADVANCE_FEE_4_NEW_MONEY 2.399
-score ADVANCE_FEE_5_NEW 1.396
+score ADVANCE_FEE_4_NEW_MONEY 0.001
+score ADVANCE_FEE_5_NEW 0.896
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001
-score AD_PREFS 0.096
+score AD_PREFS 0.498
+score ALIBABA_IMG_NOT_RCVD_ALI 0.001
score AMAZON_IMG_NOT_RCVD_AMZN 0.001
-score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 # force non-zero
+score AXB_XM_FORGED_OL2600 1.633
score BIGNUM_EMAILS_FREEM 0.001
-score BIGNUM_EMAILS_MANY 2.999
+score BIGNUM_EMAILS_MANY 2.996
score BITCOIN_DEADLINE 2.999
-score BITCOIN_EXTORT_01 3.777
-score BITCOIN_MALF_HTML 2.417
-score BITCOIN_MALWARE 1.941
+score BITCOIN_EXTORT_01 0.786
+score BITCOIN_MALF_HTML 1.586
+score BITCOIN_MALWARE 2.325
score BITCOIN_OBFU_SUBJ 1.765
-score BITCOIN_SPAM_02 2.499
-score BITCOIN_SPAM_03 0.001
-score BITCOIN_SPAM_05 1.518
-score BITCOIN_SPAM_07 2.331
-score BITCOIN_XPRIO 0.650
-score BITCOIN_YOUR_INFO 2.999
-score BODY_SINGLE_URI 2.132
+score BITCOIN_SPAM_02 2.497
+score BITCOIN_SPAM_03 1.214
+score BITCOIN_SPAM_05 2.497
+score BITCOIN_SPAM_07 3.407
+score BITCOIN_XPRIO 0.001
+score BITCOIN_YOUR_INFO 2.997
+score BODY_SINGLE_URI 1.976
score BODY_SINGLE_WORD 0.001
score BODY_URI_ONLY 0.001
-score CANT_SEE_AD 1.397
-score CK_HELO_GENERIC 0.249
-score COMPENSATION 1.026
+score CANT_SEE_AD 1.568
+score CK_HELO_GENERIC 0.248
+score COMPENSATION 1.498
score CTE_8BIT_MISMATCH 0.001
-score DATE_IN_FUTURE_Q_PLUS 3.699
-score DEAR_BENEFICIARY 0.043
-score DKIMWL_WL_HIGH -0.001
+score DATE_IN_FUTURE_Q_PLUS 3.796
+score DEAR_BENEFICIARY 0.001
+score DKIMWL_WL_HIGH -0.164
score DKIMWL_WL_MED -0.001
score DKIMWL_WL_MEDHI -0.001
-score DSN_NO_MIMEVERSION 1.999
+score DSN_NO_MIMEVERSION 1.997
score ENCRYPTED_MESSAGE -0.999
-score END_FUTURE_EMAILS 2.499
-score FAKE_REPLY_A1 0.001
+score END_FUTURE_EMAILS 2.497
+score FAKE_REPLY_A1 0.001 # force non-zero
score FAKE_REPLY_B 0.001
score FILL_THIS_FORM 0.001
score FONT_INVIS_DIRECT 0.001
-score FONT_INVIS_LONG_LINE 2.999
-score FONT_INVIS_MSGID 0.001
-score FONT_INVIS_POSTEXTRAS 1.388
-score FORGED_SPF_HELO 0.284
+score FONT_INVIS_LONG_LINE 2.996
+score FONT_INVIS_MSGID 0.232
+score FONT_INVIS_POSTEXTRAS 2.174
+score FORGED_SPF_HELO 0.001
score FORM_FRAUD 0.001
-score FORM_FRAUD_3 2.299
+score FORM_FRAUD_3 2.398
score FORM_FRAUD_5 0.001
-score FREEMAIL_FORGED_FROMDOMAIN 0.249
-score FROM_2_EMAILS_SHORT 0.163
-score FROM_ADDR_WS 2.127
-score FROM_FMBLA_NEWDOM 0.001
-score FROM_FMBLA_NEWDOM14 0.965
-score FROM_FMBLA_NEWDOM28 0.001
-score FROM_GOV_DKIM_AU -0.044
-score FROM_IN_TO_AND_SUBJ 1.799
+score FREEMAIL_FORGED_FROMDOMAIN 0.248
+score FROM_2_EMAILS_SHORT 0.001
+score FROM_ADDR_WS 2.996
+score FROM_FMBLA_NEWDOM 0.449
+score FROM_FMBLA_NEWDOM14 0.998
+score FROM_FMBLA_NEWDOM28 0.798
+score FROM_GOV_DKIM_AU -0.120
+score FROM_IN_TO_AND_SUBJ 1.899
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 0.917
-score FROM_MISSP_EH_MATCH 1.548
-score FROM_MISSP_FREEMAIL 2.999
+score FROM_MISSP_DYNIP 2.596
+score FROM_MISSP_EH_MATCH 0.620
+score FROM_MISSP_FREEMAIL 3.196
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_REPLYTO 0.846
+score FROM_MISSP_REPLYTO 0.001
score FROM_MISSP_SPF_FAIL 0.001
score FROM_MISSP_USER 0.001
-score FROM_NTLD_LINKBAIT 1.136
-score FROM_PAYPAL_SPOOF 1.415
-score FROM_SUSPICIOUS_NTLD 0.192
-score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_WSP_TRAIL 2.899
-score FSL_BULK_SIG 0.001 # force non-zero
+score FROM_MULTI_NORDNS 0.001
+score FROM_NTLD_LINKBAIT 1.040
+score FROM_PAYPAL_SPOOF 0.001
+score FROM_SUSPICIOUS_NTLD 0.190
+score FROM_SUSPICIOUS_NTLD_FP 1.997
+score FROM_UNBAL1 1.789
+score FROM_UNBAL2 3.096
+score FROM_WSP_TRAIL 2.687
+score FSL_BULK_SIG 0.001
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
score FUZZY_AMAZON 0.001
-score GB_BITCOIN_NH 1.224
-score GB_CUSTOM_HTM_URI 0.581
-score GB_FAKE_RF_SHORT 1.999
+score GB_BITCOIN_NH 2.996
+score GB_CUSTOM_HTM_URI 0.835
+score GB_FAKE_RF_SHORT 1.997
score GB_FREEMAIL_DISPTO 0.001
score GB_GOOGLE_TRANSL 0.749
-score GB_HASHBL_BTC 1.811
-score GOOG_MALWARE_DNLD 0.576
-score GOOG_REDIR_HTML_ONLY 2.000
-score GOOG_REDIR_NORDNS 3.099
-score GOOG_STO_IMG_NOHTML 2.499
-score GOOG_STO_NOIMG_HTML 2.999
-score HAS_X_OUTGOING_SPAM_STAT 0.972
-score HDRS_LCASE 0.099
-score HDRS_MISSP 0.276
+score GB_HASHBL_BTC 0.001 # force non-zero
+score GOOG_MALWARE_DNLD 2.044
+score GOOG_REDIR_HTML_ONLY 1.997
+score GOOG_REDIR_NORDNS 3.096
+score GOOG_STO_IMG_HTML 2.996
+score GOOG_STO_IMG_NOHTML 2.497
+score GOOG_STO_NOIMG_HTML 2.996
+score HAS_X_OUTGOING_SPAM_STAT 0.800
+score HDRS_LCASE 0.098
+score HDRS_MISSP 0.001
score HDR_ORDER_FTSDMCXX_DIRECT 0.001
score HDR_ORDER_FTSDMCXX_NORDNS 0.001
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250
+score HEADER_FROM_DIFFERENT_DOMAINS 0.248
score HELO_NO_DOMAIN 0.001
score HK_LOTTO 0.001
-score HK_NAME_MR_MRS 0.999
-score HK_RANDOM_ENVFROM 0.001 # force non-zero
+score HK_NAME_MR_MRS 0.998
+score HK_RANDOM_ENVFROM 0.001
score HK_RANDOM_FROM 0.001
-score HK_RANDOM_REPLYTO 1.000
-score HK_SCAM 0.001 # force non-zero
+score HK_RANDOM_REPLYTO 0.998
+score HK_SCAM 0.001
score HOSTED_IMG_DIRECT_MX 0.001
-score HOSTED_IMG_FREEM 0.001 # force non-zero
-score HOSTED_IMG_MULTI_PUB_01 2.999
-score HTML_ENTITY_ASCII 2.999
-score HTML_ENTITY_ASCII_TINY 2.909
+score HOSTED_IMG_MULTI_PUB_01 2.996
+score HTML_ENTITY_ASCII 2.996
+score HTML_ENTITY_ASCII_TINY 1.233
+score HTML_FONT_TINY_NORDNS 0.001 # force non-zero
score HTML_OFF_PAGE 0.001
-score HTML_TAG_BALANCE_CENTER 3.097
-score HTML_TEXT_INVISIBLE_FONT 1.999
+score HTML_SINGLET_MANY 2.497
+score HTML_TAG_BALANCE_CENTER 2.996
+score HTML_TEXT_INVISIBLE_FONT 1.755
score HTML_TEXT_INVISIBLE_STYLE 0.001
-score JH_SPAMMY_HEADERS 3.499
-score KHOP_HELO_FCRDNS 0.396
-score LONG_HEX_URI 2.947
+score JH_SPAMMY_HEADERS 3.496
+score KHOP_HELO_FCRDNS 0.399
+score LONG_HEX_URI 2.520
score LONG_IMG_URI 0.001
-score LONG_INVISIBLE_TEXT 1.828
-score LOTS_OF_MONEY 0.010
-score MALWARE_NORDNS 2.180
-score MALWARE_PASSWORD 2.129
-score MANY_HDRS_LCASE 0.001
+score LONG_INVISIBLE_TEXT 2.676
+score LOTS_OF_MONEY 0.009
+score LOTTO_AGENT 0.207
+score MALFORMED_FREEMAIL 2.260
+score MALWARE_NORDNS 1.626
+score MANY_HDRS_LCASE 0.098
+score MANY_SPAN_IN_TEXT 2.696
score MILLION_HUNDRED 0.001
-score MILLION_USD 1.217
+score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 0.001
-score MIME_NO_TEXT 1.999
-score MIXED_CENTER_CASE 2.167
-score MIXED_ES 2.499
+score MIME_NO_TEXT 1.672
+score MIXED_CENTER_CASE 1.892
+score MIXED_ES 2.398
score MIXED_HREF_CASE 1.999
-score MONEY_ATM_CARD 1.210
score MONEY_FORM 0.001
-score MONEY_FORM_SHORT 0.001 # force non-zero
+score MONEY_FORM_SHORT 0.001
score MONEY_FRAUD_3 0.001
-score MONEY_FRAUD_5 2.599
+score MONEY_FRAUD_5 2.696
score MONEY_FRAUD_8 0.001
-score MONEY_FREEMAIL_REPTO 1.841
-score MONEY_FROM_41 1.999
+score MONEY_FREEMAIL_REPTO 1.587
+score MONEY_FROM_41 1.938
score MONEY_FROM_MISSP 0.001
-score MSMAIL_PRI_ABNORMAL 0.213
-score NA_DOLLARS 0.001 # force non-zero
-score NICE_REPLY_A -0.091
+score MSMAIL_PRI_ABNORMAL 0.451
+score MSM_PRIO_REPTO 1.466
+score NAME_EMAIL_DIFF 0.001
+score NA_DOLLARS 0.001
+score NICE_REPLY_A -0.093
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
score NSL_RCVD_HELO_USER 0.001
-score OBFU_TEXT_ATTACH 0.325
-score ODD_FREEM_REPTO 2.538
-score PDS_BTC_ID 0.003
-score PDS_BTC_MSGID 0.553
+score NUMBEREND_LINKBAIT 0.463
+score OBFU_TEXT_ATTACH 0.001
+score ODD_FREEM_REPTO 2.997
+score PDS_BTC_ID 0.001
+score PDS_BTC_MSGID 0.001
score PDS_DBL_URL_TNB_RUNON 1.999
-score PDS_EMPTYSUBJ_URISHRT 0.327
-score PDS_FRNOM_TODOM_DBL_URL 1.499
-score PDS_FRNOM_TODOM_NAKED_TO 1.198
-score PDS_FROM_2_EMAILS 2.580
-score PDS_FROM_2_EMAILS_SHRTNER 0.641
-score PDS_FROM_NAME_TO_DOMAIN 1.881
-score PDS_TINYSUBJ_URISHRT 1.499
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.718
+score PDS_EMPTYSUBJ_URISHRT 0.640
+score PDS_FRNOM_TODOM_DBL_URL 1.498
+score PDS_FRNOM_TODOM_NAKED_TO 1.008
+score PDS_FROM_2_EMAILS 2.465
+score PDS_FROM_2_EMAILS_SHRTNER 0.001
+score PDS_FROM_NAME_TO_DOMAIN 1.989
+score PDS_HP_HELO_NORDNS 0.001 # force non-zero
+score PDS_RDNS_DYNAMIC_FP 0.001 # force non-zero
+score PDS_TINYSUBJ_URISHRT 0.542
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.001
score PDS_TO_EQ_FROM_NAME 0.001
-score PHISH_ATTACH 2.200
score PHP_ORIG_SCRIPT 0.001
-score PHP_SCRIPT 2.326
-score POSSIBLE_GMAIL_PHISHER 2.499
+score PHP_SCRIPT 2.493
+score POSSIBLE_GMAIL_PHISHER 2.258
score PP_MIME_FAKE_ASCII_TEXT 0.001
-score RAND_HEADER_MANY 0.043
-score RAND_MKTG_HEADER 1.999
+score RAND_MKTG_HEADER 1.997
score RATWARE_NO_RDNS 0.001
score RCVD_IN_MSPIKE_H2 -0.001
+score READY_TO_SHIP 0.417
+score RISK_FREE 0.001 # force non-zero
score SCC_BODY_SINGLE_WORD 0.001
-score SCC_BODY_URI_ONLY 1.172
-score SCC_CANSPAM_1 1.156
-score SCC_CANSPAM_2 2.899
-score SCC_ISEMM_LID_1B 1.499
-score SENDGRID_REDIR 1.068
+score SCC_BODY_URI_ONLY 0.657
+score SCC_CANSPAM_1 2.363
+score SCC_CANSPAM_2 3.196
+score SCC_ISEMM_LID_1B 1.498
+score SCC_SPAMMER_ADDR_2 1.606
+score SCC_SPECIAL_GUID 2.199
+score SENDGRID_REDIR 1.067
+score SERGIO_SUBJECT_PORN014 0.574
score SERGIO_SUBJECT_VIAGRA01 0.001
-score SHOPIFY_IMG_NOT_RCVD_SFY 2.499
+score SHOPIFY_IMG_NOT_RCVD_SFY 2.497
+score SHORTENED_URL_SRC 2.696
score SHORTENER_SHORT_IMG 0.001
-score SHORT_SHORTNER 1.039
-score SPOOFED_FREEMAIL 0.001
+score SHORT_SHORTNER 1.829
+score SPOOFED_FREEMAIL 0.001 # force non-zero
score SPOOFED_FREEMAIL_NO_RDNS 0.001
-score SPOOFED_FREEM_REPTO 2.499
+score SPOOFED_FREEM_REPTO 2.497
score SPOOF_GMAIL_MID 0.001
-score STATIC_XPRIO_OLE 1.861
-score SUSP_UTF8_WORD_COMBO 2.261
-score SUSP_UTF8_WORD_SUBJ 0.676
-score THIS_AD 1.099
+score STATIC_XPRIO_OLE 0.001
+score SUSP_UTF8_WORD_COMBO 2.996
+score SUSP_UTF8_WORD_SUBJ 0.471
+score THIS_AD 1.199
+score THIS_IS_ADV_SUSP_NTLD 1.499
score TO_EQ_FM_DIRECT_MX 0.001
-score TO_EQ_FM_DOM_HTML_IMG 2.299
+score TO_EQ_FM_DOM_HTML_IMG 2.103
score TO_EQ_FM_DOM_SPF_FAIL 0.001
-score TO_EQ_FM_HTML_ONLY 2.137
-score TO_EQ_FM_SPF_FAIL 0.001
+score TO_EQ_FM_HTML_ONLY 2.132
+score TO_EQ_FM_SPF_FAIL 0.001 # force non-zero
score TO_IN_SUBJ 0.099
-score TO_NAME_SUBJ_NO_RDNS 2.999
-score TO_NO_BRKTS_FROM_MSSP 1.753
-score TO_NO_BRKTS_HTML_IMG 1.999
-score TO_NO_BRKTS_HTML_ONLY 1.999
+score TO_NAME_SUBJ_NO_RDNS 2.996
+score TO_NO_BRKTS_FROM_MSSP 1.801
+score TO_NO_BRKTS_HTML_IMG 1.997
+score TO_NO_BRKTS_HTML_ONLY 1.997
score TO_NO_BRKTS_MSFT 0.001
-score TO_NO_BRKTS_NORDNS_HTML 1.999
-score TO_NO_BRKTS_PCNT 2.499
-score TVD_PH_SUBJ_META 2.699
-score TVD_SPACE_ENCODED 0.001
+score TO_NO_BRKTS_NORDNS_HTML 1.997
+score TO_NO_BRKTS_PCNT 2.497
+score TVD_IP_HEX 2.497
+score TVD_IP_SING_HEX 1.971
+score TVD_PH_SUBJ_META 2.610
+score TVD_SPACE_ENCODED 1.331
score TVD_SPACE_RATIO_MINFP 0.001
-score UNDISC_FREEM 2.799
-score UNDISC_MONEY 2.699
-score UNICODE_OBFU_ASC 2.499
-score URI_DOTEDU 1.999
-score URI_GOOGLE_PROXY 2.400
-score URI_ONLY_MSGID_MALF 1.999
-score URI_PHISH 3.993
-score URI_TRY_3LD 1.999
-score URI_WPADMIN 2.299
-score URI_WP_DIRINDEX 3.499
-score URI_WP_HACKED 0.854
-score URI_WP_HACKED_2 2.500
+score UNDISC_FREEM 2.996
+score UNDISC_MONEY 2.896
+score UNICODE_OBFU_ASC 2.497
+score URI_AZURE_CLOUDAPP 2.996
+score URI_BUFFLY 1.826
+score URI_DOTEDU 1.997
+score URI_GOOGLE_PROXY 2.397
+score URI_HEX_IP 0.870
+score URI_IN_URI_10 2.297
+score URI_ONLY_MSGID_MALF 1.997
+score URI_PHISH 3.987
+score URI_TRY_3LD 1.514
+score URI_WPADMIN 2.397
+score URI_WP_DIRINDEX 3.496
+score URI_WP_HACKED 1.216
+score URI_WP_HACKED_2 2.497
score VFY_ACCT_NORDNS 0.001
-score WORD_INVIS 0.521
-score WORD_INVIS_MANY 2.992
-score XFER_LOTSA_MONEY 0.001 # force non-zero
+score WORD_INVIS 0.803
+score WORD_INVIS_MANY 2.997
+score XFER_LOTSA_MONEY 0.001
score XM_RANDOM 0.001
+score XM_RECPTID 1.867
score XPRIO 0.001
-score YOUR_PERMISSION 2.129
-score YOU_INHERIT 2.499
+score YOUR_PERMISSION 2.033
+score YOU_INHERIT 0.950
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
@@ -236,8 +261,6 @@
score AC_SPAMMY_URI_PATTERNS9 1.000
score ADULT_DATING_COMPANY 10.000
score ADVANCE_FEE_2_NEW_FORM 1.000
-score ADVANCE_FEE_2_NEW_FRM_MNY 1.000
-score ALIBABA_IMG_NOT_RCVD_ALI 1.000
score APP_DEVELOPMENT_FREEM 1.000
score APP_DEVELOPMENT_NORDNS 1.000
score BEBEE_IMG_NOT_RCVD_BB 1.000
@@ -299,15 +322,14 @@
score GOOG_STO_EMAIL_PHISH 1.000
score GOOG_STO_HTML_PHISH 1.000
score GOOG_STO_HTML_PHISH_MANY 1.000
-score GOOG_STO_IMG_HTML 1.000
score HAS_X_NO_RELAY 1.000
score HEXHASH_WORD 1.000
score HK_CTE_RAW 1.000
score HK_RCVD_IP_MULTICAST 1.000
score HOSTED_IMG_DQ_UNSUB 1.000
+score HOSTED_IMG_FREEM 1.000
score HOSTED_IMG_MULTI 1.000
score HTML_SHRT_CMNT_OBFU_MANY 1.000
-score HTML_SINGLET_MANY 1.000
score IMG_ONLY_FM_DOM_INFO 1.000
score JH_SPAMMY_PATTERN01 1.000
score JH_SPAMMY_PATTERN02 1.000
@@ -316,6 +338,7 @@
score LIST_PRTL_SAME_USER 1.000
score LUCRATIVE 1.000
score MALF_HTML_B64 1.000
+score MALWARE_PASSWORD 1.000
score MIXED_AREA_CASE 1.000
score MIXED_FONT_CASE 1.000
score MIXED_IMG_CASE 1.000
@@ -325,7 +348,6 @@
score MONERO_PAY_ME 1.000
score MSGID_DOLLARS_URI_IMG 1.000
score MSGID_HDR_MALF 1.000
-score MSM_PRIO_REPTO 1.000
score NEWEGG_IMG_NOT_RCVD_NEGG 1.000
score NEW_PRODUCTS 1.000
score OBFU_BITCOIN 1.000
@@ -340,6 +362,7 @@
score PUMPDUMP 1.000
score PUMPDUMP_MULTI 1.000
score RAND_HEADER_LIST_SPOOF 1.000
+score RAND_HEADER_MANY 1.000
score RCVD_DOTEDU_SHORT 1.000
score RCVD_DOTEDU_SUSP_URI 1.000
score RDNS_NUM_TLD_ATCHNX 1.000
@@ -371,21 +394,17 @@
score SYSADMIN 1.000
score TAGSTAT_IMG_NOT_RCVD_TGST 1.000
score TARINGANET_IMG_NOT_RCVD_TN 1.000
-score THIS_IS_ADV_SUSP_NTLD 1.000
score TONLINE_FAKE_DKIM 1.000
score TW_GIBBERISH_MANY 1.000
score UC_GIBBERISH_OBFU 1.000
score UNICODE_OBFU_ZW 1.000
score UNSUB_GOOG_FORM 1.000
score URI_ADOBESPARK 1.000
-score URI_AZURE_CLOUDAPP 1.000
-score URI_BUFFLY 1.000
score URI_DASHGOVEDU 1.000
score URI_DATA 1.000
score URI_DOTEDU_ENTITY 1.000
score URI_FIREBASEAPP 1.000
score URI_GOOG_STO_SPAMMY 3.000
-score URI_HEX_IP 1.000
score URI_IMG_WP_REDIR 1.000
score URI_LONG_REPEAT 1.000
score URI_OPTOUT_3LD 1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index dddca90..6481c64 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -7,233 +7,233 @@
score AC_FROM_MANY_DOTS 2.996
score AC_HTML_NONSENSE_TAGS 1.997
score ADMITS_SPAM 3.196
-score ADVANCE_FEE_2_NEW_FRM_MNY 0.542
+score ADVANCE_FEE_2_NEW_FRM_MNY 0.793
score ADVANCE_FEE_2_NEW_MONEY 1.997
-score ADVANCE_FEE_3_NEW 2.998
+score ADVANCE_FEE_3_NEW 2.993
score ADVANCE_FEE_3_NEW_MONEY 3.099
score ADVANCE_FEE_4_NEW 2.397
-score ADVANCE_FEE_4_NEW_MONEY 2.397
-score ADVANCE_FEE_5_NEW 1.008
+score ADVANCE_FEE_4_NEW_MONEY 2.398
+score ADVANCE_FEE_5_NEW 1.000
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001
score AD_PREFS 0.498
score ALIBABA_IMG_NOT_RCVD_ALI 0.001
score AMAZON_IMG_NOT_RCVD_AMZN 0.001
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XM_FORGED_OL2600 0.013
+score AXB_XM_FORGED_OL2600 2.188
score BIGNUM_EMAILS_FREEM 0.001
score BIGNUM_EMAILS_MANY 2.996
-score BITCOIN_DEADLINE 1.872
-score BITCOIN_EXTORT_01 2.662
-score BITCOIN_MALF_HTML 2.598
-score BITCOIN_MALWARE 0.684
+score BITCOIN_DEADLINE 1.856
+score BITCOIN_EXTORT_01 3.178
+score BITCOIN_MALF_HTML 2.592
+score BITCOIN_MALWARE 1.985
score BITCOIN_OBFU_SUBJ 3.496
-score BITCOIN_SPAM_02 2.124
+score BITCOIN_SPAM_02 1.985
score BITCOIN_SPAM_03 0.001
-score BITCOIN_SPAM_07 3.497
-score BITCOIN_XPRIO 0.001 # force non-zero
+score BITCOIN_SPAM_07 3.496
+score BITCOIN_XPRIO 0.001
score BITCOIN_YOUR_INFO 2.996
-score BODY_SINGLE_URI 2.492
+score BODY_SINGLE_URI 2.493
score BODY_SINGLE_WORD 0.001
-score BODY_URI_ONLY 2.105
-score CANT_SEE_AD 0.753
-score CK_HELO_GENERIC 0.248
+score BODY_URI_ONLY 2.091
+score CANT_SEE_AD 1.223
+score CK_HELO_GENERIC 0.249
score COMPENSATION 1.498
-score CTE_8BIT_MISMATCH 0.999
+score CTE_8BIT_MISMATCH 0.998
score DATE_IN_FUTURE_Q_PLUS 3.896
score DEAR_BENEFICIARY 0.001
score DSN_NO_MIMEVERSION 1.997
-score ENCRYPTED_MESSAGE -0.999
+score ENCRYPTED_MESSAGE -0.998
score END_FUTURE_EMAILS 2.497
score FAKE_REPLY_A1 0.001
score FAKE_REPLY_B 0.001
-score FILL_THIS_FORM 0.550
+score FILL_THIS_FORM 0.552
score FONT_INVIS_DIRECT 0.001
score FONT_INVIS_LONG_LINE 2.996
-score FONT_INVIS_MSGID 1.334
-score FONT_INVIS_POSTEXTRAS 0.153
-score FORM_FRAUD 0.999
+score FONT_INVIS_MSGID 1.333
+score FONT_INVIS_POSTEXTRAS 0.159
+score FORM_FRAUD 0.998
score FORM_FRAUD_3 2.499
score FORM_FRAUD_5 0.001
-score FREEMAIL_FORGED_FROMDOMAIN 0.248
+score FREEMAIL_FORGED_FROMDOMAIN 0.249
score FROM_2_EMAILS_SHORT 0.001
score FROM_ADDR_WS 2.996
score FROM_IN_TO_AND_SUBJ 1.797
-score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 1.401
-score FROM_MISSP_EH_MATCH 1.032
-score FROM_MISSP_FREEMAIL 2.114
+score FROM_MISSPACED 0.001 # force non-zero
+score FROM_MISSP_DYNIP 1.405
+score FROM_MISSP_EH_MATCH 0.975
+score FROM_MISSP_FREEMAIL 2.170
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_REPLYTO 1.401
+score FROM_MISSP_REPLYTO 1.497
score FROM_MISSP_USER 0.001
score FROM_MULTI_NORDNS 0.001
-score FROM_NTLD_LINKBAIT 1.116
-score FROM_NTLD_REPLY_FREEMAIL 0.004
+score FROM_NTLD_LINKBAIT 1.152
+score FROM_NTLD_REPLY_FREEMAIL 0.001
score FROM_SUSPICIOUS_NTLD 0.498
score FROM_SUSPICIOUS_NTLD_FP 1.997
-score FROM_UNBAL1 0.821
+score FROM_UNBAL1 1.463
score FROM_UNBAL2 3.196
-score FROM_WSP_TRAIL 3.197
+score FROM_WSP_TRAIL 3.196
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FUZZY_AMAZON 0.001
-score GB_BITCOIN_NH 1.839
+score FUZZY_AMAZON 0.001 # force non-zero
+score GB_BITCOIN_NH 1.322
score GB_CUSTOM_HTM_URI 1.498
-score GB_FAKE_RF_SHORT 1.938
+score GB_FAKE_RF_SHORT 1.945
score GB_FREEMAIL_DISPTO 0.001
score GB_GOOGLE_TRANSL 0.748
-score GOOG_MALWARE_DNLD 3.907
-score GOOG_REDIR_HTML_ONLY 1.997
-score GOOG_REDIR_NORDNS 2.503
-score GOOG_STO_IMG_HTML 2.882
-score GOOG_STO_IMG_NOHTML 2.053
+score GOOG_MALWARE_DNLD 3.214
+score GOOG_REDIR_HTML_ONLY 1.998
+score GOOG_REDIR_NORDNS 2.506
+score GOOG_STO_IMG_HTML 2.529
+score GOOG_STO_IMG_NOHTML 2.055
score GOOG_STO_NOIMG_HTML 2.996
-score HAS_X_OUTGOING_SPAM_STAT 1.287
+score HAS_X_OUTGOING_SPAM_STAT 1.285
score HDRS_LCASE 0.098
-score HDRS_MISSP 2.094
+score HDRS_MISSP 2.092
score HDR_ORDER_FTSDMCXX_DIRECT 0.001
score HDR_ORDER_FTSDMCXX_NORDNS 0.001
score HEADER_FROM_DIFFERENT_DOMAINS 0.249
score HELO_NO_DOMAIN 0.001
score HK_LOTTO 0.001
score HK_NAME_MR_MRS 0.998
-score HK_RANDOM_ENVFROM 0.001 # force non-zero
-score HK_RANDOM_FROM 0.998
+score HK_RANDOM_ENVFROM 0.001
+score HK_RANDOM_FROM 0.999
score HK_RANDOM_REPLYTO 0.998
-score HK_SCAM 0.537
+score HK_SCAM 0.534
score HOSTED_IMG_DIRECT_MX 0.001 # force non-zero
score HOSTED_IMG_MULTI_PUB_01 2.996
-score HTML_ENTITY_ASCII 2.997
-score HTML_ENTITY_ASCII_TINY 1.861
-score HTML_FONT_TINY_NORDNS 1.997
+score HTML_ENTITY_ASCII 2.996
+score HTML_ENTITY_ASCII_TINY 1.803
+score HTML_FONT_TINY_NORDNS 1.998
score HTML_OFF_PAGE 2.151
-score HTML_SINGLET_MANY 2.497
+score HTML_SINGLET_MANY 2.498
score HTML_TAG_BALANCE_CENTER 3.096
-score HTML_TEXT_INVISIBLE_FONT 1.996
-score HTML_TEXT_INVISIBLE_STYLE 0.501
+score HTML_TEXT_INVISIBLE_FONT 1.180
+score HTML_TEXT_INVISIBLE_STYLE 0.500
score JH_SPAMMY_HEADERS 3.496
score KHOP_HELO_FCRDNS 0.399
score LONG_HEX_URI 2.996
score LONG_IMG_URI 0.001
score LONG_INVISIBLE_TEXT 2.996
score LOTS_OF_MONEY 0.010
-score LOTTO_AGENT 0.530
+score LOTTO_AGENT 1.499
score MALFORMED_FREEMAIL 2.896
-score MALWARE_NORDNS 3.140
-score MALWARE_PASSWORD 1.498
-score MANY_HDRS_LCASE 0.062
+score MALWARE_NORDNS 1.022
+score MALWARE_PASSWORD 2.918
+score MANY_HDRS_LCASE 0.001
score MANY_SPAN_IN_TEXT 2.696
-score MILLION_HUNDRED 0.343
+score MILLION_HUNDRED 0.587
score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 0.001
score MIME_NO_TEXT 1.997
score MIXED_CENTER_CASE 2.497
-score MIXED_ES 2.498
-score MIXED_HREF_CASE 1.687
-score MONEY_ATM_CARD 0.001
+score MIXED_ES 2.497
+score MIXED_HREF_CASE 1.536
score MONEY_FORM 0.001
score MONEY_FORM_SHORT 0.001
-score MONEY_FRAUD_3 0.001
-score MONEY_FRAUD_5 1.889
+score MONEY_FRAUD_3 0.001 # force non-zero
+score MONEY_FRAUD_5 1.890
score MONEY_FRAUD_8 0.001
-score MONEY_FREEMAIL_REPTO 2.996
+score MONEY_FREEMAIL_REPTO 2.997
score MONEY_FROM_41 1.997
-score MONEY_FROM_MISSP 0.538
+score MONEY_FROM_MISSP 0.539
score MSMAIL_PRI_ABNORMAL 1.498
-score MSM_PRIO_REPTO 0.585
-score NAME_EMAIL_DIFF 1.727
+score MSM_PRIO_REPTO 0.650
+score NAME_EMAIL_DIFF 1.728
score NA_DOLLARS 1.498
score NICE_REPLY_A -0.005
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.165
-score OBFU_TEXT_ATTACH 0.984
+score NUMBEREND_LINKBAIT 0.509
+score OBFU_TEXT_ATTACH 0.631
score ODD_FREEM_REPTO 2.996
-score PDS_BTC_ID 0.495
+score PDS_BTC_ID 0.496
score PDS_BTC_MSGID 0.001
score PDS_DBL_URL_TNB_RUNON 1.997
score PDS_EMPTYSUBJ_URISHRT 1.498
-score PDS_FRNOM_TODOM_DBL_URL 1.484
-score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 2.349
+score PDS_FRNOM_TODOM_DBL_URL 1.482
+score PDS_FRNOM_TODOM_NAKED_TO 1.498
+score PDS_FROM_2_EMAILS 2.348
score PDS_FROM_2_EMAILS_SHRTNER 0.001
score PDS_FROM_NAME_TO_DOMAIN 1.997
-score PDS_HP_HELO_NORDNS 0.002
+score PDS_HP_HELO_NORDNS 0.493
score PDS_RDNS_DYNAMIC_FP 0.010
-score PDS_SHORTFWD_URISHRT 0.819
+score PDS_SHORTFWD_URISHRT 1.443
score PDS_TINYSUBJ_URISHRT 1.498
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
-score PDS_TO_EQ_FROM_NAME 1.468
-score PHP_ORIG_SCRIPT 1.102
+score PDS_TO_EQ_FROM_NAME 0.940
+score PHISH_ATTACH 2.298
+score PHP_ORIG_SCRIPT 1.101
score PHP_SCRIPT 2.497
-score POSSIBLE_GMAIL_PHISHER 0.545
-score PP_MIME_FAKE_ASCII_TEXT 0.999
+score POSSIBLE_GMAIL_PHISHER 0.525
+score PP_MIME_FAKE_ASCII_TEXT 0.998
score RAND_MKTG_HEADER 1.997
score RATWARE_NO_RDNS 0.001
-score READY_TO_SHIP 1.249
-score RISK_FREE 0.001 # force non-zero
+score READY_TO_SHIP 0.706
+score RISK_FREE 0.001
score SCC_BODY_SINGLE_WORD 0.001
-score SCC_BODY_URI_ONLY 1.404
-score SCC_CANSPAM_1 2.361
+score SCC_BODY_URI_ONLY 1.403
+score SCC_CANSPAM_1 3.051
score SCC_CANSPAM_2 3.296
score SCC_ISEMM_LID_1B 1.498
-score SCC_SPAMMER_ADDR_2 0.919
-score SCC_SPECIAL_GUID 0.001
+score SCC_SPAMMER_ADDR_2 1.021
+score SCC_SPECIAL_GUID 2.299
score SENDGRID_REDIR 1.498
-score SERGIO_SUBJECT_PORN014 2.799
+score SERGIO_SUBJECT_PORN014 2.670
score SERGIO_SUBJECT_VIAGRA01 0.001
-score SHOPIFY_IMG_NOT_RCVD_SFY 2.497
+score SHOPIFY_IMG_NOT_RCVD_SFY 2.498
score SHORTENED_URL_SRC 2.696
score SHORTENER_SHORT_IMG 0.001
score SHORT_SHORTNER 1.997
-score SPOOFED_FREEMAIL_NO_RDNS 1.098
+score SPOOFED_FREEMAIL_NO_RDNS 0.606
score SPOOF_GMAIL_MID 1.498
score STATIC_XPRIO_OLE 0.001
score SUSP_UTF8_WORD_COMBO 2.996
-score SUSP_UTF8_WORD_SUBJ 1.760
-score THIS_AD 1.198
+score SUSP_UTF8_WORD_SUBJ 1.750
+score THIS_AD 1.098
score TO_EQ_FM_DIRECT_MX 0.001
score TO_EQ_FM_DOM_HTML_IMG 2.297
score TO_EQ_FM_HTML_ONLY 0.001
-score TO_IN_SUBJ 0.099
-score TO_NAME_SUBJ_NO_RDNS 2.999
-score TO_NO_BRKTS_FROM_MSSP 2.498
+score TO_IN_SUBJ 0.098
+score TO_NAME_SUBJ_NO_RDNS 2.816
+score TO_NO_BRKTS_FROM_MSSP 2.497
score TO_NO_BRKTS_HTML_IMG 1.997
score TO_NO_BRKTS_HTML_ONLY 1.997
-score TO_NO_BRKTS_MSFT 0.151
+score TO_NO_BRKTS_MSFT 0.642
score TO_NO_BRKTS_NORDNS_HTML 1.997
score TO_NO_BRKTS_PCNT 2.497
-score TVD_IP_HEX 2.597
-score TVD_IP_SING_HEX 1.451
-score TVD_PH_SUBJ_META 2.797
+score TVD_IP_HEX 2.497
+score TVD_IP_SING_HEX 2.062
+score TVD_PH_SUBJ_META 2.796
score TVD_SPACE_ENCODED 2.497
-score TVD_SPACE_RATIO_MINFP 1.100
-score UNDISC_FREEM 2.896
+score TVD_SPACE_RATIO_MINFP 1.101
+score UNDISC_FREEM 2.996
score UNDISC_MONEY 2.896
score UNICODE_OBFU_ASC 2.497
score URI_AZURE_CLOUDAPP 2.996
-score URI_BUFFLY 1.102
+score URI_BUFFLY 0.624
score URI_DOTEDU 1.997
-score URI_GOOGLE_PROXY 2.297
-score URI_HEX_IP 1.957
+score URI_GOOGLE_PROXY 2.298
+score URI_HEX_IP 1.916
score URI_IN_URI_10 2.297
-score URI_ONLY_MSGID_MALF 0.359
-score URI_PHISH 3.996
+score URI_ONLY_MSGID_MALF 0.397
+score URI_PHISH 3.995
score URI_TRY_3LD 1.997
score URI_WPADMIN 2.397
-score URI_WP_DIRINDEX 3.496
+score URI_WP_DIRINDEX 3.497
score URI_WP_HACKED 3.496
-score URI_WP_HACKED_2 1.100
-score VFY_ACCT_NORDNS 2.395
+score URI_WP_HACKED_2 1.101
+score VFY_ACCT_NORDNS 1.944
score WORD_INVIS 0.001
-score WORD_INVIS_MANY 2.184
-score XFER_LOTSA_MONEY 0.001
-score XM_RANDOM 0.001 # force non-zero
-score XM_RECPTID 2.997
+score WORD_INVIS_MANY 2.996
+score XFER_LOTSA_MONEY 0.001 # force non-zero
+score XM_RANDOM 0.001
+score XM_RECPTID 2.996
score XPRIO 2.247
-score YOUR_PERMISSION 2.558
-score YOU_INHERIT 1.151
+score YOUR_PERMISSION 2.599
+score YOU_INHERIT 1.563
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index 3ebf9fa..60da22a 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -1,229 +1,254 @@
-# Using score set 1 logs for revision 1909948 from:
-# ham-net-ena-week0.r1909948.log ham-net-ena-week1.r1909948.log ham-net-ena-week2.r1909948.log ham-net-ena-week3.r1909948.log ham-net-ena-week4.r1909948.log ham-net-giovanni-ham.r1909948.log ham-net-giovanni-spammy.r1909948.log ham-net-giovanni-spam.r1909948.log ham-net-grenier.r1909948.log ham-net-hege.r1909948.log ham-net-jhardin.r1909948.log ham-net-llanga.r1909948.log ham-net-mmiroslaw-mails-ham.r1909948.log ham-net-mmiroslaw-mails-spam.r1909948.log ham-net-spamsponge.r1909948.log ham-net-thendrikx.r1909948.log ham-net-tsz-corpus.r1909948.log spam-net-ena-week0.r1909948.log spam-net-ena-week1.r1909948.log spam-net-ena-week2.r1909948.log spam-net-ena-week3.r1909948.log spam-net-ena-week4.r1909948.log spam-net-giovanni-ham.r1909948.log spam-net-giovanni-spammy.r1909948.log spam-net-giovanni-spam.r1909948.log spam-net-grenier.r1909948.log spam-net-hege.r1909948.log spam-net-jhardin.r1909948.log spam-net-llanga.r1909948.log spam-net-mmiroslaw-mails-ham.r1909948.log spam-net-mmiroslaw-mails-spam.r1909948.log spam-net-spamsponge.r1909948.log spam-net-thendrikx.r1909948.log spam-net-tsz-corpus.r1909948.log
+# Using score set 1 logs for revision 1910082 from:
+# ham-net-ena-week0.r1910082.log ham-net-ena-week1.r1910082.log ham-net-ena-week2.r1910082.log ham-net-ena-week3.r1910082.log ham-net-ena-week4.r1910082.log ham-net-giovanni-ham.r1910082.log ham-net-giovanni-spammy.r1910082.log ham-net-giovanni-spam.r1910082.log ham-net-grenier.r1910082.log ham-net-hege.r1910082.log ham-net-jhardin.r1910082.log ham-net-llanga.r1910082.log ham-net-mmiroslaw-mails-ham.r1910082.log ham-net-mmiroslaw-mails-spam.r1910082.log ham-net-spamsponge.r1910082.log ham-net-thendrikx.r1910082.log ham-net-tsz-corpus.r1910082.log spam-net-ena-week0.r1910082.log spam-net-ena-week1.r1910082.log spam-net-ena-week2.r1910082.log spam-net-ena-week3.r1910082.log spam-net-ena-week4.r1910082.log spam-net-giovanni-ham.r1910082.log spam-net-giovanni-spammy.r1910082.log spam-net-giovanni-spam.r1910082.log spam-net-grenier.r1910082.log spam-net-hege.r1910082.log spam-net-jhardin.r1910082.log spam-net-llanga.r1910082.log spam-net-mmiroslaw-mails-ham.r1910082.log spam-net-mmiroslaw-mails-spam.r1910082.log spam-net-spamsponge.r1910082.log spam-net-thendrikx.r1910082.log spam-net-tsz-corpus.r1910082.log
-score ACCT_PHISHING_MANY 2.999
+score ACCT_PHISHING_MANY 2.996
score AC_BR_BONANZA 0.001 # force non-zero
score AC_DIV_BONANZA 0.001
-score AC_FROM_MANY_DOTS 0.552
-score AC_HTML_NONSENSE_TAGS 1.999
-score ADMITS_SPAM 0.001
-score ADVANCE_FEE_2_NEW_MONEY 1.999
-score ADVANCE_FEE_3_NEW 3.259
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.001 # force non-zero
-score ADVANCE_FEE_3_NEW_MONEY 2.599
+score AC_FROM_MANY_DOTS 0.497
+score AC_HTML_NONSENSE_TAGS 1.997
+score ADMITS_SPAM 0.236
+score ADVANCE_FEE_2_NEW_FRM_MNY 0.791
+score ADVANCE_FEE_2_NEW_MONEY 1.997
+score ADVANCE_FEE_3_NEW 1.780
+score ADVANCE_FEE_3_NEW_MONEY 2.938
score ADVANCE_FEE_4_NEW 2.299
-score ADVANCE_FEE_4_NEW_MONEY 2.399
-score ADVANCE_FEE_5_NEW 1.396
+score ADVANCE_FEE_4_NEW_MONEY 0.001
+score ADVANCE_FEE_5_NEW 0.896
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001
-score AD_PREFS 0.096
+score AD_PREFS 0.498
+score ALIBABA_IMG_NOT_RCVD_ALI 0.001
score AMAZON_IMG_NOT_RCVD_AMZN 0.001
-score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 # force non-zero
+score AXB_XM_FORGED_OL2600 1.633
score BIGNUM_EMAILS_FREEM 0.001
-score BIGNUM_EMAILS_MANY 2.999
+score BIGNUM_EMAILS_MANY 2.996
score BITCOIN_DEADLINE 2.999
-score BITCOIN_EXTORT_01 3.777
-score BITCOIN_MALF_HTML 2.417
-score BITCOIN_MALWARE 1.941
+score BITCOIN_EXTORT_01 0.786
+score BITCOIN_MALF_HTML 1.586
+score BITCOIN_MALWARE 2.325
score BITCOIN_OBFU_SUBJ 1.765
-score BITCOIN_SPAM_02 2.499
-score BITCOIN_SPAM_03 0.001
-score BITCOIN_SPAM_05 1.518
-score BITCOIN_SPAM_07 2.331
-score BITCOIN_XPRIO 0.650
-score BITCOIN_YOUR_INFO 2.999
-score BODY_SINGLE_URI 2.132
+score BITCOIN_SPAM_02 2.497
+score BITCOIN_SPAM_03 1.214
+score BITCOIN_SPAM_05 2.497
+score BITCOIN_SPAM_07 3.407
+score BITCOIN_XPRIO 0.001
+score BITCOIN_YOUR_INFO 2.997
+score BODY_SINGLE_URI 1.976
score BODY_SINGLE_WORD 0.001
score BODY_URI_ONLY 0.001
-score CANT_SEE_AD 1.397
-score CK_HELO_GENERIC 0.249
-score COMPENSATION 1.026
+score CANT_SEE_AD 1.568
+score CK_HELO_GENERIC 0.248
+score COMPENSATION 1.498
score CTE_8BIT_MISMATCH 0.001
-score DATE_IN_FUTURE_Q_PLUS 3.699
-score DEAR_BENEFICIARY 0.043
-score DKIMWL_WL_HIGH -0.001
+score DATE_IN_FUTURE_Q_PLUS 3.796
+score DEAR_BENEFICIARY 0.001
+score DKIMWL_WL_HIGH -0.164
score DKIMWL_WL_MED -0.001
score DKIMWL_WL_MEDHI -0.001
-score DSN_NO_MIMEVERSION 1.999
+score DSN_NO_MIMEVERSION 1.997
score ENCRYPTED_MESSAGE -0.999
-score END_FUTURE_EMAILS 2.499
-score FAKE_REPLY_A1 0.001
+score END_FUTURE_EMAILS 2.497
+score FAKE_REPLY_A1 0.001 # force non-zero
score FAKE_REPLY_B 0.001
score FILL_THIS_FORM 0.001
score FONT_INVIS_DIRECT 0.001
-score FONT_INVIS_LONG_LINE 2.999
-score FONT_INVIS_MSGID 0.001
-score FONT_INVIS_POSTEXTRAS 1.388
-score FORGED_SPF_HELO 0.284
+score FONT_INVIS_LONG_LINE 2.996
+score FONT_INVIS_MSGID 0.232
+score FONT_INVIS_POSTEXTRAS 2.174
+score FORGED_SPF_HELO 0.001
score FORM_FRAUD 0.001
-score FORM_FRAUD_3 2.299
+score FORM_FRAUD_3 2.398
score FORM_FRAUD_5 0.001
-score FREEMAIL_FORGED_FROMDOMAIN 0.249
-score FROM_2_EMAILS_SHORT 0.163
-score FROM_ADDR_WS 2.127
-score FROM_FMBLA_NEWDOM 0.001
-score FROM_FMBLA_NEWDOM14 0.965
-score FROM_FMBLA_NEWDOM28 0.001
-score FROM_GOV_DKIM_AU -0.044
-score FROM_IN_TO_AND_SUBJ 1.799
+score FREEMAIL_FORGED_FROMDOMAIN 0.248
+score FROM_2_EMAILS_SHORT 0.001
+score FROM_ADDR_WS 2.996
+score FROM_FMBLA_NEWDOM 0.449
+score FROM_FMBLA_NEWDOM14 0.998
+score FROM_FMBLA_NEWDOM28 0.798
+score FROM_GOV_DKIM_AU -0.120
+score FROM_IN_TO_AND_SUBJ 1.899
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 0.917
-score FROM_MISSP_EH_MATCH 1.548
-score FROM_MISSP_FREEMAIL 2.999
+score FROM_MISSP_DYNIP 2.596
+score FROM_MISSP_EH_MATCH 0.620
+score FROM_MISSP_FREEMAIL 3.196
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_REPLYTO 0.846
+score FROM_MISSP_REPLYTO 0.001
score FROM_MISSP_SPF_FAIL 0.001
score FROM_MISSP_USER 0.001
-score FROM_NTLD_LINKBAIT 1.136
-score FROM_PAYPAL_SPOOF 1.415
-score FROM_SUSPICIOUS_NTLD 0.192
-score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_WSP_TRAIL 2.899
-score FSL_BULK_SIG 0.001 # force non-zero
+score FROM_MULTI_NORDNS 0.001
+score FROM_NTLD_LINKBAIT 1.040
+score FROM_PAYPAL_SPOOF 0.001
+score FROM_SUSPICIOUS_NTLD 0.190
+score FROM_SUSPICIOUS_NTLD_FP 1.997
+score FROM_UNBAL1 1.789
+score FROM_UNBAL2 3.096
+score FROM_WSP_TRAIL 2.687
+score FSL_BULK_SIG 0.001
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
score FUZZY_AMAZON 0.001
-score GB_BITCOIN_NH 1.224
-score GB_CUSTOM_HTM_URI 0.581
-score GB_FAKE_RF_SHORT 1.999
+score GB_BITCOIN_NH 2.996
+score GB_CUSTOM_HTM_URI 0.835
+score GB_FAKE_RF_SHORT 1.997
score GB_FREEMAIL_DISPTO 0.001
score GB_GOOGLE_TRANSL 0.749
-score GB_HASHBL_BTC 1.811
-score GOOG_MALWARE_DNLD 0.576
-score GOOG_REDIR_HTML_ONLY 2.000
-score GOOG_REDIR_NORDNS 3.099
-score GOOG_STO_IMG_NOHTML 2.499
-score GOOG_STO_NOIMG_HTML 2.999
-score HAS_X_OUTGOING_SPAM_STAT 0.972
-score HDRS_LCASE 0.099
-score HDRS_MISSP 0.276
+score GB_HASHBL_BTC 0.001 # force non-zero
+score GOOG_MALWARE_DNLD 2.044
+score GOOG_REDIR_HTML_ONLY 1.997
+score GOOG_REDIR_NORDNS 3.096
+score GOOG_STO_IMG_HTML 2.996
+score GOOG_STO_IMG_NOHTML 2.497
+score GOOG_STO_NOIMG_HTML 2.996
+score HAS_X_OUTGOING_SPAM_STAT 0.800
+score HDRS_LCASE 0.098
+score HDRS_MISSP 0.001
score HDR_ORDER_FTSDMCXX_DIRECT 0.001
score HDR_ORDER_FTSDMCXX_NORDNS 0.001
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250
+score HEADER_FROM_DIFFERENT_DOMAINS 0.248
score HELO_NO_DOMAIN 0.001
score HK_LOTTO 0.001
-score HK_NAME_MR_MRS 0.999
-score HK_RANDOM_ENVFROM 0.001 # force non-zero
+score HK_NAME_MR_MRS 0.998
+score HK_RANDOM_ENVFROM 0.001
score HK_RANDOM_FROM 0.001
-score HK_RANDOM_REPLYTO 1.000
-score HK_SCAM 0.001 # force non-zero
+score HK_RANDOM_REPLYTO 0.998
+score HK_SCAM 0.001
score HOSTED_IMG_DIRECT_MX 0.001
-score HOSTED_IMG_FREEM 0.001 # force non-zero
-score HOSTED_IMG_MULTI_PUB_01 2.999
-score HTML_ENTITY_ASCII 2.999
-score HTML_ENTITY_ASCII_TINY 2.909
+score HOSTED_IMG_MULTI_PUB_01 2.996
+score HTML_ENTITY_ASCII 2.996
+score HTML_ENTITY_ASCII_TINY 1.233
+score HTML_FONT_TINY_NORDNS 0.001 # force non-zero
score HTML_OFF_PAGE 0.001
-score HTML_TAG_BALANCE_CENTER 3.097
-score HTML_TEXT_INVISIBLE_FONT 1.999
+score HTML_SINGLET_MANY 2.497
+score HTML_TAG_BALANCE_CENTER 2.996
+score HTML_TEXT_INVISIBLE_FONT 1.755
score HTML_TEXT_INVISIBLE_STYLE 0.001
-score JH_SPAMMY_HEADERS 3.499
-score KHOP_HELO_FCRDNS 0.396
-score LONG_HEX_URI 2.947
+score JH_SPAMMY_HEADERS 3.496
+score KHOP_HELO_FCRDNS 0.399
+score LONG_HEX_URI 2.520
score LONG_IMG_URI 0.001
-score LONG_INVISIBLE_TEXT 1.828
-score LOTS_OF_MONEY 0.010
-score MALWARE_NORDNS 2.180
-score MALWARE_PASSWORD 2.129
-score MANY_HDRS_LCASE 0.001
+score LONG_INVISIBLE_TEXT 2.676
+score LOTS_OF_MONEY 0.009
+score LOTTO_AGENT 0.207
+score MALFORMED_FREEMAIL 2.260
+score MALWARE_NORDNS 1.626
+score MANY_HDRS_LCASE 0.098
+score MANY_SPAN_IN_TEXT 2.696
score MILLION_HUNDRED 0.001
-score MILLION_USD 1.217
+score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 0.001
-score MIME_NO_TEXT 1.999
-score MIXED_CENTER_CASE 2.167
-score MIXED_ES 2.499
+score MIME_NO_TEXT 1.672
+score MIXED_CENTER_CASE 1.892
+score MIXED_ES 2.398
score MIXED_HREF_CASE 1.999
-score MONEY_ATM_CARD 1.210
score MONEY_FORM 0.001
-score MONEY_FORM_SHORT 0.001 # force non-zero
+score MONEY_FORM_SHORT 0.001
score MONEY_FRAUD_3 0.001
-score MONEY_FRAUD_5 2.599
+score MONEY_FRAUD_5 2.696
score MONEY_FRAUD_8 0.001
-score MONEY_FREEMAIL_REPTO 1.841
-score MONEY_FROM_41 1.999
+score MONEY_FREEMAIL_REPTO 1.587
+score MONEY_FROM_41 1.938
score MONEY_FROM_MISSP 0.001
-score MSMAIL_PRI_ABNORMAL 0.213
-score NA_DOLLARS 0.001 # force non-zero
-score NICE_REPLY_A -0.091
+score MSMAIL_PRI_ABNORMAL 0.451
+score MSM_PRIO_REPTO 1.466
+score NAME_EMAIL_DIFF 0.001
+score NA_DOLLARS 0.001
+score NICE_REPLY_A -0.093
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
score NSL_RCVD_HELO_USER 0.001
-score OBFU_TEXT_ATTACH 0.325
-score ODD_FREEM_REPTO 2.538
-score PDS_BTC_ID 0.003
-score PDS_BTC_MSGID 0.553
+score NUMBEREND_LINKBAIT 0.463
+score OBFU_TEXT_ATTACH 0.001
+score ODD_FREEM_REPTO 2.997
+score PDS_BTC_ID 0.001
+score PDS_BTC_MSGID 0.001
score PDS_DBL_URL_TNB_RUNON 1.999
-score PDS_EMPTYSUBJ_URISHRT 0.327
-score PDS_FRNOM_TODOM_DBL_URL 1.499
-score PDS_FRNOM_TODOM_NAKED_TO 1.198
-score PDS_FROM_2_EMAILS 2.580
-score PDS_FROM_2_EMAILS_SHRTNER 0.641
-score PDS_FROM_NAME_TO_DOMAIN 1.881
-score PDS_TINYSUBJ_URISHRT 1.499
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.718
+score PDS_EMPTYSUBJ_URISHRT 0.640
+score PDS_FRNOM_TODOM_DBL_URL 1.498
+score PDS_FRNOM_TODOM_NAKED_TO 1.008
+score PDS_FROM_2_EMAILS 2.465
+score PDS_FROM_2_EMAILS_SHRTNER 0.001
+score PDS_FROM_NAME_TO_DOMAIN 1.989
+score PDS_HP_HELO_NORDNS 0.001 # force non-zero
+score PDS_RDNS_DYNAMIC_FP 0.001 # force non-zero
+score PDS_TINYSUBJ_URISHRT 0.542
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.001
score PDS_TO_EQ_FROM_NAME 0.001
-score PHISH_ATTACH 2.200
score PHP_ORIG_SCRIPT 0.001
-score PHP_SCRIPT 2.326
-score POSSIBLE_GMAIL_PHISHER 2.499
+score PHP_SCRIPT 2.493
+score POSSIBLE_GMAIL_PHISHER 2.258
score PP_MIME_FAKE_ASCII_TEXT 0.001
-score RAND_HEADER_MANY 0.043
-score RAND_MKTG_HEADER 1.999
+score RAND_MKTG_HEADER 1.997
score RATWARE_NO_RDNS 0.001
score RCVD_IN_MSPIKE_H2 -0.001
+score READY_TO_SHIP 0.417
+score RISK_FREE 0.001 # force non-zero
score SCC_BODY_SINGLE_WORD 0.001
-score SCC_BODY_URI_ONLY 1.172
-score SCC_CANSPAM_1 1.156
-score SCC_CANSPAM_2 2.899
-score SCC_ISEMM_LID_1B 1.499
-score SENDGRID_REDIR 1.068
+score SCC_BODY_URI_ONLY 0.657
+score SCC_CANSPAM_1 2.363
+score SCC_CANSPAM_2 3.196
+score SCC_ISEMM_LID_1B 1.498
+score SCC_SPAMMER_ADDR_2 1.606
+score SCC_SPECIAL_GUID 2.199
+score SENDGRID_REDIR 1.067
+score SERGIO_SUBJECT_PORN014 0.574
score SERGIO_SUBJECT_VIAGRA01 0.001
-score SHOPIFY_IMG_NOT_RCVD_SFY 2.499
+score SHOPIFY_IMG_NOT_RCVD_SFY 2.497
+score SHORTENED_URL_SRC 2.696
score SHORTENER_SHORT_IMG 0.001
-score SHORT_SHORTNER 1.039
-score SPOOFED_FREEMAIL 0.001
+score SHORT_SHORTNER 1.829
+score SPOOFED_FREEMAIL 0.001 # force non-zero
score SPOOFED_FREEMAIL_NO_RDNS 0.001
-score SPOOFED_FREEM_REPTO 2.499
+score SPOOFED_FREEM_REPTO 2.497
score SPOOF_GMAIL_MID 0.001
-score STATIC_XPRIO_OLE 1.861
-score SUSP_UTF8_WORD_COMBO 2.261
-score SUSP_UTF8_WORD_SUBJ 0.676
-score THIS_AD 1.099
+score STATIC_XPRIO_OLE 0.001
+score SUSP_UTF8_WORD_COMBO 2.996
+score SUSP_UTF8_WORD_SUBJ 0.471
+score THIS_AD 1.199
+score THIS_IS_ADV_SUSP_NTLD 1.499
score TO_EQ_FM_DIRECT_MX 0.001
-score TO_EQ_FM_DOM_HTML_IMG 2.299
+score TO_EQ_FM_DOM_HTML_IMG 2.103
score TO_EQ_FM_DOM_SPF_FAIL 0.001
-score TO_EQ_FM_HTML_ONLY 2.137
-score TO_EQ_FM_SPF_FAIL 0.001
+score TO_EQ_FM_HTML_ONLY 2.132
+score TO_EQ_FM_SPF_FAIL 0.001 # force non-zero
score TO_IN_SUBJ 0.099
-score TO_NAME_SUBJ_NO_RDNS 2.999
-score TO_NO_BRKTS_FROM_MSSP 1.753
-score TO_NO_BRKTS_HTML_IMG 1.999
-score TO_NO_BRKTS_HTML_ONLY 1.999
+score TO_NAME_SUBJ_NO_RDNS 2.996
+score TO_NO_BRKTS_FROM_MSSP 1.801
+score TO_NO_BRKTS_HTML_IMG 1.997
+score TO_NO_BRKTS_HTML_ONLY 1.997
score TO_NO_BRKTS_MSFT 0.001
-score TO_NO_BRKTS_NORDNS_HTML 1.999
-score TO_NO_BRKTS_PCNT 2.499
-score TVD_PH_SUBJ_META 2.699
-score TVD_SPACE_ENCODED 0.001
+score TO_NO_BRKTS_NORDNS_HTML 1.997
+score TO_NO_BRKTS_PCNT 2.497
+score TVD_IP_HEX 2.497
+score TVD_IP_SING_HEX 1.971
+score TVD_PH_SUBJ_META 2.610
+score TVD_SPACE_ENCODED 1.331
score TVD_SPACE_RATIO_MINFP 0.001
-score UNDISC_FREEM 2.799
-score UNDISC_MONEY 2.699
-score UNICODE_OBFU_ASC 2.499
-score URI_DOTEDU 1.999
-score URI_GOOGLE_PROXY 2.400
-score URI_ONLY_MSGID_MALF 1.999
-score URI_PHISH 3.993
-score URI_TRY_3LD 1.999
-score URI_WPADMIN 2.299
-score URI_WP_DIRINDEX 3.499
-score URI_WP_HACKED 0.854
-score URI_WP_HACKED_2 2.500
+score UNDISC_FREEM 2.996
+score UNDISC_MONEY 2.896
+score UNICODE_OBFU_ASC 2.497
+score URI_AZURE_CLOUDAPP 2.996
+score URI_BUFFLY 1.826
+score URI_DOTEDU 1.997
+score URI_GOOGLE_PROXY 2.397
+score URI_HEX_IP 0.870
+score URI_IN_URI_10 2.297
+score URI_ONLY_MSGID_MALF 1.997
+score URI_PHISH 3.987
+score URI_TRY_3LD 1.514
+score URI_WPADMIN 2.397
+score URI_WP_DIRINDEX 3.496
+score URI_WP_HACKED 1.216
+score URI_WP_HACKED_2 2.497
score VFY_ACCT_NORDNS 0.001
-score WORD_INVIS 0.521
-score WORD_INVIS_MANY 2.992
-score XFER_LOTSA_MONEY 0.001 # force non-zero
+score WORD_INVIS 0.803
+score WORD_INVIS_MANY 2.997
+score XFER_LOTSA_MONEY 0.001
score XM_RANDOM 0.001
+score XM_RECPTID 1.867
score XPRIO 0.001
-score YOUR_PERMISSION 2.129
-score YOU_INHERIT 2.499
+score YOUR_PERMISSION 2.033
+score YOU_INHERIT 0.950
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
@@ -236,8 +261,6 @@
score AC_SPAMMY_URI_PATTERNS9 1.000
score ADULT_DATING_COMPANY 10.000
score ADVANCE_FEE_2_NEW_FORM 1.000
-score ADVANCE_FEE_2_NEW_FRM_MNY 1.000
-score ALIBABA_IMG_NOT_RCVD_ALI 1.000
score APP_DEVELOPMENT_FREEM 1.000
score APP_DEVELOPMENT_NORDNS 1.000
score BEBEE_IMG_NOT_RCVD_BB 1.000
@@ -299,15 +322,14 @@
score GOOG_STO_EMAIL_PHISH 1.000
score GOOG_STO_HTML_PHISH 1.000
score GOOG_STO_HTML_PHISH_MANY 1.000
-score GOOG_STO_IMG_HTML 1.000
score HAS_X_NO_RELAY 1.000
score HEXHASH_WORD 1.000
score HK_CTE_RAW 1.000
score HK_RCVD_IP_MULTICAST 1.000
score HOSTED_IMG_DQ_UNSUB 1.000
+score HOSTED_IMG_FREEM 1.000
score HOSTED_IMG_MULTI 1.000
score HTML_SHRT_CMNT_OBFU_MANY 1.000
-score HTML_SINGLET_MANY 1.000
score IMG_ONLY_FM_DOM_INFO 1.000
score JH_SPAMMY_PATTERN01 1.000
score JH_SPAMMY_PATTERN02 1.000
@@ -316,6 +338,7 @@
score LIST_PRTL_SAME_USER 1.000
score LUCRATIVE 1.000
score MALF_HTML_B64 1.000
+score MALWARE_PASSWORD 1.000
score MIXED_AREA_CASE 1.000
score MIXED_FONT_CASE 1.000
score MIXED_IMG_CASE 1.000
@@ -325,7 +348,6 @@
score MONERO_PAY_ME 1.000
score MSGID_DOLLARS_URI_IMG 1.000
score MSGID_HDR_MALF 1.000
-score MSM_PRIO_REPTO 1.000
score NEWEGG_IMG_NOT_RCVD_NEGG 1.000
score NEW_PRODUCTS 1.000
score OBFU_BITCOIN 1.000
@@ -340,6 +362,7 @@
score PUMPDUMP 1.000
score PUMPDUMP_MULTI 1.000
score RAND_HEADER_LIST_SPOOF 1.000
+score RAND_HEADER_MANY 1.000
score RCVD_DOTEDU_SHORT 1.000
score RCVD_DOTEDU_SUSP_URI 1.000
score RDNS_NUM_TLD_ATCHNX 1.000
@@ -371,21 +394,17 @@
score SYSADMIN 1.000
score TAGSTAT_IMG_NOT_RCVD_TGST 1.000
score TARINGANET_IMG_NOT_RCVD_TN 1.000
-score THIS_IS_ADV_SUSP_NTLD 1.000
score TONLINE_FAKE_DKIM 1.000
score TW_GIBBERISH_MANY 1.000
score UC_GIBBERISH_OBFU 1.000
score UNICODE_OBFU_ZW 1.000
score UNSUB_GOOG_FORM 1.000
score URI_ADOBESPARK 1.000
-score URI_AZURE_CLOUDAPP 1.000
-score URI_BUFFLY 1.000
score URI_DASHGOVEDU 1.000
score URI_DATA 1.000
score URI_DOTEDU_ENTITY 1.000
score URI_FIREBASEAPP 1.000
score URI_GOOG_STO_SPAMMY 3.000
-score URI_HEX_IP 1.000
score URI_IMG_WP_REDIR 1.000
score URI_LONG_REPEAT 1.000
score URI_OPTOUT_3LD 1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index a8dcffc..f034bb1 100644
--- a/rulesrc/scores/stats-set0
+++ b/rulesrc/scores/stats-set0
@@ -1,23 +1,23 @@
##### WITH NEW RULES AND SCORES #####
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 396919 59.935% (99.296% of non-spam corpus)
-# Correctly spam: 164520 24.842% (62.670% of spam corpus)
-# False positives: 2815 0.425% (0.704% of nonspam, 62129 weighted)
-# False negatives: 97999 14.798% (37.330% of spam, 180402 weighted)
-# Average score for spam: 9.8 nonspam: 0.7
+# Correctly non-spam: 396920 59.935% (99.296% of non-spam corpus)
+# Correctly spam: 164453 24.832% (62.645% of spam corpus)
+# False positives: 2814 0.425% (0.704% of nonspam, 62016 weighted)
+# False negatives: 98063 14.808% (37.355% of spam, 180591 weighted)
+# Average score for spam: 9.7 nonspam: 0.7
# Average for false-pos: 6.7 false-neg: 1.8
-# TOTAL: 662253 100.00%
+# TOTAL: 662250 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 49488 99.25%
-# Correctly spam: 20456 62.34%
-# False positives: 375 0.75%
-# False negatives: 12359 37.66%
-# TCR(l=50): 1.054839 SpamRecall: 62.337% SpamPrec: 98.200%
+# Correctly non-spam: 49490 99.25%
+# Correctly spam: 20523 62.54%
+# False positives: 373 0.75%
+# False negatives: 12292 37.46%
+# TCR(l=50): 1.060533 SpamRecall: 62.542% SpamPrec: 98.215%
##### WITHOUT NEW RULES AND SCORES #####
Reading scores from "../rules-base"...
@@ -25,16 +25,16 @@
# SUMMARY for threshold 5.0:
# Correctly non-spam: 391241 97.88%
-# Correctly spam: 108982 41.51%
+# Correctly spam: 108997 41.52%
# False positives: 8493 2.12%
-# False negatives: 153537 58.49%
-# TCR(l=50): 0.454038 SpamRecall: 41.514% SpamPrec: 92.770%
+# False negatives: 153519 58.48%
+# TCR(l=50): 0.454047 SpamRecall: 41.520% SpamPrec: 92.771%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
# Correctly non-spam: 48794 97.86%
-# Correctly spam: 13720 41.81%
+# Correctly spam: 13830 42.15%
# False positives: 1069 2.14%
-# False negatives: 19095 58.19%
-# TCR(l=50): 0.452340 SpamRecall: 41.810% SpamPrec: 92.772%
+# False negatives: 18985 57.85%
+# TCR(l=50): 0.453027 SpamRecall: 42.145% SpamPrec: 92.825%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index 03738ec..cc3dd18 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: 390812 66.884% (98.994% of non-spam corpus)
-# Correctly spam: 142801 24.439% (75.345% of spam corpus)
-# False positives: 3970 0.679% (1.006% of nonspam, 217564 weighted)
-# False negatives: 46728 7.997% (24.655% of spam, 74998 weighted)
-# Average score for spam: 14.4 nonspam: -0.1
-# Average for false-pos: 11.4 false-neg: 1.6
-# TOTAL: 584311 100.00%
+# Correctly non-spam: 398018 58.582% (98.940% of non-spam corpus)
+# Correctly spam: 218628 32.179% (78.889% of spam corpus)
+# False positives: 4265 0.628% (1.060% of nonspam, 327923 weighted)
+# False negatives: 58505 8.611% (21.111% of spam, 92567 weighted)
+# Average score for spam: 13.7 nonspam: -0.2
+# Average for false-pos: 11.2 false-neg: 1.6
+# TOTAL: 679416 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 48734 98.96%
-# Correctly spam: 17800 74.83%
-# False positives: 511 1.04%
-# False negatives: 5987 25.17%
-# TCR(l=50): 0.754257 SpamRecall: 74.831% SpamPrec: 97.209%
+# Correctly non-spam: 49578 98.80%
+# Correctly spam: 27258 78.64%
+# False positives: 602 1.20%
+# False negatives: 7405 21.36%
+# TCR(l=50): 0.924223 SpamRecall: 78.637% SpamPrec: 97.839%
##### 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: 391328 99.13%
-# Correctly spam: 104219 54.99%
-# False positives: 3454 0.87%
-# False negatives: 85310 45.01%
-# TCR(l=50): 0.734580 SpamRecall: 54.988% SpamPrec: 96.792%
+# Correctly non-spam: 398758 99.12%
+# Correctly spam: 134563 48.56%
+# False positives: 3525 0.88%
+# False negatives: 142570 51.44%
+# TCR(l=50): 0.869246 SpamRecall: 48.555% SpamPrec: 97.447%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 48783 99.06%
-# Correctly spam: 13134 55.22%
-# False positives: 462 0.94%
-# False negatives: 10653 44.78%
-# TCR(l=50): 0.704737 SpamRecall: 55.215% SpamPrec: 96.602%
+# Correctly non-spam: 49680 99.00%
+# Correctly spam: 16805 48.48%
+# False positives: 500 1.00%
+# False negatives: 17858 51.52%
+# TCR(l=50): 0.808787 SpamRecall: 48.481% SpamPrec: 97.111%