updated scores for revision 1862723 active rules added since last mass-check
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1862782 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index d68fc67..a7b6483 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf
@@ -1,7 +1,7 @@
score AC_BR_BONANZA 0.001 0.001 0.001 0.001
score AC_DIV_BONANZA 0.001 0.001 0.001 0.001
-score AC_FROM_MANY_DOTS 2.999 1.759 2.999 1.759
-score AC_HTML_NONSENSE_TAGS 1.999 1.523 1.999 1.523
+score AC_FROM_MANY_DOTS 2.999 2.207 2.999 2.207
+score AC_HTML_NONSENSE_TAGS 1.999 1.525 1.999 1.525
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
score AC_SPAMMY_URI_PATTERNS11 1.000 1.000 1.000 1.000
@@ -12,122 +12,122 @@
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 ADVANCE_FEE_2_NEW_FORM 1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_MONEY 1.999 0.287 1.999 0.287
+score ADVANCE_FEE_2_NEW_MONEY 1.999 0.285 1.999 0.285
score ADVANCE_FEE_3_NEW 2.552 3.465 2.552 3.465
-score ADVANCE_FEE_3_NEW_MONEY 2.518 1.236 2.518 1.236
-score ADVANCE_FEE_4_NEW 2.700 2.499 2.700 2.499
-score ADVANCE_FEE_4_NEW_FRM_MNY 1.196 0.358 1.196 0.358
-score ADVANCE_FEE_4_NEW_MONEY 3.099 2.599 3.099 2.599
-score ADVANCE_FEE_5_NEW 0.250 0.001 0.250 0.001
+score ADVANCE_FEE_3_NEW_MONEY 2.642 0.860 2.642 0.860
+score ADVANCE_FEE_4_NEW 2.699 2.600 2.699 2.600
+score ADVANCE_FEE_4_NEW_FRM_MNY 1.263 2.248 1.263 2.248
+score ADVANCE_FEE_4_NEW_MONEY 2.999 2.599 2.999 2.599
+score ADVANCE_FEE_5_NEW 1.048 0.001 1.048 0.001
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001 0.001 0.001 0.001
-score ADVANCE_FEE_5_NEW_MONEY 0.476 1.190 0.476 1.190
-score AD_PREFS 0.499 0.433 0.499 0.433
-score AMAZON_IMG_NOT_RCVD_AMZN 2.199 1.680 2.199 1.680
-score ANY_PILL_PRICE 0.310 0.001 0.310 0.001
+score ADVANCE_FEE_5_NEW_MONEY 0.644 1.215 0.644 1.215
+score AD_PREFS 0.499 0.499 0.499 0.499
+score AMAZON_IMG_NOT_RCVD_AMZN 2.345 1.681 2.345 1.681
+score ANY_PILL_PRICE 0.426 0.001 0.426 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 AXB_XMAILER_MIMEOLE_OL_024C2 0.154 0.001 0.154 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.239 2.404 0.239 2.404
-score BIGNUM_EMAILS 2.385 2.732 2.385 2.732
-score BITCOIN_DEADLINE 2.985 2.999 2.985 2.999
-score BITCOIN_EXTORT_01 4.999 4.996 4.999 4.996
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.265 0.001 0.265 0.001
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.816 0.503 0.816 0.503
+score BIGNUM_EMAILS 1.487 2.680 1.487 2.680
+score BITCOIN_DEADLINE 2.652 2.999 2.652 2.999
+score BITCOIN_EXTORT_01 3.502 4.996 3.502 4.996
score BITCOIN_MALWARE 3.499 3.499 3.499 3.499
-score BITCOIN_PAY_ME 2.999 2.999 2.999 2.999
-score BITCOIN_SPAM_01 1.916 0.001 1.916 0.001
+score BITCOIN_PAY_ME 3.000 2.999 3.000 2.999
+score BITCOIN_SPAM_01 0.001 0.001 0.001 0.001
score BITCOIN_SPAM_02 2.499 2.499 2.499 2.499
-score BITCOIN_SPAM_03 2.499 2.439 2.499 2.439
+score BITCOIN_SPAM_03 2.499 2.499 2.499 2.499
score BITCOIN_SPAM_04 1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_05 2.358 2.499 2.358 2.499
-score BITCOIN_SPAM_06 1.038 0.316 1.038 0.316
-score BITCOIN_SPAM_07 3.499 3.382 3.499 3.382
+score BITCOIN_SPAM_05 2.217 2.499 2.217 2.499
+score BITCOIN_SPAM_06 1.426 0.978 1.426 0.978
+score BITCOIN_SPAM_07 3.499 3.386 3.499 3.386
score BITCOIN_SPAM_08 2.499 2.499 2.499 2.499
-score BITCOIN_SPAM_09 1.054 1.088 1.054 1.088
+score BITCOIN_SPAM_09 1.499 1.138 1.499 1.138
score BITCOIN_SPAM_10 1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_11 2.322 2.409 2.322 2.409
+score BITCOIN_SPAM_11 2.138 1.142 2.138 1.142
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 BODY_EMPTY 1.999 1.000 1.999 1.000
-score BODY_SINGLE_URI 0.918 1.297 0.918 1.297
-score BODY_SINGLE_WORD 2.499 0.001 2.499 0.001
-score BODY_URI_ONLY 0.999 1.000 0.999 1.000
+score BODY_EMPTY 2.000 1.000 2.000 1.000
+score BODY_SINGLE_URI 0.991 1.298 0.991 1.298
+score BODY_SINGLE_WORD 2.409 0.001 2.409 0.001
+score BODY_URI_ONLY 0.999 0.999 0.999 0.999
score BOGUS_MIME_VERSION 1.000 1.000 1.000 1.000
-score BOGUS_MSM_HDRS 2.059 1.754 2.059 1.754
+score BOGUS_MSM_HDRS 1.477 2.587 1.477 2.587
score BOMB_FREEM 1.000 1.000 1.000 1.000
score BOMB_MONEY 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.970 0.078 0.970 0.078
+score CANT_SEE_AD 1.072 1.022 1.072 1.022
score CK_HELO_DYNAMIC_SPLIT_IP 1.499 0.001 1.499 0.001
-score CK_HELO_GENERIC 0.249 0.001 0.249 0.001
+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.499 1.000 1.499 1.000
-score DATE_IN_FUTURE_96_Q 2.799 1.392 2.799 1.392
+score DATE_IN_FUTURE_96_Q 2.799 0.388 2.799 0.388
score DAY_I_EARNED 1.000 1.000 1.000 1.000
-score DEAR_BENEFICIARY 3.099 1.628 3.099 1.628
-score DKIMWL_BL 0.001 2.799 0.001 2.799
+score DEAR_BENEFICIARY 3.099 2.120 3.099 2.120
+score DKIMWL_BL 0.001 2.999 0.001 2.999
score DKIMWL_BLOCKED 0.001 0.001 0.001 0.001
score DKIMWL_WL_HIGH 0.001 -0.001 0.001 -0.001
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 DRUGS_ERECTILE_SHORT_SHORTNER 1.184 0.469 1.184 0.469
+score DRUGS_ERECTILE_SHORT_SHORTNER 0.856 0.001 0.856 0.001
score DX_TEXT_03 0.899 0.899 0.899 0.899
score EBAY_IMG_NOT_RCVD_EBAY 1.000 1.000 1.000 1.000
score ENCRYPTED_MESSAGE -1.000 -1.000 -1.000 -1.000
score FAKE_REPLY_A1 3.099 3.199 3.099 3.199
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.411 0.001 0.411 0.001
-score FORM_FRAUD 1.000 0.999 1.000 0.999
-score FORM_FRAUD_3 2.379 0.320 2.379 0.320
-score FORM_FRAUD_5 1.302 2.899 1.302 2.899
+score FILL_THIS_FORM 0.418 0.001 0.418 0.001
+score FORM_FRAUD 0.999 0.999 0.999 0.999
+score FORM_FRAUD_3 2.252 0.643 2.252 0.643
+score FORM_FRAUD_5 1.845 2.839 1.845 2.839
score FORM_LOW_CONTRAST 1.000 1.000 1.000 1.000
score FOUND_YOU 3.249 0.001 3.249 0.001
-score FREEMAIL_FORGED_FROMDOMAIN 0.158 0.229 0.158 0.229
+score FREEMAIL_FORGED_FROMDOMAIN 0.197 0.250 0.197 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 FROMSPACE 2.740 0.204 2.740 0.204
-score FROM_2_EMAILS_SHORT 1.999 0.651 1.999 0.651
-score FROM_ADDR_WS 2.999 2.095 2.999 2.095
+score FROMSPACE 2.552 0.214 2.552 0.214
+score FROM_2_EMAILS_SHORT 1.999 0.810 1.999 0.810
+score FROM_ADDR_WS 2.999 1.998 2.999 1.998
score FROM_BANK_NOAUTH 0.001 1.000 0.001 1.000
score FROM_FMBLA_NDBLOCKED 0.001 0.001 0.001 0.001
score FROM_FMBLA_NEWDOM 0.001 1.499 0.001 1.499
-score FROM_FMBLA_NEWDOM14 0.001 1.000 0.001 1.000
-score FROM_FMBLA_NEWDOM28 0.001 0.799 0.001 0.799
+score FROM_FMBLA_NEWDOM14 0.001 0.999 0.001 0.999
+score FROM_FMBLA_NEWDOM28 0.001 0.800 0.001 0.800
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 1.000 0.001 1.000
score FROM_MISSPACED 0.001 0.001 0.001 0.001
-score FROM_MISSP_DYNIP 1.378 1.155 1.378 1.155
-score FROM_MISSP_EH_MATCH 0.103 0.523 0.103 0.523
-score FROM_MISSP_FREEMAIL 0.549 0.001 0.549 0.001
+score FROM_MISSP_DYNIP 0.001 2.204 0.001 2.204
+score FROM_MISSP_EH_MATCH 1.090 0.838 1.090 0.838
+score FROM_MISSP_FREEMAIL 0.547 0.001 0.547 0.001
score FROM_MISSP_MSFT 0.001 0.001 0.001 0.001
-score FROM_MISSP_PHISH 3.499 0.776 3.499 0.776
+score FROM_MISSP_PHISH 3.499 2.761 3.499 2.761
score FROM_MISSP_REPLYTO 0.001 0.001 0.001 0.001
-score FROM_MISSP_SPF_FAIL 0.001 1.187 0.001 1.187
+score FROM_MISSP_SPF_FAIL 0.001 1.191 0.001 1.191
score FROM_MISSP_TO_UNDISC 0.001 0.001 0.001 0.001
score FROM_MISSP_USER 0.001 0.001 0.001 0.001
score FROM_MISSP_XPRIO 0.001 0.001 0.001 0.001
-score FROM_NAME_EQ_TO_G_DRIVE 1.499 0.253 1.499 0.253
+score FROM_NAME_EQ_TO_G_DRIVE 1.055 0.006 1.055 0.006
score FROM_NTLD_LINKBAIT 1.000 1.000 1.000 1.000
-score FROM_NTLD_REPLY_FREEMAIL 1.999 0.745 1.999 0.745
+score FROM_NTLD_REPLY_FREEMAIL 1.999 0.744 1.999 0.744
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.500 0.499 0.500 0.499
-score FROM_WORDY 1.186 2.499 1.186 2.499
-score FROM_WORDY_SHORT 2.057 1.801 2.057 1.801
-score FROM_WSP_TRAIL 2.051 2.699 2.051 2.699
-score FSL_BULK_SIG 0.001 0.211 0.001 0.211
-score FSL_CTYPE_WIN1251 0.345 0.001 0.345 0.001
-score FSL_HELO_FAKE 3.799 3.199 3.799 3.199
+score FROM_SUSPICIOUS_NTLD 0.499 0.500 0.499 0.500
+score FROM_WORDY 0.001 2.054 0.001 2.054
+score FROM_WORDY_SHORT 2.489 1.194 2.489 1.194
+score FROM_WSP_TRAIL 2.551 2.799 2.551 2.799
+score FSL_BULK_SIG 0.001 0.201 0.001 0.201
+score FSL_CTYPE_WIN1251 0.235 0.001 0.235 0.001
+score FSL_HELO_FAKE 3.899 3.199 3.899 3.199
score FSL_NEW_HELO_USER 0.001 0.001 0.001 0.001
score FSL_THIS_IS_ADV 3.099 3.099 3.099 3.099
-score FUZZY_CLICK_HERE 2.799 2.380 2.799 2.380
-score FUZZY_UNSUBSCRIBE 2.599 2.599 2.599 2.599
+score FUZZY_CLICK_HERE 2.799 2.039 2.799 2.039
+score FUZZY_UNSUBSCRIBE 2.599 2.600 2.599 2.600
score GAPPY_SALES_LEADS_FREEM 1.000 1.000 1.000 1.000
score GB_FORGED_MUA_POSTFIX 1.999 1.999 1.999 1.999
-score GB_FREEMAIL_DISPTO 0.500 0.499 0.500 0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM 0.500 0.499 0.500 0.499
-score GB_GOOGLE_OBFU 0.749 0.750 0.749 0.750
+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_OBFU 0.750 0.750 0.750 0.750
score GB_GOOG_IMG_NOT_RCVD_GOOG 2.499 2.499 2.499 2.499
score GB_LINKED_IMG_NOT_RCVD_LINK 2.500 0.001 2.500 0.001
score GOOGLE_DOCS_PHISH 1.000 1.000 1.000 1.000
@@ -135,90 +135,90 @@
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_HTML_ONLY 1.999 1.000 1.999 1.000
-score GOOG_REDIR_NORDNS 1.912 0.001 1.912 0.001
-score HDRS_LCASE_IMGONLY 0.099 0.100 0.099 0.100
-score HDR_ORDER_FTSDMCXX_DIRECT 1.999 1.162 1.999 1.162
-score HDR_ORDER_FTSDMCXX_NORDNS 0.353 1.219 0.353 1.219
+score GOOG_REDIR_NORDNS 1.191 0.001 1.191 0.001
+score HDRS_LCASE_IMGONLY 0.100 0.100 0.100 0.100
+score HDR_ORDER_FTSDMCXX_DIRECT 1.999 1.999 1.999 1.999
+score HDR_ORDER_FTSDMCXX_NORDNS 0.351 1.226 0.351 1.226
score HEADER_FROM_DIFFERENT_DOMAINS 0.250 0.249 0.250 0.249
-score HELO_MISC_IP 0.249 0.001 0.249 0.001
-score HELO_NO_DOMAIN 1.929 2.199 1.929 2.199
-score HEXHASH_WORD 2.601 2.999 2.601 2.999
-score HK_LOTTO 1.000 1.000 1.000 1.000
-score HK_NAME_FM_MR_MRS 0.984 1.499 0.984 1.499
-score HK_NAME_FROM 0.999 1.000 0.999 1.000
-score HK_NAME_MR_MRS 1.000 0.999 1.000 0.999
-score HK_RANDOM_FROM 0.999 0.999 0.999 0.999
-score HK_RANDOM_REPLYTO 0.999 0.999 0.999 0.999
-score HK_RCVD_IP_MULTICAST 0.336 0.682 0.336 0.682
+score HELO_MISC_IP 0.250 0.001 0.250 0.001
+score HELO_NO_DOMAIN 1.925 2.199 1.925 2.199
+score HEXHASH_WORD 2.600 2.999 2.600 2.999
+score HK_LOTTO 0.999 0.999 0.999 0.999
+score HK_NAME_FM_MR_MRS 1.150 1.499 1.150 1.499
+score HK_NAME_FROM 1.000 0.999 1.000 0.999
+score HK_NAME_MR_MRS 0.999 0.999 0.999 0.999
+score HK_RANDOM_FROM 1.000 1.000 1.000 1.000
+score HK_RANDOM_REPLYTO 1.000 0.712 1.000 0.712
+score HK_RCVD_IP_MULTICAST 0.331 0.001 0.331 0.001
score HK_SCAM 1.999 1.627 1.999 1.627
-score HOSTED_IMG_DIRECT_MX 3.499 0.854 3.499 0.854
+score HOSTED_IMG_DIRECT_MX 3.499 3.338 3.499 3.338
score HOSTED_IMG_DQ_UNSUB 1.000 1.000 1.000 1.000
score HOSTED_IMG_FREEM 1.000 1.000 1.000 1.000
-score HTML_ENTITY_ASCII 2.651 0.001 2.651 0.001
+score HTML_ENTITY_ASCII 2.900 2.999 2.900 2.999
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 1.415 2.499 1.415 2.499
-score HTML_SINGLET_MANY 1.788 1.255 1.788 1.255
+score HTML_SHRT_CMNT_OBFU_MANY 1.164 2.500 1.164 2.500
+score HTML_SINGLET_MANY 1.876 1.609 1.876 1.609
score HTML_TEXT_INVISIBLE_FONT 1.000 1.000 1.000 1.000
-score HTML_TEXT_INVISIBLE_STYLE 0.087 1.415 0.087 1.415
-score IMG_ALT_HSPACE_CID_ALIGN 0.855 2.499 0.855 2.499
-score IMG_ONLY_FM_DOM_INFO 2.341 2.499 2.341 2.499
-score KB_FORGED_MOZ4 3.599 0.001 3.599 0.001
-score LIST_PARTIAL_SHORT_MSG 2.499 2.499 2.499 2.499
+score HTML_TEXT_INVISIBLE_STYLE 0.001 1.417 0.001 1.417
+score IMG_ALT_HSPACE_CID_ALIGN 1.106 2.499 1.106 2.499
+score IMG_ONLY_FM_DOM_INFO 2.340 2.499 2.340 2.499
+score KB_FORGED_MOZ4 3.699 0.001 3.699 0.001
+score LIST_PARTIAL_SHORT_MSG 2.500 2.499 2.500 2.499
score LIST_PRTL_PUMPDUMP 1.000 1.000 1.000 1.000
score LIST_PRTL_SAME_USER 0.001 1.000 0.001 1.000
-score LONG_HEX_URI 2.598 2.307 2.598 2.307
-score LONG_IMG_URI 1.271 0.467 1.271 0.467
+score LONG_HEX_URI 2.596 2.321 2.596 2.321
+score LONG_IMG_URI 1.274 0.461 1.274 0.461
score LOTS_OF_MONEY 0.010 0.010 0.010 0.010
score LOTTO_AGENT 1.000 1.000 1.000 1.000
-score LUCRATIVE 0.706 2.000 0.706 2.000
-score MALFORMED_FREEMAIL 0.694 1.163 0.694 1.163
-score MALF_HTML_B64 2.228 1.873 2.228 1.873
-score MANY_SPAN_IN_TEXT 2.499 2.509 2.499 2.509
-score MILLION_HUNDRED 0.722 2.736 0.722 2.736
-score MILLION_USD 1.135 1.811 1.135 1.811
+score LUCRATIVE 0.712 1.999 0.712 1.999
+score MALFORMED_FREEMAIL 0.654 1.139 0.654 1.139
+score MALF_HTML_B64 0.506 3.472 0.506 3.472
+score MANY_SPAN_IN_TEXT 2.499 2.538 2.499 2.538
+score MILLION_HUNDRED 0.001 2.523 0.001 2.523
+score MILLION_USD 1.125 1.999 1.125 1.999
score MIMEOLE_DIRECT_TO_MX 1.999 1.999 1.999 1.999
score MIME_NO_TEXT 1.999 1.000 1.999 1.000
-score MIXED_ES 2.599 0.001 2.599 0.001
-score MONEY_ATM_CARD 1.293 2.309 1.293 2.309
+score MIXED_ES 2.699 0.001 2.699 0.001
+score MONEY_ATM_CARD 1.561 1.023 1.561 1.023
score MONEY_FORM 0.001 0.001 0.001 0.001
score MONEY_FORM_SHORT 2.499 2.499 2.499 2.499
-score MONEY_FRAUD_3 2.699 0.494 2.699 0.494
-score MONEY_FRAUD_5 1.370 0.911 1.370 0.911
+score MONEY_FRAUD_3 2.699 0.497 2.699 0.497
+score MONEY_FRAUD_5 1.245 1.286 1.245 1.286
score MONEY_FRAUD_8 3.299 3.099 3.299 3.099
-score MONEY_FROM_41 2.000 1.999 2.000 1.999
+score MONEY_FROM_41 1.999 2.000 1.999 2.000
score MONEY_FROM_MISSP 1.999 1.999 1.999 1.999
-score MSM_PRIO_REPTO 0.001 1.443 0.001 1.443
-score NORDNS_LOW_CONTRAST 1.786 0.222 1.786 0.222
-score NO_FM_NAME_IP_HOSTN 2.351 0.001 2.351 0.001
+score MSM_PRIO_REPTO 1.367 1.514 1.367 1.514
+score NORDNS_LOW_CONTRAST 1.787 0.222 1.787 0.222
+score NO_FM_NAME_IP_HOSTN 2.350 0.001 2.350 0.001
score NSL_RCVD_FROM_USER 0.001 0.001 0.001 0.001
-score NSL_RCVD_HELO_USER 2.597 2.799 2.597 2.799
-score NUMBERONLY_BITCOIN_EXP 0.001 1.000 0.001 1.000
+score NSL_RCVD_HELO_USER 3.099 2.799 3.099 2.799
+score NUMBERONLY_BITCOIN_EXP 0.001 0.999 0.001 0.999
score OBFU_BITCOIN 2.999 2.999 2.999 2.999
-score OFFER_ONLY_AMERICA 1.999 1.000 1.999 1.000
-score PDS_DBL_URL_LINKBAIT 2.352 2.499 2.352 2.499
-score PDS_DBL_URL_TNB_RUNON 1.999 1.328 1.999 1.328
+score OFFER_ONLY_AMERICA 2.000 1.000 2.000 1.000
+score PDS_DBL_URL_LINKBAIT 2.499 2.499 2.499 2.499
+score PDS_DBL_URL_TNB_RUNON 1.999 1.355 1.999 1.355
score PDS_HELO_SPF_FAIL 0.001 0.001 0.001 0.001
-score PDS_HIDDEN_UK_BUSINESSLOAN 1.139 1.000 1.139 1.000
-score PDS_HP_HELO_NORDNS 0.001 0.914 0.001 0.914
-score PDS_NO_HELO_DNS 0.001 1.327 0.001 1.327
+score PDS_HIDDEN_UK_BUSINESSLOAN 1.999 1.000 1.999 1.000
+score PDS_HP_HELO_NORDNS 0.001 0.947 0.001 0.947
+score PDS_NO_HELO_DNS 0.001 1.294 0.001 1.294
score PDS_PHP_EVAL 1.499 1.499 1.499 1.499
score PDS_PHP_RUNTIME_FUNC 1.000 1.000 1.000 1.000
-score PDS_TO_EQ_FROM_NAME 0.441 0.316 0.441 0.316
-score PDS_URI_HIDDEN_HELO_NO_DOMAIN 0.210 1.421 0.210 1.421
-score PDS_X_PHP_WP_EXP 1.500 1.499 1.500 1.499
-score PHOTO_EDITING_DIRECT 2.999 2.117 2.999 2.117
+score PDS_TO_EQ_FROM_NAME 0.118 0.406 0.118 0.406
+score PDS_URI_HIDDEN_HELO_NO_DOMAIN 1.726 1.426 1.726 1.426
+score PDS_X_PHP_WP_EXP 1.499 1.499 1.499 1.499
+score PHOTO_EDITING_DIRECT 2.999 1.879 2.999 1.879
score PHOTO_EDITING_FREEM 1.000 1.000 1.000 1.000
score PHP_NOVER_MUA 1.000 1.000 1.000 1.000
-score PHP_ORIG_SCRIPT 2.499 2.500 2.499 2.500
+score PHP_ORIG_SCRIPT 2.499 2.499 2.499 2.499
score PHP_SCRIPT_MUA 1.000 1.000 1.000 1.000
-score PP_MIME_FAKE_ASCII_TEXT 1.000 0.999 1.000 0.999
+score PP_MIME_FAKE_ASCII_TEXT 0.999 1.000 0.999 1.000
score PP_TOO_MUCH_UNICODE02 0.500 0.500 0.500 0.500
score PP_TOO_MUCH_UNICODE05 1.000 1.000 1.000 1.000
score PUMPDUMP 1.000 1.000 1.000 1.000
score PUMPDUMP_MULTI 1.000 1.000 1.000 1.000
score RAND_HEADER_MANY 1.000 1.000 1.000 1.000
-score RATWARE_NO_RDNS 2.997 0.098 2.997 0.098
+score RATWARE_NO_RDNS 2.979 0.908 2.979 0.908
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
@@ -230,66 +230,66 @@
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 2.053 0.382 2.053 0.382
-score RDNS_NUM_TLD_XM 2.999 2.476 2.999 2.476
-score RISK_FREE 2.600 0.001 2.600 0.001
-score SEO_SUSP_NTLD 1.199 1.199 1.199 1.199
-score SERGIO_SUBJECT_PORN014 2.510 1.783 2.510 1.783
-score SERGIO_SUBJECT_VIAGRA01 0.001 2.090 0.001 2.090
-score SHORTENER_SHORT_IMG 1.150 2.186 1.150 2.186
-score SHORT_BODY_G_DRIVE_DYN 0.618 1.499 0.618 1.499
-score SHORT_IMG_SUSP_NTLD 1.499 1.403 1.499 1.403
-score SINGLETS_LOW_CONTRAST 0.001 2.339 0.001 2.339
+score RDNS_NUM_TLD_ATCHNX 2.191 1.212 2.191 1.212
+score RDNS_NUM_TLD_XM 2.999 2.999 2.999 2.999
+score RISK_FREE 2.699 0.001 2.699 0.001
+score SEO_SUSP_NTLD 1.199 1.200 1.199 1.200
+score SERGIO_SUBJECT_PORN014 2.501 2.516 2.501 2.516
+score SERGIO_SUBJECT_VIAGRA01 0.300 1.911 0.300 1.911
+score SHORTENER_SHORT_IMG 1.154 2.351 1.154 2.351
+score SHORT_BODY_G_DRIVE_DYN 1.307 1.499 1.307 1.499
+score SHORT_IMG_SUSP_NTLD 0.805 1.276 0.805 1.276
+score SINGLETS_LOW_CONTRAST 0.001 1.964 0.001 1.964
score SPOOFED_FREEMAIL_NO_RDNS 1.499 1.499 1.499 1.499
-score SPOOFED_FREEM_REPTO 2.499 2.251 2.499 2.251
+score SPOOFED_FREEM_REPTO 2.499 2.216 2.499 2.216
score SPOOFED_FREEM_REPTO_CHN 1.000 1.000 1.000 1.000
score SPOOFED_FREEM_REPTO_RUS 1.000 1.000 1.000 1.000
-score STATIC_XPRIO_OLE 0.999 0.001 0.999 0.001
-score STOCK_LOW_CONTRAST 1.682 0.001 1.682 0.001
+score STATIC_XPRIO_OLE 1.999 0.001 1.999 0.001
+score STOCK_LOW_CONTRAST 1.234 0.001 1.234 0.001
score STOCK_TIP 1.000 1.000 1.000 1.000
score SURBL_BLOCKED 0.001 0.001 0.001 0.001
score SYSADMIN 1.000 1.000 1.000 1.000
-score TEQF_USR_POLITE 0.051 0.757 0.051 0.757
-score THIS_AD 1.800 0.050 1.800 0.050
-score THIS_IS_ADV_SUSP_NTLD 1.499 1.175 1.499 1.175
-score TO_EQ_FM_DIRECT_MX 0.803 1.526 0.803 1.526
-score TO_EQ_FM_DOM_SPF_FAIL 0.001 0.001 0.001 0.001
-score TO_EQ_FM_SPF_FAIL 0.001 0.584 0.001 0.584
-score TO_IN_SUBJ 0.100 0.100 0.100 0.100
-score TO_NAME_SUBJ_NO_RDNS 0.096 0.001 0.096 0.001
-score TO_NO_BRKTS_DYNIP 1.917 2.999 1.917 2.999
-score TO_NO_BRKTS_FROM_MSSP 2.499 2.198 2.499 2.198
+score TEQF_USR_POLITE 0.998 0.764 0.998 0.764
+score THIS_AD 1.900 0.045 1.900 0.045
+score THIS_IS_ADV_SUSP_NTLD 1.477 0.158 1.477 0.158
+score TO_EQ_FM_DIRECT_MX 0.061 1.527 0.061 1.527
+score TO_EQ_FM_DOM_SPF_FAIL 0.001 0.067 0.001 0.067
+score TO_EQ_FM_SPF_FAIL 0.001 0.547 0.001 0.547
+score TO_IN_SUBJ 0.099 0.100 0.099 0.100
+score TO_NAME_SUBJ_NO_RDNS 2.022 0.001 2.022 0.001
+score TO_NO_BRKTS_DYNIP 2.249 2.999 2.249 2.999
+score TO_NO_BRKTS_FROM_MSSP 2.352 1.887 2.352 1.887
score TO_NO_BRKTS_HTML_IMG 0.641 1.999 0.641 1.999
score TO_NO_BRKTS_HTML_ONLY 1.999 1.999 1.999 1.999
score TO_NO_BRKTS_MSFT 2.499 2.499 2.499 2.499
-score TO_NO_BRKTS_NORDNS_HTML 2.000 1.974 2.000 1.974
+score TO_NO_BRKTS_NORDNS_HTML 1.999 1.999 1.999 1.999
score TO_NO_BRKTS_PCNT 2.499 1.000 2.499 1.000
-score TVD_IP_HEX 2.899 2.667 2.899 2.667
-score TVD_IP_SING_HEX 0.678 0.176 0.678 0.176
-score TVD_SPACE_ENCODED 2.415 1.005 2.415 1.005
-score TVD_SPACE_RATIO_MINFP 2.500 2.500 2.500 2.500
-score TVD_SUBJ_APPR_LOAN 1.784 2.699 1.784 2.699
-score TVD_SUBJ_NUM_OBFU_MINFP 2.709 0.001 2.709 0.001
+score TVD_IP_HEX 2.275 1.231 2.275 1.231
+score TVD_IP_SING_HEX 1.319 1.208 1.319 1.208
+score TVD_SPACE_ENCODED 2.485 0.778 2.485 0.778
+score TVD_SPACE_RATIO_MINFP 2.499 2.499 2.499 2.499
+score TVD_SUBJ_APPR_LOAN 1.676 2.699 1.676 2.699
+score TVD_SUBJ_NUM_OBFU_MINFP 3.099 0.001 3.099 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 UNICODE_OBFU_ASC 2.499 2.499 2.499 2.499
-score UNICODE_OBFU_ZW 1.186 2.150 1.186 2.150
-score URI_BUFFLY 0.593 1.662 0.593 1.662
+score UNICODE_OBFU_ZW 3.499 0.243 3.499 0.243
+score URI_BUFFLY 0.010 1.303 0.010 1.303
score URI_DATA 1.000 1.000 1.000 1.000
-score URI_GOOGLE_PROXY 1.700 1.699 1.700 1.699
-score URI_HEX_IP 1.588 1.906 1.588 1.906
+score URI_GOOGLE_PROXY 1.699 1.699 1.699 1.699
+score URI_HEX_IP 0.554 1.200 0.554 1.200
score URI_ONLY_MSGID_MALF 1.999 1.999 1.999 1.999
score URI_OPTOUT_3LD 1.000 1.000 1.000 1.000
score URI_PHISH 3.999 3.999 3.999 3.999
-score URI_PHP_REDIR 3.499 2.617 3.499 2.617
-score URI_TRY_3LD 0.419 0.001 0.419 0.001
+score URI_PHP_REDIR 3.500 2.617 3.500 2.617
+score URI_TRY_3LD 0.210 0.001 0.210 0.001
score URI_WPADMIN 2.499 2.399 2.499 2.399
score URI_WP_DIRINDEX 3.499 3.499 3.499 3.499
score URI_WP_HACKED 3.499 1.913 3.499 1.913
-score URI_WP_HACKED_2 2.499 2.499 2.499 2.499
+score URI_WP_HACKED_2 2.500 2.500 2.500 2.500
score USB_DRIVES 1.000 1.000 1.000 1.000
score VPS_NO_NTLD 1.000 1.000 1.000 1.000
-score XPRIO 2.249 0.490 2.249 0.490
-score XPRIO_SHORT_SUBJ 2.499 0.942 2.499 0.942
-score YOU_INHERIT 2.454 0.215 2.454 0.215
-score ZW_OBFU_BITCOIN 2.330 2.043 2.330 2.043
+score XPRIO 2.249 0.491 2.249 0.491
+score XPRIO_SHORT_SUBJ 2.499 0.858 2.499 0.858
+score YOU_INHERIT 1.348 0.026 1.348 0.026
+score ZW_OBFU_BITCOIN 1.018 0.070 1.018 0.070
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index bce5213..b7eb897 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -1,5 +1,5 @@
-# Using score set 0 logs for revision 1862680 from:
-# ham-axb-coi-bulk.r1862680.log ham-axb-generic.r1862680.log ham-axb-ham-misc.r1862680.log ham-darxus.r1862680.log ham-ena-week0.r1862680.log ham-ena-week1.r1862680.log ham-ena-week2.r1862680.log ham-ena-week3.r1862680.log ham-ena-week4.r1862680.log ham-giovanni-ham.r1862680.log ham-giovanni-spammy.r1862680.log ham-giovanni-spam.r1862680.log ham-grenier.r1862680.log ham-hege.r1862680.log ham-jarif.r1862680.log ham-jbrooks.r1862680.log ham-llanga.r1862680.log ham-mmiroslaw-mails-ham.r1862680.log ham-mmiroslaw-mails-spam.r1862680.log ham-npiazzi.r1862680.log ham-pds.r1862680.log ham-sihde.r1862680.log ham-spamsponge.r1862680.log ham-thendrikx.r1862680.log spam-axb-coi-bulk.r1862680.log spam-axb-generic.r1862680.log spam-axb-ham-misc.r1862680.log spam-darxus.r1862680.log spam-ena-week0.r1862680.log spam-ena-week1.r1862680.log spam-ena-week2.r1862680.log spam-ena-week3.r1862680.log spam-ena-week4.r1862680.log spam-giovanni-ham.r1862680.log spam-giovanni-spammy.r1862680.log spam-giovanni-spam.r1862680.log spam-grenier.r1862680.log spam-hege.r1862680.log spam-jarif.r1862680.log spam-jbrooks.r1862680.log spam-llanga.r1862680.log spam-mmiroslaw-mails-ham.r1862680.log spam-mmiroslaw-mails-spam.r1862680.log spam-npiazzi.r1862680.log spam-pds.r1862680.log spam-sihde.r1862680.log spam-spamsponge.r1862680.log spam-thendrikx.r1862680.log
+# Using score set 0 logs for revision 1862723 from:
+# ham-axb-coi-bulk.r1862723.log ham-axb-generic.r1862723.log ham-axb-ham-misc.r1862723.log ham-darxus.r1862723.log ham-ena-week0.r1862723.log ham-ena-week1.r1862723.log ham-ena-week2.r1862723.log ham-ena-week3.r1862723.log ham-ena-week4.r1862723.log ham-giovanni-ham.r1862723.log ham-giovanni-spammy.r1862723.log ham-giovanni-spam.r1862723.log ham-grenier.r1862723.log ham-hege.r1862723.log ham-jarif.r1862723.log ham-jbrooks.r1862723.log ham-llanga.r1862723.log ham-mmiroslaw-mails-ham.r1862723.log ham-mmiroslaw-mails-spam.r1862723.log ham-npiazzi.r1862723.log ham-pds.r1862723.log ham-sihde.r1862723.log ham-spamsponge.r1862723.log ham-thendrikx.r1862723.log spam-axb-coi-bulk.r1862723.log spam-axb-generic.r1862723.log spam-axb-ham-misc.r1862723.log spam-darxus.r1862723.log spam-ena-week0.r1862723.log spam-ena-week1.r1862723.log spam-ena-week2.r1862723.log spam-ena-week3.r1862723.log spam-ena-week4.r1862723.log spam-giovanni-ham.r1862723.log spam-giovanni-spammy.r1862723.log spam-giovanni-spam.r1862723.log spam-grenier.r1862723.log spam-hege.r1862723.log spam-jarif.r1862723.log spam-jbrooks.r1862723.log spam-llanga.r1862723.log spam-mmiroslaw-mails-ham.r1862723.log spam-mmiroslaw-mails-spam.r1862723.log spam-npiazzi.r1862723.log spam-pds.r1862723.log spam-sihde.r1862723.log spam-spamsponge.r1862723.log spam-thendrikx.r1862723.log
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001
@@ -7,200 +7,200 @@
score AC_HTML_NONSENSE_TAGS 1.999
score ADVANCE_FEE_2_NEW_MONEY 1.999
score ADVANCE_FEE_3_NEW 2.552
-score ADVANCE_FEE_3_NEW_MONEY 2.518
-score ADVANCE_FEE_4_NEW 2.700
-score ADVANCE_FEE_4_NEW_FRM_MNY 1.196
-score ADVANCE_FEE_4_NEW_MONEY 3.099
-score ADVANCE_FEE_5_NEW 0.250
+score ADVANCE_FEE_3_NEW_MONEY 2.642
+score ADVANCE_FEE_4_NEW 2.699
+score ADVANCE_FEE_4_NEW_FRM_MNY 1.263
+score ADVANCE_FEE_4_NEW_MONEY 2.999
+score ADVANCE_FEE_5_NEW 1.048
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_5_NEW_MONEY 0.476
+score ADVANCE_FEE_5_NEW_MONEY 0.644
score AD_PREFS 0.499
-score AMAZON_IMG_NOT_RCVD_AMZN 2.199
-score ANY_PILL_PRICE 0.310
-score AXB_XMAILER_MIMEOLE_OL_024C2 0.154
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.239
-score BIGNUM_EMAILS 2.385
-score BITCOIN_DEADLINE 2.985
-score BITCOIN_EXTORT_01 4.999
+score AMAZON_IMG_NOT_RCVD_AMZN 2.345
+score ANY_PILL_PRICE 0.426
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.265
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.816
+score BIGNUM_EMAILS 1.487
+score BITCOIN_DEADLINE 2.652
+score BITCOIN_EXTORT_01 3.502
score BITCOIN_MALWARE 3.499
-score BITCOIN_PAY_ME 2.999
-score BITCOIN_SPAM_01 1.916
+score BITCOIN_PAY_ME 3.000
+score BITCOIN_SPAM_01 0.001
score BITCOIN_SPAM_02 2.499
score BITCOIN_SPAM_03 2.499
-score BITCOIN_SPAM_05 2.358
-score BITCOIN_SPAM_06 1.038
+score BITCOIN_SPAM_05 2.217
+score BITCOIN_SPAM_06 1.426
score BITCOIN_SPAM_07 3.499
score BITCOIN_SPAM_08 2.499
-score BITCOIN_SPAM_09 1.054
-score BITCOIN_SPAM_11 2.322
-score BODY_EMPTY 1.999
-score BODY_SINGLE_URI 0.918
-score BODY_SINGLE_WORD 2.499
+score BITCOIN_SPAM_09 1.499
+score BITCOIN_SPAM_11 2.138
+score BODY_EMPTY 2.000
+score BODY_SINGLE_URI 0.991
+score BODY_SINGLE_WORD 2.409
score BODY_URI_ONLY 0.999
-score BOGUS_MSM_HDRS 2.059
-score CANT_SEE_AD 0.970
+score BOGUS_MSM_HDRS 1.477
+score CANT_SEE_AD 1.072
score CK_HELO_DYNAMIC_SPLIT_IP 1.499
-score CK_HELO_GENERIC 0.249
+score CK_HELO_GENERIC 0.250
score COMPENSATION 1.499
score DATE_IN_FUTURE_96_Q 2.799
score DEAR_BENEFICIARY 3.099
-score DRUGS_ERECTILE_SHORT_SHORTNER 1.184
+score DRUGS_ERECTILE_SHORT_SHORTNER 0.856
score DX_TEXT_03 0.899
score FAKE_REPLY_A1 3.099
-score FILL_THIS_FORM 0.411
-score FORM_FRAUD 1.000
-score FORM_FRAUD_3 2.379
-score FORM_FRAUD_5 1.302
+score FILL_THIS_FORM 0.418
+score FORM_FRAUD 0.999
+score FORM_FRAUD_3 2.252
+score FORM_FRAUD_5 1.845
score FOUND_YOU 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.158
-score FROMSPACE 2.740
+score FREEMAIL_FORGED_FROMDOMAIN 0.197
+score FROMSPACE 2.552
score FROM_2_EMAILS_SHORT 1.999
score FROM_ADDR_WS 2.999
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 1.378
-score FROM_MISSP_EH_MATCH 0.103
-score FROM_MISSP_FREEMAIL 0.549
-score FROM_MISSP_MSFT 0.001 # force non-zero
+score FROM_MISSP_DYNIP 0.001
+score FROM_MISSP_EH_MATCH 1.090
+score FROM_MISSP_FREEMAIL 0.547
+score FROM_MISSP_MSFT 0.001
score FROM_MISSP_PHISH 3.499
-score FROM_MISSP_REPLYTO 0.001
-score FROM_MISSP_TO_UNDISC 0.001 # force non-zero
+score FROM_MISSP_REPLYTO 0.001 # force non-zero
+score FROM_MISSP_TO_UNDISC 0.001
score FROM_MISSP_USER 0.001
score FROM_MISSP_XPRIO 0.001
-score FROM_NAME_EQ_TO_G_DRIVE 1.499
+score FROM_NAME_EQ_TO_G_DRIVE 1.055
score FROM_NTLD_REPLY_FREEMAIL 1.999
-score FROM_SUSPICIOUS_NTLD 0.500
-score FROM_WORDY 1.186
-score FROM_WORDY_SHORT 2.057
-score FROM_WSP_TRAIL 2.051
-score FSL_CTYPE_WIN1251 0.345
-score FSL_HELO_FAKE 3.799
+score FROM_SUSPICIOUS_NTLD 0.499
+score FROM_WORDY 0.001
+score FROM_WORDY_SHORT 2.489
+score FROM_WSP_TRAIL 2.551
+score FSL_CTYPE_WIN1251 0.235
+score FSL_HELO_FAKE 3.899
score FSL_NEW_HELO_USER 0.001
score FSL_THIS_IS_ADV 3.099
score FUZZY_CLICK_HERE 2.799
score FUZZY_UNSUBSCRIBE 2.599
score GB_FORGED_MUA_POSTFIX 1.999
-score GB_FREEMAIL_DISPTO 0.500
+score GB_FREEMAIL_DISPTO 0.499
score GB_FREEMAIL_DISPTO_NOTFREEM 0.500
-score GB_GOOGLE_OBFU 0.749
+score GB_GOOGLE_OBFU 0.750
score GB_GOOG_IMG_NOT_RCVD_GOOG 2.499
score GB_LINKED_IMG_NOT_RCVD_LINK 2.500
score GOOG_REDIR_HTML_ONLY 1.999
-score GOOG_REDIR_NORDNS 1.912
-score HDRS_LCASE_IMGONLY 0.099
+score GOOG_REDIR_NORDNS 1.191
+score HDRS_LCASE_IMGONLY 0.100
score HDR_ORDER_FTSDMCXX_DIRECT 1.999
-score HDR_ORDER_FTSDMCXX_NORDNS 0.353
+score HDR_ORDER_FTSDMCXX_NORDNS 0.351
score HEADER_FROM_DIFFERENT_DOMAINS 0.250
-score HELO_MISC_IP 0.249
-score HELO_NO_DOMAIN 1.929
-score HEXHASH_WORD 2.601
-score HK_LOTTO 1.000
-score HK_NAME_FM_MR_MRS 0.984
-score HK_NAME_FROM 0.999
-score HK_NAME_MR_MRS 1.000
-score HK_RANDOM_FROM 0.999
-score HK_RANDOM_REPLYTO 0.999
-score HK_RCVD_IP_MULTICAST 0.336
+score HELO_MISC_IP 0.250
+score HELO_NO_DOMAIN 1.925
+score HEXHASH_WORD 2.600
+score HK_LOTTO 0.999
+score HK_NAME_FM_MR_MRS 1.150
+score HK_NAME_FROM 1.000
+score HK_NAME_MR_MRS 0.999
+score HK_RANDOM_FROM 1.000
+score HK_RANDOM_REPLYTO 1.000
+score HK_RCVD_IP_MULTICAST 0.331
score HK_SCAM 1.999
score HOSTED_IMG_DIRECT_MX 3.499
-score HTML_ENTITY_ASCII 2.651
+score HTML_ENTITY_ASCII 2.900
score HTML_OFF_PAGE 2.999
-score HTML_SHRT_CMNT_OBFU_MANY 1.415
-score HTML_SINGLET_MANY 1.788
-score HTML_TEXT_INVISIBLE_STYLE 0.087
-score IMG_ALT_HSPACE_CID_ALIGN 0.855
-score IMG_ONLY_FM_DOM_INFO 2.341
-score KB_FORGED_MOZ4 3.599
-score LIST_PARTIAL_SHORT_MSG 2.499
+score HTML_SHRT_CMNT_OBFU_MANY 1.164
+score HTML_SINGLET_MANY 1.876
+score HTML_TEXT_INVISIBLE_STYLE 0.001
+score IMG_ALT_HSPACE_CID_ALIGN 1.106
+score IMG_ONLY_FM_DOM_INFO 2.340
+score KB_FORGED_MOZ4 3.699
+score LIST_PARTIAL_SHORT_MSG 2.500
score LIST_PRTL_SAME_USER 0.001
-score LONG_HEX_URI 2.598
-score LONG_IMG_URI 1.271
+score LONG_HEX_URI 2.596
+score LONG_IMG_URI 1.274
score LOTS_OF_MONEY 0.010
-score LUCRATIVE 0.706
-score MALFORMED_FREEMAIL 0.694
-score MALF_HTML_B64 2.228
+score LUCRATIVE 0.712
+score MALFORMED_FREEMAIL 0.654
+score MALF_HTML_B64 0.506
score MANY_SPAN_IN_TEXT 2.499
-score MILLION_HUNDRED 0.722
-score MILLION_USD 1.135
+score MILLION_HUNDRED 0.001
+score MILLION_USD 1.125
score MIMEOLE_DIRECT_TO_MX 1.999
score MIME_NO_TEXT 1.999
-score MIXED_ES 2.599
-score MONEY_ATM_CARD 1.293
+score MIXED_ES 2.699
+score MONEY_ATM_CARD 1.561
score MONEY_FORM 0.001
score MONEY_FORM_SHORT 2.499
score MONEY_FRAUD_3 2.699
-score MONEY_FRAUD_5 1.370
+score MONEY_FRAUD_5 1.245
score MONEY_FRAUD_8 3.299
-score MONEY_FROM_41 2.000
+score MONEY_FROM_41 1.999
score MONEY_FROM_MISSP 1.999
-score MSM_PRIO_REPTO 0.001
-score NORDNS_LOW_CONTRAST 1.786
-score NO_FM_NAME_IP_HOSTN 2.351
+score MSM_PRIO_REPTO 1.367
+score NORDNS_LOW_CONTRAST 1.787
+score NO_FM_NAME_IP_HOSTN 2.350
score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 2.597
+score NSL_RCVD_HELO_USER 3.099
score NUMBERONLY_BITCOIN_EXP 0.001
score OBFU_BITCOIN 2.999
-score OFFER_ONLY_AMERICA 1.999
-score PDS_DBL_URL_LINKBAIT 2.352
+score OFFER_ONLY_AMERICA 2.000
+score PDS_DBL_URL_LINKBAIT 2.499
score PDS_DBL_URL_TNB_RUNON 1.999
-score PDS_HIDDEN_UK_BUSINESSLOAN 1.139
+score PDS_HIDDEN_UK_BUSINESSLOAN 1.999
score PDS_PHP_EVAL 1.499
-score PDS_TO_EQ_FROM_NAME 0.441
-score PDS_URI_HIDDEN_HELO_NO_DOMAIN 0.210
-score PDS_X_PHP_WP_EXP 1.500
+score PDS_TO_EQ_FROM_NAME 0.118
+score PDS_URI_HIDDEN_HELO_NO_DOMAIN 1.726
+score PDS_X_PHP_WP_EXP 1.499
score PHOTO_EDITING_DIRECT 2.999
score PHP_ORIG_SCRIPT 2.499
-score PP_MIME_FAKE_ASCII_TEXT 1.000
-score RATWARE_NO_RDNS 2.997
-score RDNS_NUM_TLD_ATCHNX 2.053
+score PP_MIME_FAKE_ASCII_TEXT 0.999
+score RATWARE_NO_RDNS 2.979
+score RDNS_NUM_TLD_ATCHNX 2.191
score RDNS_NUM_TLD_XM 2.999
-score RISK_FREE 2.600
+score RISK_FREE 2.699
score SEO_SUSP_NTLD 1.199
-score SERGIO_SUBJECT_PORN014 2.510
-score SERGIO_SUBJECT_VIAGRA01 0.001 # force non-zero
-score SHORTENER_SHORT_IMG 1.150
-score SHORT_BODY_G_DRIVE_DYN 0.618
-score SHORT_IMG_SUSP_NTLD 1.499
-score SINGLETS_LOW_CONTRAST 0.001
+score SERGIO_SUBJECT_PORN014 2.501
+score SERGIO_SUBJECT_VIAGRA01 0.300
+score SHORTENER_SHORT_IMG 1.154
+score SHORT_BODY_G_DRIVE_DYN 1.307
+score SHORT_IMG_SUSP_NTLD 0.805
+score SINGLETS_LOW_CONTRAST 0.001 # force non-zero
score SPOOFED_FREEMAIL_NO_RDNS 1.499
score SPOOFED_FREEM_REPTO 2.499
-score STATIC_XPRIO_OLE 0.999
-score STOCK_LOW_CONTRAST 1.682
-score TEQF_USR_POLITE 0.051
-score THIS_AD 1.800
-score THIS_IS_ADV_SUSP_NTLD 1.499
-score TO_EQ_FM_DIRECT_MX 0.803
-score TO_IN_SUBJ 0.100
-score TO_NAME_SUBJ_NO_RDNS 0.096
-score TO_NO_BRKTS_DYNIP 1.917
-score TO_NO_BRKTS_FROM_MSSP 2.499
+score STATIC_XPRIO_OLE 1.999
+score STOCK_LOW_CONTRAST 1.234
+score TEQF_USR_POLITE 0.998
+score THIS_AD 1.900
+score THIS_IS_ADV_SUSP_NTLD 1.477
+score TO_EQ_FM_DIRECT_MX 0.061
+score TO_IN_SUBJ 0.099
+score TO_NAME_SUBJ_NO_RDNS 2.022
+score TO_NO_BRKTS_DYNIP 2.249
+score TO_NO_BRKTS_FROM_MSSP 2.352
score TO_NO_BRKTS_HTML_IMG 0.641
score TO_NO_BRKTS_HTML_ONLY 1.999
score TO_NO_BRKTS_MSFT 2.499
-score TO_NO_BRKTS_NORDNS_HTML 2.000
+score TO_NO_BRKTS_NORDNS_HTML 1.999
score TO_NO_BRKTS_PCNT 2.499
-score TVD_IP_HEX 2.899
-score TVD_IP_SING_HEX 0.678
-score TVD_SPACE_ENCODED 2.415
-score TVD_SPACE_RATIO_MINFP 2.500
-score TVD_SUBJ_APPR_LOAN 1.784
-score TVD_SUBJ_NUM_OBFU_MINFP 2.709
+score TVD_IP_HEX 2.275
+score TVD_IP_SING_HEX 1.319
+score TVD_SPACE_ENCODED 2.485
+score TVD_SPACE_RATIO_MINFP 2.499
+score TVD_SUBJ_APPR_LOAN 1.676
+score TVD_SUBJ_NUM_OBFU_MINFP 3.099
score UNICODE_OBFU_ASC 2.499
-score UNICODE_OBFU_ZW 1.186
-score URI_BUFFLY 0.593
-score URI_GOOGLE_PROXY 1.700
-score URI_HEX_IP 1.588
+score UNICODE_OBFU_ZW 3.499
+score URI_BUFFLY 0.010
+score URI_GOOGLE_PROXY 1.699
+score URI_HEX_IP 0.554
score URI_ONLY_MSGID_MALF 1.999
score URI_PHISH 3.999
-score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 0.419
+score URI_PHP_REDIR 3.500
+score URI_TRY_3LD 0.210
score URI_WPADMIN 2.499
score URI_WP_DIRINDEX 3.499
score URI_WP_HACKED 3.499
-score URI_WP_HACKED_2 2.499
+score URI_WP_HACKED_2 2.500
score XPRIO 2.249
score XPRIO_SHORT_SUBJ 2.499
-score YOU_INHERIT 2.454
-score ZW_OBFU_BITCOIN 2.330
+score YOU_INHERIT 1.348
+score ZW_OBFU_BITCOIN 1.018
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
score AC_SPAMMY_URI_PATTERNS11 1.000
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index 0da53f2..75c547a 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -3,196 +3,196 @@
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001
-score AC_FROM_MANY_DOTS 1.759
-score AC_HTML_NONSENSE_TAGS 1.523
-score ADVANCE_FEE_2_NEW_MONEY 0.287
+score AC_FROM_MANY_DOTS 2.207
+score AC_HTML_NONSENSE_TAGS 1.525
+score ADVANCE_FEE_2_NEW_MONEY 0.285
score ADVANCE_FEE_3_NEW 3.465
-score ADVANCE_FEE_3_NEW_MONEY 1.236
-score ADVANCE_FEE_4_NEW 2.499
-score ADVANCE_FEE_4_NEW_FRM_MNY 0.358
+score ADVANCE_FEE_3_NEW_MONEY 0.860
+score ADVANCE_FEE_4_NEW 2.600
+score ADVANCE_FEE_4_NEW_FRM_MNY 2.248
score ADVANCE_FEE_4_NEW_MONEY 2.599
score ADVANCE_FEE_5_NEW 0.001
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_5_NEW_MONEY 1.190
-score AD_PREFS 0.433
-score AMAZON_IMG_NOT_RCVD_AMZN 1.680
+score ADVANCE_FEE_5_NEW_MONEY 1.215
+score AD_PREFS 0.499
+score AMAZON_IMG_NOT_RCVD_AMZN 1.681
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.404
-score BIGNUM_EMAILS 2.732
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.503
+score BIGNUM_EMAILS 2.680
score BITCOIN_DEADLINE 2.999
score BITCOIN_EXTORT_01 4.996
score BITCOIN_MALWARE 3.499
score BITCOIN_PAY_ME 2.999
-score BITCOIN_SPAM_01 0.001
+score BITCOIN_SPAM_01 0.001 # force non-zero
score BITCOIN_SPAM_02 2.499
-score BITCOIN_SPAM_03 2.439
+score BITCOIN_SPAM_03 2.499
score BITCOIN_SPAM_05 2.499
-score BITCOIN_SPAM_06 0.316
-score BITCOIN_SPAM_07 3.382
+score BITCOIN_SPAM_06 0.978
+score BITCOIN_SPAM_07 3.386
score BITCOIN_SPAM_08 2.499
-score BITCOIN_SPAM_09 1.088
-score BITCOIN_SPAM_11 2.409
-score BODY_SINGLE_URI 1.297
-score BODY_SINGLE_WORD 0.001 # force non-zero
-score BODY_URI_ONLY 1.000
-score BOGUS_MSM_HDRS 1.754
-score CANT_SEE_AD 0.078
+score BITCOIN_SPAM_09 1.138
+score BITCOIN_SPAM_11 1.142
+score BODY_SINGLE_URI 1.298
+score BODY_SINGLE_WORD 0.001
+score BODY_URI_ONLY 0.999
+score BOGUS_MSM_HDRS 2.587
+score CANT_SEE_AD 1.022
score CK_HELO_DYNAMIC_SPLIT_IP 0.001
-score CK_HELO_GENERIC 0.001
-score DATE_IN_FUTURE_96_Q 1.392
-score DEAR_BENEFICIARY 1.628
-score DKIMWL_BL 2.799
+score CK_HELO_GENERIC 0.001 # force non-zero
+score DATE_IN_FUTURE_96_Q 0.388
+score DEAR_BENEFICIARY 2.120
+score DKIMWL_BL 2.999
score DKIMWL_WL_HIGH -0.001
score DKIMWL_WL_MED -0.001
-score DKIMWL_WL_MEDHI -0.001
-score DRUGS_ERECTILE_SHORT_SHORTNER 0.469
+score DKIMWL_WL_MEDHI -0.001 # force non-zero
+score DRUGS_ERECTILE_SHORT_SHORTNER 0.001
score DX_TEXT_03 0.899
score FAKE_REPLY_A1 3.199
score FILL_THIS_FORM 0.001
score FORM_FRAUD 0.999
-score FORM_FRAUD_3 0.320
-score FORM_FRAUD_5 2.899
+score FORM_FRAUD_3 0.643
+score FORM_FRAUD_5 2.839
score FOUND_YOU 0.001
-score FREEMAIL_FORGED_FROMDOMAIN 0.229
-score FROMSPACE 0.204
-score FROM_2_EMAILS_SHORT 0.651
-score FROM_ADDR_WS 2.095
+score FREEMAIL_FORGED_FROMDOMAIN 0.250
+score FROMSPACE 0.214
+score FROM_2_EMAILS_SHORT 0.810
+score FROM_ADDR_WS 1.998
score FROM_FMBLA_NEWDOM 1.499
-score FROM_FMBLA_NEWDOM14 1.000
-score FROM_FMBLA_NEWDOM28 0.799
+score FROM_FMBLA_NEWDOM14 0.999
+score FROM_FMBLA_NEWDOM28 0.800
score FROM_GOV_DKIM_AU -0.001
-score FROM_IN_TO_AND_SUBJ 2.128
+score FROM_IN_TO_AND_SUBJ 0.503
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 1.155
-score FROM_MISSP_EH_MATCH 0.523
-score FROM_MISSP_FREEMAIL 0.001 # force non-zero
+score FROM_MISSP_DYNIP 2.204
+score FROM_MISSP_EH_MATCH 0.838
+score FROM_MISSP_FREEMAIL 0.001
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_PHISH 0.776
+score FROM_MISSP_PHISH 2.761
score FROM_MISSP_REPLYTO 0.001
-score FROM_MISSP_SPF_FAIL 1.187
+score FROM_MISSP_SPF_FAIL 1.191
score FROM_MISSP_TO_UNDISC 0.001
score FROM_MISSP_USER 0.001
score FROM_MISSP_XPRIO 0.001
-score FROM_NAME_EQ_TO_G_DRIVE 0.253
-score FROM_NTLD_REPLY_FREEMAIL 0.745
+score FROM_NAME_EQ_TO_G_DRIVE 0.006
+score FROM_NTLD_REPLY_FREEMAIL 0.744
score FROM_PAYPAL_SPOOF 1.599
-score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_WORDY 2.499
-score FROM_WORDY_SHORT 1.801
-score FROM_WSP_TRAIL 2.699
-score FSL_BULK_SIG 0.211
+score FROM_SUSPICIOUS_NTLD 0.500
+score FROM_WORDY 2.054
+score FROM_WORDY_SHORT 1.194
+score FROM_WSP_TRAIL 2.799
+score FSL_BULK_SIG 0.201
score FSL_CTYPE_WIN1251 0.001
score FSL_HELO_FAKE 3.199
score FSL_NEW_HELO_USER 0.001
score FSL_THIS_IS_ADV 3.099
-score FUZZY_CLICK_HERE 2.380
-score FUZZY_UNSUBSCRIBE 2.599
+score FUZZY_CLICK_HERE 2.039
+score FUZZY_UNSUBSCRIBE 2.600
score GB_FORGED_MUA_POSTFIX 1.999
score GB_FREEMAIL_DISPTO 0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM 0.499
+score GB_FREEMAIL_DISPTO_NOTFREEM 0.500
score GB_GOOG_IMG_NOT_RCVD_GOOG 2.499
score GB_LINKED_IMG_NOT_RCVD_LINK 0.001
score HDRS_LCASE_IMGONLY 0.100
-score HDR_ORDER_FTSDMCXX_DIRECT 1.162
-score HDR_ORDER_FTSDMCXX_NORDNS 1.219
+score HDR_ORDER_FTSDMCXX_DIRECT 1.999
+score HDR_ORDER_FTSDMCXX_NORDNS 1.226
score HEADER_FROM_DIFFERENT_DOMAINS 0.249
score HELO_MISC_IP 0.001
score HELO_NO_DOMAIN 2.199
score HEXHASH_WORD 2.999
-score HK_LOTTO 1.000
+score HK_LOTTO 0.999
score HK_NAME_FM_MR_MRS 1.499
-score HK_NAME_FROM 1.000
+score HK_NAME_FROM 0.999
score HK_NAME_MR_MRS 0.999
-score HK_RANDOM_FROM 0.999
-score HK_RANDOM_REPLYTO 0.999
-score HK_RCVD_IP_MULTICAST 0.682
+score HK_RANDOM_FROM 1.000
+score HK_RANDOM_REPLYTO 0.712
+score HK_RCVD_IP_MULTICAST 0.001
score HK_SCAM 1.627
-score HOSTED_IMG_DIRECT_MX 0.854
-score HTML_ENTITY_ASCII 0.001
+score HOSTED_IMG_DIRECT_MX 3.338
+score HTML_ENTITY_ASCII 2.999
score HTML_OFF_PAGE 2.999
-score HTML_SHRT_CMNT_OBFU_MANY 2.499
-score HTML_SINGLET_MANY 1.255
-score HTML_TEXT_INVISIBLE_STYLE 1.415
+score HTML_SHRT_CMNT_OBFU_MANY 2.500
+score HTML_SINGLET_MANY 1.609
+score HTML_TEXT_INVISIBLE_STYLE 1.417
score IMG_ALT_HSPACE_CID_ALIGN 2.499
score IMG_ONLY_FM_DOM_INFO 2.499
-score KB_FORGED_MOZ4 0.001
+score KB_FORGED_MOZ4 0.001 # force non-zero
score LIST_PARTIAL_SHORT_MSG 2.499
-score LONG_HEX_URI 2.307
-score LONG_IMG_URI 0.467
+score LONG_HEX_URI 2.321
+score LONG_IMG_URI 0.461
score LOTS_OF_MONEY 0.010
-score LUCRATIVE 2.000
-score MALFORMED_FREEMAIL 1.163
-score MALF_HTML_B64 1.873
-score MANY_SPAN_IN_TEXT 2.509
-score MILLION_HUNDRED 2.736
-score MILLION_USD 1.811
+score LUCRATIVE 1.999
+score MALFORMED_FREEMAIL 1.139
+score MALF_HTML_B64 3.472
+score MANY_SPAN_IN_TEXT 2.538
+score MILLION_HUNDRED 2.523
+score MILLION_USD 1.999
score MIMEOLE_DIRECT_TO_MX 1.999
-score MONEY_ATM_CARD 2.309
+score MONEY_ATM_CARD 1.023
score MONEY_FORM 0.001
score MONEY_FORM_SHORT 2.499
-score MONEY_FRAUD_3 0.494
-score MONEY_FRAUD_5 0.911
+score MONEY_FRAUD_3 0.497
+score MONEY_FRAUD_5 1.286
score MONEY_FRAUD_8 3.099
-score MONEY_FROM_41 1.999
+score MONEY_FROM_41 2.000
score MONEY_FROM_MISSP 1.999
-score MSM_PRIO_REPTO 1.443
+score MSM_PRIO_REPTO 1.514
score NORDNS_LOW_CONTRAST 0.222
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
score NSL_RCVD_HELO_USER 2.799
-score NUMBERONLY_BITCOIN_EXP 1.000
+score NUMBERONLY_BITCOIN_EXP 0.999
score OBFU_BITCOIN 2.999
-score OBFU_TEXT_ATTACH 1.424
+score OBFU_TEXT_ATTACH 0.451
score PDS_DBL_URL_LINKBAIT 2.499
-score PDS_DBL_URL_TNB_RUNON 1.328
-score PDS_HP_HELO_NORDNS 0.914
-score PDS_NO_HELO_DNS 1.327
+score PDS_DBL_URL_TNB_RUNON 1.355
+score PDS_HP_HELO_NORDNS 0.947
+score PDS_NO_HELO_DNS 1.294
score PDS_PHP_EVAL 1.499
-score PDS_TO_EQ_FROM_NAME 0.316
-score PDS_URI_HIDDEN_HELO_NO_DOMAIN 1.421
+score PDS_TO_EQ_FROM_NAME 0.406
+score PDS_URI_HIDDEN_HELO_NO_DOMAIN 1.426
score PDS_X_PHP_WP_EXP 1.499
-score PHOTO_EDITING_DIRECT 2.117
-score PHP_ORIG_SCRIPT 2.500
-score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RATWARE_NO_RDNS 0.098
+score PHOTO_EDITING_DIRECT 1.879
+score PHP_ORIG_SCRIPT 2.499
+score PP_MIME_FAKE_ASCII_TEXT 1.000
+score RATWARE_NO_RDNS 0.908
score RCVD_IN_MSPIKE_H2 -0.001
-score RDNS_NUM_TLD_ATCHNX 0.382
-score RDNS_NUM_TLD_XM 2.476
-score SEO_SUSP_NTLD 1.199
-score SERGIO_SUBJECT_PORN014 1.783
-score SERGIO_SUBJECT_VIAGRA01 2.090
-score SHORTENER_SHORT_IMG 2.186
+score RDNS_NUM_TLD_ATCHNX 1.212
+score RDNS_NUM_TLD_XM 2.999
+score SEO_SUSP_NTLD 1.200
+score SERGIO_SUBJECT_PORN014 2.516
+score SERGIO_SUBJECT_VIAGRA01 1.911
+score SHORTENER_SHORT_IMG 2.351
score SHORT_BODY_G_DRIVE_DYN 1.499
-score SHORT_IMG_SUSP_NTLD 1.403
-score SINGLETS_LOW_CONTRAST 2.339
+score SHORT_IMG_SUSP_NTLD 1.276
+score SINGLETS_LOW_CONTRAST 1.964
score SPOOFED_FREEMAIL_NO_RDNS 1.499
-score SPOOFED_FREEM_REPTO 2.251
+score SPOOFED_FREEM_REPTO 2.216
score STATIC_XPRIO_OLE 0.001
score STOCK_LOW_CONTRAST 0.001
-score TEQF_USR_POLITE 0.757
-score THIS_AD 0.050
-score THIS_IS_ADV_SUSP_NTLD 1.175
-score TO_EQ_FM_DIRECT_MX 1.526
-score TO_EQ_FM_DOM_SPF_FAIL 0.001
-score TO_EQ_FM_SPF_FAIL 0.584
+score TEQF_USR_POLITE 0.764
+score THIS_AD 0.045
+score THIS_IS_ADV_SUSP_NTLD 0.158
+score TO_EQ_FM_DIRECT_MX 1.527
+score TO_EQ_FM_DOM_SPF_FAIL 0.067
+score TO_EQ_FM_SPF_FAIL 0.547
score TO_IN_SUBJ 0.100
score TO_NAME_SUBJ_NO_RDNS 0.001
score TO_NO_BRKTS_DYNIP 2.999
-score TO_NO_BRKTS_FROM_MSSP 2.198
+score TO_NO_BRKTS_FROM_MSSP 1.887
score TO_NO_BRKTS_HTML_IMG 1.999
score TO_NO_BRKTS_HTML_ONLY 1.999
score TO_NO_BRKTS_MSFT 2.499
-score TO_NO_BRKTS_NORDNS_HTML 1.974
-score TVD_IP_HEX 2.667
-score TVD_IP_SING_HEX 0.176
-score TVD_SPACE_ENCODED 1.005
-score TVD_SPACE_RATIO_MINFP 2.500
+score TO_NO_BRKTS_NORDNS_HTML 1.999
+score TVD_IP_HEX 1.231
+score TVD_IP_SING_HEX 1.208
+score TVD_SPACE_ENCODED 0.778
+score TVD_SPACE_RATIO_MINFP 2.499
score TVD_SUBJ_APPR_LOAN 2.699
score UNICODE_OBFU_ASC 2.499
-score UNICODE_OBFU_ZW 2.150
-score URI_BUFFLY 1.662
+score UNICODE_OBFU_ZW 0.243
+score URI_BUFFLY 1.303
score URI_GOOGLE_PROXY 1.699
-score URI_HEX_IP 1.906
+score URI_HEX_IP 1.200
score URI_ONLY_MSGID_MALF 1.999
score URI_PHISH 3.999
score URI_PHP_REDIR 2.617
@@ -200,11 +200,11 @@
score URI_WPADMIN 2.399
score URI_WP_DIRINDEX 3.499
score URI_WP_HACKED 1.913
-score URI_WP_HACKED_2 2.499
-score XPRIO 0.490
-score XPRIO_SHORT_SUBJ 0.942
-score YOU_INHERIT 0.215
-score ZW_OBFU_BITCOIN 2.043
+score URI_WP_HACKED_2 2.500
+score XPRIO 0.491
+score XPRIO_SHORT_SUBJ 0.858
+score YOU_INHERIT 0.026
+score ZW_OBFU_BITCOIN 0.070
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
score AC_SPAMMY_URI_PATTERNS11 1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index bce5213..b7eb897 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -1,5 +1,5 @@
-# Using score set 0 logs for revision 1862680 from:
-# ham-axb-coi-bulk.r1862680.log ham-axb-generic.r1862680.log ham-axb-ham-misc.r1862680.log ham-darxus.r1862680.log ham-ena-week0.r1862680.log ham-ena-week1.r1862680.log ham-ena-week2.r1862680.log ham-ena-week3.r1862680.log ham-ena-week4.r1862680.log ham-giovanni-ham.r1862680.log ham-giovanni-spammy.r1862680.log ham-giovanni-spam.r1862680.log ham-grenier.r1862680.log ham-hege.r1862680.log ham-jarif.r1862680.log ham-jbrooks.r1862680.log ham-llanga.r1862680.log ham-mmiroslaw-mails-ham.r1862680.log ham-mmiroslaw-mails-spam.r1862680.log ham-npiazzi.r1862680.log ham-pds.r1862680.log ham-sihde.r1862680.log ham-spamsponge.r1862680.log ham-thendrikx.r1862680.log spam-axb-coi-bulk.r1862680.log spam-axb-generic.r1862680.log spam-axb-ham-misc.r1862680.log spam-darxus.r1862680.log spam-ena-week0.r1862680.log spam-ena-week1.r1862680.log spam-ena-week2.r1862680.log spam-ena-week3.r1862680.log spam-ena-week4.r1862680.log spam-giovanni-ham.r1862680.log spam-giovanni-spammy.r1862680.log spam-giovanni-spam.r1862680.log spam-grenier.r1862680.log spam-hege.r1862680.log spam-jarif.r1862680.log spam-jbrooks.r1862680.log spam-llanga.r1862680.log spam-mmiroslaw-mails-ham.r1862680.log spam-mmiroslaw-mails-spam.r1862680.log spam-npiazzi.r1862680.log spam-pds.r1862680.log spam-sihde.r1862680.log spam-spamsponge.r1862680.log spam-thendrikx.r1862680.log
+# Using score set 0 logs for revision 1862723 from:
+# ham-axb-coi-bulk.r1862723.log ham-axb-generic.r1862723.log ham-axb-ham-misc.r1862723.log ham-darxus.r1862723.log ham-ena-week0.r1862723.log ham-ena-week1.r1862723.log ham-ena-week2.r1862723.log ham-ena-week3.r1862723.log ham-ena-week4.r1862723.log ham-giovanni-ham.r1862723.log ham-giovanni-spammy.r1862723.log ham-giovanni-spam.r1862723.log ham-grenier.r1862723.log ham-hege.r1862723.log ham-jarif.r1862723.log ham-jbrooks.r1862723.log ham-llanga.r1862723.log ham-mmiroslaw-mails-ham.r1862723.log ham-mmiroslaw-mails-spam.r1862723.log ham-npiazzi.r1862723.log ham-pds.r1862723.log ham-sihde.r1862723.log ham-spamsponge.r1862723.log ham-thendrikx.r1862723.log spam-axb-coi-bulk.r1862723.log spam-axb-generic.r1862723.log spam-axb-ham-misc.r1862723.log spam-darxus.r1862723.log spam-ena-week0.r1862723.log spam-ena-week1.r1862723.log spam-ena-week2.r1862723.log spam-ena-week3.r1862723.log spam-ena-week4.r1862723.log spam-giovanni-ham.r1862723.log spam-giovanni-spammy.r1862723.log spam-giovanni-spam.r1862723.log spam-grenier.r1862723.log spam-hege.r1862723.log spam-jarif.r1862723.log spam-jbrooks.r1862723.log spam-llanga.r1862723.log spam-mmiroslaw-mails-ham.r1862723.log spam-mmiroslaw-mails-spam.r1862723.log spam-npiazzi.r1862723.log spam-pds.r1862723.log spam-sihde.r1862723.log spam-spamsponge.r1862723.log spam-thendrikx.r1862723.log
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001
@@ -7,200 +7,200 @@
score AC_HTML_NONSENSE_TAGS 1.999
score ADVANCE_FEE_2_NEW_MONEY 1.999
score ADVANCE_FEE_3_NEW 2.552
-score ADVANCE_FEE_3_NEW_MONEY 2.518
-score ADVANCE_FEE_4_NEW 2.700
-score ADVANCE_FEE_4_NEW_FRM_MNY 1.196
-score ADVANCE_FEE_4_NEW_MONEY 3.099
-score ADVANCE_FEE_5_NEW 0.250
+score ADVANCE_FEE_3_NEW_MONEY 2.642
+score ADVANCE_FEE_4_NEW 2.699
+score ADVANCE_FEE_4_NEW_FRM_MNY 1.263
+score ADVANCE_FEE_4_NEW_MONEY 2.999
+score ADVANCE_FEE_5_NEW 1.048
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_5_NEW_MONEY 0.476
+score ADVANCE_FEE_5_NEW_MONEY 0.644
score AD_PREFS 0.499
-score AMAZON_IMG_NOT_RCVD_AMZN 2.199
-score ANY_PILL_PRICE 0.310
-score AXB_XMAILER_MIMEOLE_OL_024C2 0.154
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.239
-score BIGNUM_EMAILS 2.385
-score BITCOIN_DEADLINE 2.985
-score BITCOIN_EXTORT_01 4.999
+score AMAZON_IMG_NOT_RCVD_AMZN 2.345
+score ANY_PILL_PRICE 0.426
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.265
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.816
+score BIGNUM_EMAILS 1.487
+score BITCOIN_DEADLINE 2.652
+score BITCOIN_EXTORT_01 3.502
score BITCOIN_MALWARE 3.499
-score BITCOIN_PAY_ME 2.999
-score BITCOIN_SPAM_01 1.916
+score BITCOIN_PAY_ME 3.000
+score BITCOIN_SPAM_01 0.001
score BITCOIN_SPAM_02 2.499
score BITCOIN_SPAM_03 2.499
-score BITCOIN_SPAM_05 2.358
-score BITCOIN_SPAM_06 1.038
+score BITCOIN_SPAM_05 2.217
+score BITCOIN_SPAM_06 1.426
score BITCOIN_SPAM_07 3.499
score BITCOIN_SPAM_08 2.499
-score BITCOIN_SPAM_09 1.054
-score BITCOIN_SPAM_11 2.322
-score BODY_EMPTY 1.999
-score BODY_SINGLE_URI 0.918
-score BODY_SINGLE_WORD 2.499
+score BITCOIN_SPAM_09 1.499
+score BITCOIN_SPAM_11 2.138
+score BODY_EMPTY 2.000
+score BODY_SINGLE_URI 0.991
+score BODY_SINGLE_WORD 2.409
score BODY_URI_ONLY 0.999
-score BOGUS_MSM_HDRS 2.059
-score CANT_SEE_AD 0.970
+score BOGUS_MSM_HDRS 1.477
+score CANT_SEE_AD 1.072
score CK_HELO_DYNAMIC_SPLIT_IP 1.499
-score CK_HELO_GENERIC 0.249
+score CK_HELO_GENERIC 0.250
score COMPENSATION 1.499
score DATE_IN_FUTURE_96_Q 2.799
score DEAR_BENEFICIARY 3.099
-score DRUGS_ERECTILE_SHORT_SHORTNER 1.184
+score DRUGS_ERECTILE_SHORT_SHORTNER 0.856
score DX_TEXT_03 0.899
score FAKE_REPLY_A1 3.099
-score FILL_THIS_FORM 0.411
-score FORM_FRAUD 1.000
-score FORM_FRAUD_3 2.379
-score FORM_FRAUD_5 1.302
+score FILL_THIS_FORM 0.418
+score FORM_FRAUD 0.999
+score FORM_FRAUD_3 2.252
+score FORM_FRAUD_5 1.845
score FOUND_YOU 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.158
-score FROMSPACE 2.740
+score FREEMAIL_FORGED_FROMDOMAIN 0.197
+score FROMSPACE 2.552
score FROM_2_EMAILS_SHORT 1.999
score FROM_ADDR_WS 2.999
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 1.378
-score FROM_MISSP_EH_MATCH 0.103
-score FROM_MISSP_FREEMAIL 0.549
-score FROM_MISSP_MSFT 0.001 # force non-zero
+score FROM_MISSP_DYNIP 0.001
+score FROM_MISSP_EH_MATCH 1.090
+score FROM_MISSP_FREEMAIL 0.547
+score FROM_MISSP_MSFT 0.001
score FROM_MISSP_PHISH 3.499
-score FROM_MISSP_REPLYTO 0.001
-score FROM_MISSP_TO_UNDISC 0.001 # force non-zero
+score FROM_MISSP_REPLYTO 0.001 # force non-zero
+score FROM_MISSP_TO_UNDISC 0.001
score FROM_MISSP_USER 0.001
score FROM_MISSP_XPRIO 0.001
-score FROM_NAME_EQ_TO_G_DRIVE 1.499
+score FROM_NAME_EQ_TO_G_DRIVE 1.055
score FROM_NTLD_REPLY_FREEMAIL 1.999
-score FROM_SUSPICIOUS_NTLD 0.500
-score FROM_WORDY 1.186
-score FROM_WORDY_SHORT 2.057
-score FROM_WSP_TRAIL 2.051
-score FSL_CTYPE_WIN1251 0.345
-score FSL_HELO_FAKE 3.799
+score FROM_SUSPICIOUS_NTLD 0.499
+score FROM_WORDY 0.001
+score FROM_WORDY_SHORT 2.489
+score FROM_WSP_TRAIL 2.551
+score FSL_CTYPE_WIN1251 0.235
+score FSL_HELO_FAKE 3.899
score FSL_NEW_HELO_USER 0.001
score FSL_THIS_IS_ADV 3.099
score FUZZY_CLICK_HERE 2.799
score FUZZY_UNSUBSCRIBE 2.599
score GB_FORGED_MUA_POSTFIX 1.999
-score GB_FREEMAIL_DISPTO 0.500
+score GB_FREEMAIL_DISPTO 0.499
score GB_FREEMAIL_DISPTO_NOTFREEM 0.500
-score GB_GOOGLE_OBFU 0.749
+score GB_GOOGLE_OBFU 0.750
score GB_GOOG_IMG_NOT_RCVD_GOOG 2.499
score GB_LINKED_IMG_NOT_RCVD_LINK 2.500
score GOOG_REDIR_HTML_ONLY 1.999
-score GOOG_REDIR_NORDNS 1.912
-score HDRS_LCASE_IMGONLY 0.099
+score GOOG_REDIR_NORDNS 1.191
+score HDRS_LCASE_IMGONLY 0.100
score HDR_ORDER_FTSDMCXX_DIRECT 1.999
-score HDR_ORDER_FTSDMCXX_NORDNS 0.353
+score HDR_ORDER_FTSDMCXX_NORDNS 0.351
score HEADER_FROM_DIFFERENT_DOMAINS 0.250
-score HELO_MISC_IP 0.249
-score HELO_NO_DOMAIN 1.929
-score HEXHASH_WORD 2.601
-score HK_LOTTO 1.000
-score HK_NAME_FM_MR_MRS 0.984
-score HK_NAME_FROM 0.999
-score HK_NAME_MR_MRS 1.000
-score HK_RANDOM_FROM 0.999
-score HK_RANDOM_REPLYTO 0.999
-score HK_RCVD_IP_MULTICAST 0.336
+score HELO_MISC_IP 0.250
+score HELO_NO_DOMAIN 1.925
+score HEXHASH_WORD 2.600
+score HK_LOTTO 0.999
+score HK_NAME_FM_MR_MRS 1.150
+score HK_NAME_FROM 1.000
+score HK_NAME_MR_MRS 0.999
+score HK_RANDOM_FROM 1.000
+score HK_RANDOM_REPLYTO 1.000
+score HK_RCVD_IP_MULTICAST 0.331
score HK_SCAM 1.999
score HOSTED_IMG_DIRECT_MX 3.499
-score HTML_ENTITY_ASCII 2.651
+score HTML_ENTITY_ASCII 2.900
score HTML_OFF_PAGE 2.999
-score HTML_SHRT_CMNT_OBFU_MANY 1.415
-score HTML_SINGLET_MANY 1.788
-score HTML_TEXT_INVISIBLE_STYLE 0.087
-score IMG_ALT_HSPACE_CID_ALIGN 0.855
-score IMG_ONLY_FM_DOM_INFO 2.341
-score KB_FORGED_MOZ4 3.599
-score LIST_PARTIAL_SHORT_MSG 2.499
+score HTML_SHRT_CMNT_OBFU_MANY 1.164
+score HTML_SINGLET_MANY 1.876
+score HTML_TEXT_INVISIBLE_STYLE 0.001
+score IMG_ALT_HSPACE_CID_ALIGN 1.106
+score IMG_ONLY_FM_DOM_INFO 2.340
+score KB_FORGED_MOZ4 3.699
+score LIST_PARTIAL_SHORT_MSG 2.500
score LIST_PRTL_SAME_USER 0.001
-score LONG_HEX_URI 2.598
-score LONG_IMG_URI 1.271
+score LONG_HEX_URI 2.596
+score LONG_IMG_URI 1.274
score LOTS_OF_MONEY 0.010
-score LUCRATIVE 0.706
-score MALFORMED_FREEMAIL 0.694
-score MALF_HTML_B64 2.228
+score LUCRATIVE 0.712
+score MALFORMED_FREEMAIL 0.654
+score MALF_HTML_B64 0.506
score MANY_SPAN_IN_TEXT 2.499
-score MILLION_HUNDRED 0.722
-score MILLION_USD 1.135
+score MILLION_HUNDRED 0.001
+score MILLION_USD 1.125
score MIMEOLE_DIRECT_TO_MX 1.999
score MIME_NO_TEXT 1.999
-score MIXED_ES 2.599
-score MONEY_ATM_CARD 1.293
+score MIXED_ES 2.699
+score MONEY_ATM_CARD 1.561
score MONEY_FORM 0.001
score MONEY_FORM_SHORT 2.499
score MONEY_FRAUD_3 2.699
-score MONEY_FRAUD_5 1.370
+score MONEY_FRAUD_5 1.245
score MONEY_FRAUD_8 3.299
-score MONEY_FROM_41 2.000
+score MONEY_FROM_41 1.999
score MONEY_FROM_MISSP 1.999
-score MSM_PRIO_REPTO 0.001
-score NORDNS_LOW_CONTRAST 1.786
-score NO_FM_NAME_IP_HOSTN 2.351
+score MSM_PRIO_REPTO 1.367
+score NORDNS_LOW_CONTRAST 1.787
+score NO_FM_NAME_IP_HOSTN 2.350
score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 2.597
+score NSL_RCVD_HELO_USER 3.099
score NUMBERONLY_BITCOIN_EXP 0.001
score OBFU_BITCOIN 2.999
-score OFFER_ONLY_AMERICA 1.999
-score PDS_DBL_URL_LINKBAIT 2.352
+score OFFER_ONLY_AMERICA 2.000
+score PDS_DBL_URL_LINKBAIT 2.499
score PDS_DBL_URL_TNB_RUNON 1.999
-score PDS_HIDDEN_UK_BUSINESSLOAN 1.139
+score PDS_HIDDEN_UK_BUSINESSLOAN 1.999
score PDS_PHP_EVAL 1.499
-score PDS_TO_EQ_FROM_NAME 0.441
-score PDS_URI_HIDDEN_HELO_NO_DOMAIN 0.210
-score PDS_X_PHP_WP_EXP 1.500
+score PDS_TO_EQ_FROM_NAME 0.118
+score PDS_URI_HIDDEN_HELO_NO_DOMAIN 1.726
+score PDS_X_PHP_WP_EXP 1.499
score PHOTO_EDITING_DIRECT 2.999
score PHP_ORIG_SCRIPT 2.499
-score PP_MIME_FAKE_ASCII_TEXT 1.000
-score RATWARE_NO_RDNS 2.997
-score RDNS_NUM_TLD_ATCHNX 2.053
+score PP_MIME_FAKE_ASCII_TEXT 0.999
+score RATWARE_NO_RDNS 2.979
+score RDNS_NUM_TLD_ATCHNX 2.191
score RDNS_NUM_TLD_XM 2.999
-score RISK_FREE 2.600
+score RISK_FREE 2.699
score SEO_SUSP_NTLD 1.199
-score SERGIO_SUBJECT_PORN014 2.510
-score SERGIO_SUBJECT_VIAGRA01 0.001 # force non-zero
-score SHORTENER_SHORT_IMG 1.150
-score SHORT_BODY_G_DRIVE_DYN 0.618
-score SHORT_IMG_SUSP_NTLD 1.499
-score SINGLETS_LOW_CONTRAST 0.001
+score SERGIO_SUBJECT_PORN014 2.501
+score SERGIO_SUBJECT_VIAGRA01 0.300
+score SHORTENER_SHORT_IMG 1.154
+score SHORT_BODY_G_DRIVE_DYN 1.307
+score SHORT_IMG_SUSP_NTLD 0.805
+score SINGLETS_LOW_CONTRAST 0.001 # force non-zero
score SPOOFED_FREEMAIL_NO_RDNS 1.499
score SPOOFED_FREEM_REPTO 2.499
-score STATIC_XPRIO_OLE 0.999
-score STOCK_LOW_CONTRAST 1.682
-score TEQF_USR_POLITE 0.051
-score THIS_AD 1.800
-score THIS_IS_ADV_SUSP_NTLD 1.499
-score TO_EQ_FM_DIRECT_MX 0.803
-score TO_IN_SUBJ 0.100
-score TO_NAME_SUBJ_NO_RDNS 0.096
-score TO_NO_BRKTS_DYNIP 1.917
-score TO_NO_BRKTS_FROM_MSSP 2.499
+score STATIC_XPRIO_OLE 1.999
+score STOCK_LOW_CONTRAST 1.234
+score TEQF_USR_POLITE 0.998
+score THIS_AD 1.900
+score THIS_IS_ADV_SUSP_NTLD 1.477
+score TO_EQ_FM_DIRECT_MX 0.061
+score TO_IN_SUBJ 0.099
+score TO_NAME_SUBJ_NO_RDNS 2.022
+score TO_NO_BRKTS_DYNIP 2.249
+score TO_NO_BRKTS_FROM_MSSP 2.352
score TO_NO_BRKTS_HTML_IMG 0.641
score TO_NO_BRKTS_HTML_ONLY 1.999
score TO_NO_BRKTS_MSFT 2.499
-score TO_NO_BRKTS_NORDNS_HTML 2.000
+score TO_NO_BRKTS_NORDNS_HTML 1.999
score TO_NO_BRKTS_PCNT 2.499
-score TVD_IP_HEX 2.899
-score TVD_IP_SING_HEX 0.678
-score TVD_SPACE_ENCODED 2.415
-score TVD_SPACE_RATIO_MINFP 2.500
-score TVD_SUBJ_APPR_LOAN 1.784
-score TVD_SUBJ_NUM_OBFU_MINFP 2.709
+score TVD_IP_HEX 2.275
+score TVD_IP_SING_HEX 1.319
+score TVD_SPACE_ENCODED 2.485
+score TVD_SPACE_RATIO_MINFP 2.499
+score TVD_SUBJ_APPR_LOAN 1.676
+score TVD_SUBJ_NUM_OBFU_MINFP 3.099
score UNICODE_OBFU_ASC 2.499
-score UNICODE_OBFU_ZW 1.186
-score URI_BUFFLY 0.593
-score URI_GOOGLE_PROXY 1.700
-score URI_HEX_IP 1.588
+score UNICODE_OBFU_ZW 3.499
+score URI_BUFFLY 0.010
+score URI_GOOGLE_PROXY 1.699
+score URI_HEX_IP 0.554
score URI_ONLY_MSGID_MALF 1.999
score URI_PHISH 3.999
-score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 0.419
+score URI_PHP_REDIR 3.500
+score URI_TRY_3LD 0.210
score URI_WPADMIN 2.499
score URI_WP_DIRINDEX 3.499
score URI_WP_HACKED 3.499
-score URI_WP_HACKED_2 2.499
+score URI_WP_HACKED_2 2.500
score XPRIO 2.249
score XPRIO_SHORT_SUBJ 2.499
-score YOU_INHERIT 2.454
-score ZW_OBFU_BITCOIN 2.330
+score YOU_INHERIT 1.348
+score ZW_OBFU_BITCOIN 1.018
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
score AC_SPAMMY_URI_PATTERNS11 1.000
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index 0da53f2..75c547a 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -3,196 +3,196 @@
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001
-score AC_FROM_MANY_DOTS 1.759
-score AC_HTML_NONSENSE_TAGS 1.523
-score ADVANCE_FEE_2_NEW_MONEY 0.287
+score AC_FROM_MANY_DOTS 2.207
+score AC_HTML_NONSENSE_TAGS 1.525
+score ADVANCE_FEE_2_NEW_MONEY 0.285
score ADVANCE_FEE_3_NEW 3.465
-score ADVANCE_FEE_3_NEW_MONEY 1.236
-score ADVANCE_FEE_4_NEW 2.499
-score ADVANCE_FEE_4_NEW_FRM_MNY 0.358
+score ADVANCE_FEE_3_NEW_MONEY 0.860
+score ADVANCE_FEE_4_NEW 2.600
+score ADVANCE_FEE_4_NEW_FRM_MNY 2.248
score ADVANCE_FEE_4_NEW_MONEY 2.599
score ADVANCE_FEE_5_NEW 0.001
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_5_NEW_MONEY 1.190
-score AD_PREFS 0.433
-score AMAZON_IMG_NOT_RCVD_AMZN 1.680
+score ADVANCE_FEE_5_NEW_MONEY 1.215
+score AD_PREFS 0.499
+score AMAZON_IMG_NOT_RCVD_AMZN 1.681
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.404
-score BIGNUM_EMAILS 2.732
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.503
+score BIGNUM_EMAILS 2.680
score BITCOIN_DEADLINE 2.999
score BITCOIN_EXTORT_01 4.996
score BITCOIN_MALWARE 3.499
score BITCOIN_PAY_ME 2.999
-score BITCOIN_SPAM_01 0.001
+score BITCOIN_SPAM_01 0.001 # force non-zero
score BITCOIN_SPAM_02 2.499
-score BITCOIN_SPAM_03 2.439
+score BITCOIN_SPAM_03 2.499
score BITCOIN_SPAM_05 2.499
-score BITCOIN_SPAM_06 0.316
-score BITCOIN_SPAM_07 3.382
+score BITCOIN_SPAM_06 0.978
+score BITCOIN_SPAM_07 3.386
score BITCOIN_SPAM_08 2.499
-score BITCOIN_SPAM_09 1.088
-score BITCOIN_SPAM_11 2.409
-score BODY_SINGLE_URI 1.297
-score BODY_SINGLE_WORD 0.001 # force non-zero
-score BODY_URI_ONLY 1.000
-score BOGUS_MSM_HDRS 1.754
-score CANT_SEE_AD 0.078
+score BITCOIN_SPAM_09 1.138
+score BITCOIN_SPAM_11 1.142
+score BODY_SINGLE_URI 1.298
+score BODY_SINGLE_WORD 0.001
+score BODY_URI_ONLY 0.999
+score BOGUS_MSM_HDRS 2.587
+score CANT_SEE_AD 1.022
score CK_HELO_DYNAMIC_SPLIT_IP 0.001
-score CK_HELO_GENERIC 0.001
-score DATE_IN_FUTURE_96_Q 1.392
-score DEAR_BENEFICIARY 1.628
-score DKIMWL_BL 2.799
+score CK_HELO_GENERIC 0.001 # force non-zero
+score DATE_IN_FUTURE_96_Q 0.388
+score DEAR_BENEFICIARY 2.120
+score DKIMWL_BL 2.999
score DKIMWL_WL_HIGH -0.001
score DKIMWL_WL_MED -0.001
-score DKIMWL_WL_MEDHI -0.001
-score DRUGS_ERECTILE_SHORT_SHORTNER 0.469
+score DKIMWL_WL_MEDHI -0.001 # force non-zero
+score DRUGS_ERECTILE_SHORT_SHORTNER 0.001
score DX_TEXT_03 0.899
score FAKE_REPLY_A1 3.199
score FILL_THIS_FORM 0.001
score FORM_FRAUD 0.999
-score FORM_FRAUD_3 0.320
-score FORM_FRAUD_5 2.899
+score FORM_FRAUD_3 0.643
+score FORM_FRAUD_5 2.839
score FOUND_YOU 0.001
-score FREEMAIL_FORGED_FROMDOMAIN 0.229
-score FROMSPACE 0.204
-score FROM_2_EMAILS_SHORT 0.651
-score FROM_ADDR_WS 2.095
+score FREEMAIL_FORGED_FROMDOMAIN 0.250
+score FROMSPACE 0.214
+score FROM_2_EMAILS_SHORT 0.810
+score FROM_ADDR_WS 1.998
score FROM_FMBLA_NEWDOM 1.499
-score FROM_FMBLA_NEWDOM14 1.000
-score FROM_FMBLA_NEWDOM28 0.799
+score FROM_FMBLA_NEWDOM14 0.999
+score FROM_FMBLA_NEWDOM28 0.800
score FROM_GOV_DKIM_AU -0.001
-score FROM_IN_TO_AND_SUBJ 2.128
+score FROM_IN_TO_AND_SUBJ 0.503
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 1.155
-score FROM_MISSP_EH_MATCH 0.523
-score FROM_MISSP_FREEMAIL 0.001 # force non-zero
+score FROM_MISSP_DYNIP 2.204
+score FROM_MISSP_EH_MATCH 0.838
+score FROM_MISSP_FREEMAIL 0.001
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_PHISH 0.776
+score FROM_MISSP_PHISH 2.761
score FROM_MISSP_REPLYTO 0.001
-score FROM_MISSP_SPF_FAIL 1.187
+score FROM_MISSP_SPF_FAIL 1.191
score FROM_MISSP_TO_UNDISC 0.001
score FROM_MISSP_USER 0.001
score FROM_MISSP_XPRIO 0.001
-score FROM_NAME_EQ_TO_G_DRIVE 0.253
-score FROM_NTLD_REPLY_FREEMAIL 0.745
+score FROM_NAME_EQ_TO_G_DRIVE 0.006
+score FROM_NTLD_REPLY_FREEMAIL 0.744
score FROM_PAYPAL_SPOOF 1.599
-score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_WORDY 2.499
-score FROM_WORDY_SHORT 1.801
-score FROM_WSP_TRAIL 2.699
-score FSL_BULK_SIG 0.211
+score FROM_SUSPICIOUS_NTLD 0.500
+score FROM_WORDY 2.054
+score FROM_WORDY_SHORT 1.194
+score FROM_WSP_TRAIL 2.799
+score FSL_BULK_SIG 0.201
score FSL_CTYPE_WIN1251 0.001
score FSL_HELO_FAKE 3.199
score FSL_NEW_HELO_USER 0.001
score FSL_THIS_IS_ADV 3.099
-score FUZZY_CLICK_HERE 2.380
-score FUZZY_UNSUBSCRIBE 2.599
+score FUZZY_CLICK_HERE 2.039
+score FUZZY_UNSUBSCRIBE 2.600
score GB_FORGED_MUA_POSTFIX 1.999
score GB_FREEMAIL_DISPTO 0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM 0.499
+score GB_FREEMAIL_DISPTO_NOTFREEM 0.500
score GB_GOOG_IMG_NOT_RCVD_GOOG 2.499
score GB_LINKED_IMG_NOT_RCVD_LINK 0.001
score HDRS_LCASE_IMGONLY 0.100
-score HDR_ORDER_FTSDMCXX_DIRECT 1.162
-score HDR_ORDER_FTSDMCXX_NORDNS 1.219
+score HDR_ORDER_FTSDMCXX_DIRECT 1.999
+score HDR_ORDER_FTSDMCXX_NORDNS 1.226
score HEADER_FROM_DIFFERENT_DOMAINS 0.249
score HELO_MISC_IP 0.001
score HELO_NO_DOMAIN 2.199
score HEXHASH_WORD 2.999
-score HK_LOTTO 1.000
+score HK_LOTTO 0.999
score HK_NAME_FM_MR_MRS 1.499
-score HK_NAME_FROM 1.000
+score HK_NAME_FROM 0.999
score HK_NAME_MR_MRS 0.999
-score HK_RANDOM_FROM 0.999
-score HK_RANDOM_REPLYTO 0.999
-score HK_RCVD_IP_MULTICAST 0.682
+score HK_RANDOM_FROM 1.000
+score HK_RANDOM_REPLYTO 0.712
+score HK_RCVD_IP_MULTICAST 0.001
score HK_SCAM 1.627
-score HOSTED_IMG_DIRECT_MX 0.854
-score HTML_ENTITY_ASCII 0.001
+score HOSTED_IMG_DIRECT_MX 3.338
+score HTML_ENTITY_ASCII 2.999
score HTML_OFF_PAGE 2.999
-score HTML_SHRT_CMNT_OBFU_MANY 2.499
-score HTML_SINGLET_MANY 1.255
-score HTML_TEXT_INVISIBLE_STYLE 1.415
+score HTML_SHRT_CMNT_OBFU_MANY 2.500
+score HTML_SINGLET_MANY 1.609
+score HTML_TEXT_INVISIBLE_STYLE 1.417
score IMG_ALT_HSPACE_CID_ALIGN 2.499
score IMG_ONLY_FM_DOM_INFO 2.499
-score KB_FORGED_MOZ4 0.001
+score KB_FORGED_MOZ4 0.001 # force non-zero
score LIST_PARTIAL_SHORT_MSG 2.499
-score LONG_HEX_URI 2.307
-score LONG_IMG_URI 0.467
+score LONG_HEX_URI 2.321
+score LONG_IMG_URI 0.461
score LOTS_OF_MONEY 0.010
-score LUCRATIVE 2.000
-score MALFORMED_FREEMAIL 1.163
-score MALF_HTML_B64 1.873
-score MANY_SPAN_IN_TEXT 2.509
-score MILLION_HUNDRED 2.736
-score MILLION_USD 1.811
+score LUCRATIVE 1.999
+score MALFORMED_FREEMAIL 1.139
+score MALF_HTML_B64 3.472
+score MANY_SPAN_IN_TEXT 2.538
+score MILLION_HUNDRED 2.523
+score MILLION_USD 1.999
score MIMEOLE_DIRECT_TO_MX 1.999
-score MONEY_ATM_CARD 2.309
+score MONEY_ATM_CARD 1.023
score MONEY_FORM 0.001
score MONEY_FORM_SHORT 2.499
-score MONEY_FRAUD_3 0.494
-score MONEY_FRAUD_5 0.911
+score MONEY_FRAUD_3 0.497
+score MONEY_FRAUD_5 1.286
score MONEY_FRAUD_8 3.099
-score MONEY_FROM_41 1.999
+score MONEY_FROM_41 2.000
score MONEY_FROM_MISSP 1.999
-score MSM_PRIO_REPTO 1.443
+score MSM_PRIO_REPTO 1.514
score NORDNS_LOW_CONTRAST 0.222
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
score NSL_RCVD_HELO_USER 2.799
-score NUMBERONLY_BITCOIN_EXP 1.000
+score NUMBERONLY_BITCOIN_EXP 0.999
score OBFU_BITCOIN 2.999
-score OBFU_TEXT_ATTACH 1.424
+score OBFU_TEXT_ATTACH 0.451
score PDS_DBL_URL_LINKBAIT 2.499
-score PDS_DBL_URL_TNB_RUNON 1.328
-score PDS_HP_HELO_NORDNS 0.914
-score PDS_NO_HELO_DNS 1.327
+score PDS_DBL_URL_TNB_RUNON 1.355
+score PDS_HP_HELO_NORDNS 0.947
+score PDS_NO_HELO_DNS 1.294
score PDS_PHP_EVAL 1.499
-score PDS_TO_EQ_FROM_NAME 0.316
-score PDS_URI_HIDDEN_HELO_NO_DOMAIN 1.421
+score PDS_TO_EQ_FROM_NAME 0.406
+score PDS_URI_HIDDEN_HELO_NO_DOMAIN 1.426
score PDS_X_PHP_WP_EXP 1.499
-score PHOTO_EDITING_DIRECT 2.117
-score PHP_ORIG_SCRIPT 2.500
-score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RATWARE_NO_RDNS 0.098
+score PHOTO_EDITING_DIRECT 1.879
+score PHP_ORIG_SCRIPT 2.499
+score PP_MIME_FAKE_ASCII_TEXT 1.000
+score RATWARE_NO_RDNS 0.908
score RCVD_IN_MSPIKE_H2 -0.001
-score RDNS_NUM_TLD_ATCHNX 0.382
-score RDNS_NUM_TLD_XM 2.476
-score SEO_SUSP_NTLD 1.199
-score SERGIO_SUBJECT_PORN014 1.783
-score SERGIO_SUBJECT_VIAGRA01 2.090
-score SHORTENER_SHORT_IMG 2.186
+score RDNS_NUM_TLD_ATCHNX 1.212
+score RDNS_NUM_TLD_XM 2.999
+score SEO_SUSP_NTLD 1.200
+score SERGIO_SUBJECT_PORN014 2.516
+score SERGIO_SUBJECT_VIAGRA01 1.911
+score SHORTENER_SHORT_IMG 2.351
score SHORT_BODY_G_DRIVE_DYN 1.499
-score SHORT_IMG_SUSP_NTLD 1.403
-score SINGLETS_LOW_CONTRAST 2.339
+score SHORT_IMG_SUSP_NTLD 1.276
+score SINGLETS_LOW_CONTRAST 1.964
score SPOOFED_FREEMAIL_NO_RDNS 1.499
-score SPOOFED_FREEM_REPTO 2.251
+score SPOOFED_FREEM_REPTO 2.216
score STATIC_XPRIO_OLE 0.001
score STOCK_LOW_CONTRAST 0.001
-score TEQF_USR_POLITE 0.757
-score THIS_AD 0.050
-score THIS_IS_ADV_SUSP_NTLD 1.175
-score TO_EQ_FM_DIRECT_MX 1.526
-score TO_EQ_FM_DOM_SPF_FAIL 0.001
-score TO_EQ_FM_SPF_FAIL 0.584
+score TEQF_USR_POLITE 0.764
+score THIS_AD 0.045
+score THIS_IS_ADV_SUSP_NTLD 0.158
+score TO_EQ_FM_DIRECT_MX 1.527
+score TO_EQ_FM_DOM_SPF_FAIL 0.067
+score TO_EQ_FM_SPF_FAIL 0.547
score TO_IN_SUBJ 0.100
score TO_NAME_SUBJ_NO_RDNS 0.001
score TO_NO_BRKTS_DYNIP 2.999
-score TO_NO_BRKTS_FROM_MSSP 2.198
+score TO_NO_BRKTS_FROM_MSSP 1.887
score TO_NO_BRKTS_HTML_IMG 1.999
score TO_NO_BRKTS_HTML_ONLY 1.999
score TO_NO_BRKTS_MSFT 2.499
-score TO_NO_BRKTS_NORDNS_HTML 1.974
-score TVD_IP_HEX 2.667
-score TVD_IP_SING_HEX 0.176
-score TVD_SPACE_ENCODED 1.005
-score TVD_SPACE_RATIO_MINFP 2.500
+score TO_NO_BRKTS_NORDNS_HTML 1.999
+score TVD_IP_HEX 1.231
+score TVD_IP_SING_HEX 1.208
+score TVD_SPACE_ENCODED 0.778
+score TVD_SPACE_RATIO_MINFP 2.499
score TVD_SUBJ_APPR_LOAN 2.699
score UNICODE_OBFU_ASC 2.499
-score UNICODE_OBFU_ZW 2.150
-score URI_BUFFLY 1.662
+score UNICODE_OBFU_ZW 0.243
+score URI_BUFFLY 1.303
score URI_GOOGLE_PROXY 1.699
-score URI_HEX_IP 1.906
+score URI_HEX_IP 1.200
score URI_ONLY_MSGID_MALF 1.999
score URI_PHISH 3.999
score URI_PHP_REDIR 2.617
@@ -200,11 +200,11 @@
score URI_WPADMIN 2.399
score URI_WP_DIRINDEX 3.499
score URI_WP_HACKED 1.913
-score URI_WP_HACKED_2 2.499
-score XPRIO 0.490
-score XPRIO_SHORT_SUBJ 0.942
-score YOU_INHERIT 0.215
-score ZW_OBFU_BITCOIN 2.043
+score URI_WP_HACKED_2 2.500
+score XPRIO 0.491
+score XPRIO_SHORT_SUBJ 0.858
+score YOU_INHERIT 0.026
+score ZW_OBFU_BITCOIN 0.070
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
score AC_SPAMMY_URI_PATTERNS11 1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index 0c9df83..76402b7 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: 430266 38.730% (99.472% of non-spam corpus)
-# Correctly spam: 534527 48.114% (78.792% of spam corpus)
-# False positives: 2283 0.206% (0.528% of nonspam, 105603 weighted)
-# False negatives: 143872 12.950% (21.208% of spam, 310540 weighted)
-# Average score for spam: 10.6 nonspam: 0.7
-# Average for false-pos: 5.9 false-neg: 2.2
-# TOTAL: 1110948 100.00%
+# Correctly non-spam: 432165 38.854% (99.470% of non-spam corpus)
+# Correctly spam: 535289 48.125% (78.972% of spam corpus)
+# False positives: 2302 0.207% (0.530% of nonspam, 105154 weighted)
+# False negatives: 142534 12.814% (21.028% of spam, 299977 weighted)
+# Average score for spam: 10.4 nonspam: 0.7
+# Average for false-pos: 5.9 false-neg: 2.1
+# TOTAL: 1112290 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 53614 99.45%
-# Correctly spam: 66923 79.08%
-# False positives: 296 0.55%
-# False negatives: 17707 20.92%
-# TCR(l=50): 2.603439 SpamRecall: 79.077% SpamPrec: 99.560%
+# Correctly non-spam: 53856 99.45%
+# Correctly spam: 66883 79.11%
+# False positives: 299 0.55%
+# False negatives: 17666 20.89%
+# TCR(l=50): 2.592255 SpamRecall: 79.106% SpamPrec: 99.555%
##### 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: 417547 96.53%
-# Correctly spam: 317171 46.75%
-# False positives: 15002 3.47%
-# False negatives: 361228 53.25%
-# TCR(l=50): 0.610440 SpamRecall: 46.753% SpamPrec: 95.484%
+# Correctly non-spam: 419407 96.53%
+# Correctly spam: 314997 46.47%
+# False positives: 15060 3.47%
+# False negatives: 362826 53.53%
+# TCR(l=50): 0.607463 SpamRecall: 46.472% SpamPrec: 95.437%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 52111 96.66%
-# Correctly spam: 39536 46.72%
-# False positives: 1799 3.34%
-# False negatives: 45094 53.28%
-# TCR(l=50): 0.626685 SpamRecall: 46.716% SpamPrec: 95.648%
+# Correctly non-spam: 52360 96.69%
+# Correctly spam: 39391 46.59%
+# False positives: 1795 3.31%
+# False negatives: 45158 53.41%
+# TCR(l=50): 0.626716 SpamRecall: 46.590% SpamPrec: 95.642%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index 87595bc..c1b8b47 100644
--- a/rulesrc/scores/stats-set1
+++ b/rulesrc/scores/stats-set1
@@ -1,23 +1,23 @@
##### WITH NEW RULES AND SCORES #####
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 390703 48.100% (99.858% of non-spam corpus)
-# Correctly spam: 388933 47.882% (92.380% of spam corpus)
-# False positives: 556 0.068% (0.142% of nonspam, 52997 weighted)
-# False negatives: 32081 3.950% (7.620% of spam, 73182 weighted)
-# Average score for spam: 16.7 nonspam: -2.0
-# Average for false-pos: 8.9 false-neg: 2.3
-# TOTAL: 812273 100.00%
+# Correctly non-spam: 390717 48.104% (99.861% of non-spam corpus)
+# Correctly spam: 388937 47.885% (92.391% of spam corpus)
+# False positives: 542 0.067% (0.139% of nonspam, 52245 weighted)
+# False negatives: 32031 3.944% (7.609% of spam, 73135 weighted)
+# Average score for spam: 17.0 nonspam: -2.0
+# Average for false-pos: 9.0 false-neg: 2.3
+# TOTAL: 812227 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
# Correctly non-spam: 48720 99.86%
-# Correctly spam: 48419 92.31%
+# Correctly spam: 48500 92.48%
# False positives: 70 0.14%
-# False negatives: 4032 7.69%
-# TCR(l=50): 6.963755 SpamRecall: 92.313% SpamPrec: 99.856%
+# False negatives: 3944 7.52%
+# TCR(l=50): 7.045137 SpamRecall: 92.480% SpamPrec: 99.856%
##### WITHOUT NEW RULES AND SCORES #####
Reading scores from "../rules-base"...
@@ -25,16 +25,16 @@
# SUMMARY for threshold 5.0:
# Correctly non-spam: 389484 99.55%
-# Correctly spam: 332325 78.93%
+# Correctly spam: 332435 78.97%
# False positives: 1775 0.45%
-# False negatives: 88689 21.07%
-# TCR(l=50): 2.372725 SpamRecall: 78.934% SpamPrec: 99.469%
+# False negatives: 88533 21.03%
+# TCR(l=50): 2.374554 SpamRecall: 78.969% SpamPrec: 99.469%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
# Correctly non-spam: 48542 99.49%
-# Correctly spam: 41419 78.97%
+# Correctly spam: 41245 78.65%
# False positives: 248 0.51%
-# False negatives: 11032 21.03%
-# TCR(l=50): 2.238435 SpamRecall: 78.967% SpamPrec: 99.405%
+# False negatives: 11199 21.35%
+# TCR(l=50): 2.222298 SpamRecall: 78.646% SpamPrec: 99.402%