Index: spamassassin-trunk/rules/20_drugs.cf
===================================================================
--- spamassassin-trunk/rules/20_drugs.cf	(revision 799110)
+++ spamassassin-trunk/rules/20_drugs.cf	(working copy)
@@ -112,18 +112,18 @@
 body __DRUGS_ERECTILE_C	/\bCialis\b/i
 body __DRUGS_ERECTILE_L	/\bLevitra\b/i
 #  obfu/plain and mis-spelled Viagra variants
-body __DRUGS_ERECTILE1	/(?:\b|\s)[_\W]{0,3}(?:\\\/|V)[_\W]{0,3}[ij1!|l\xEC\xED\xEE\xEF][_\W]{0,3}[a40\xE0-\xE6@][_\W]{0,3}[xyz]?[gj][_\W]{0,3}r[_\W]{0,3}[a40\xE0-\xE6@][_\W]{0,3}x?[_\W]{0,3}(?:\b|\s)/i
+body __DRUGS_ERECTILE1  /(?:\b|\s)[_\W]{0,3}(?:\\\/|V)[_\W]{0,3}[ij1!|l\xEC\xED\xEE\xEF][_\W]{0,3}[a40\xE0-\xE6@][_\W]{0,3}[xyz]?[gj][_\W]{0,3}r[_\W]{0,3}[a40\xE0-\xE6@][_\W]{0,3}x?(?:\b|\s|_|(?<=viagra))/i
 body __DRUGS_ERECTILE2	/\bV(?:agira|igara|iaggra|iaegra)\b/i
 #  cialis variants (spelling correct now)
 # note: the rather strange pre-amble is to avoid FPs on french words containing high-ascii chars surrounding
 # "cialis".
-body __DRUGS_ERECTILE3 /(?:\A|[\s\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])[_\W]{0,3}C[_\W]{0,3}[ij1!|l\xEC\xED\xEE\xEF][_\W]{0,3}[a4\xE0-\xE6@][_\W]{0,3}l?[l!|1][_\W]{0,3}[i1!|l\xEC-\xEF][_\W]{0,3}s[_\W]{0,3}(?:\b|\s)/i
+body __DRUGS_ERECTILE3 /(?:\A|[\s\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])[_\W]{0,3}C[_\W]{0,3}[ij1!|l\xEC\xED\xEE\xEF][_\W]{0,3}[a4\xE0-\xE6@][_\W]{0,3}l?[l!|1][_\W]{0,3}[i1!|l\xEC-\xEF][_\W]{0,3}s(?-i:\b|\s|_|(?<=s)[A-Z]|(?<=S)[a-z])/i
 body __DRUGS_ERECTILE4	/\bC(?:alis|ilias|ilais)\b/i
 # generic names
 #sildenafil citrate
 body __DRUGS_ERECTILE5	/\b_{0,3}s[_\W]?[i1!|l\xEC-\xEF][_\W]?l[_\W]?d[_\W]?[e3\xE8-\xEB][_\W]?n[_\W]?[a4\xE0-\xE6@][_\W]?f[_\W]?[i1!|l\xEC-\xEF][_\W]?l c[_\W]?[i1!|l\xEC-\xEF][_\W]?t[_\W]?r[_\W]?[a4\xE0-\xE6@][_\W]?t[_\W]?[e3\xE8-\xEB]_{0,3}(?:\b|\s)/i
 #Levitra
-body __DRUGS_ERECTILE6	/\b_{0,3}L[_\W]?[e3\xE8-\xEB][_\W]?(?:\\\/|V)[_\W]?[i1!|l\xEC-\xEF][_\W]?t[_\W]?r[_\W]?[a4\xE0-\xE6@][_\W]?(?:\b|\s)/i
+body __DRUGS_ERECTILE6  /\b_{0,3}L[_\W]?[e3\xE8-\xEB][_\W]?(?:\\\/|V)[_\W]?[i1!|l\xEC-\xEF][_\W]?t[_\W]?r[_\W]?[a4\xE0-\xE6@][_\W]?(?-i:\b|\s|_|(?<=a)[A-Z]|(?=<A)[a-z])/i
 #tadalafil
 body __DRUGS_ERECTILE8 /\b_{0,3}T[_\W]?[a4\xE0-\xE6@][_\W]?d[_\W]?[a4\xE0-\xE6@][_\W]?l[_\W]?[a4\xE0-\xE6@][_\W]?f[_\W]?[i1!|l\xEC-\xEF][_\W]?l_{0,3}\b/i
 # gapped/obfu viagra variants using funky html-style character codes
Index: spamassassin-trunk/rules/25_replace.cf
===================================================================
--- spamassassin-trunk/rules/25_replace.cf	(revision 799110)
+++ spamassassin-trunk/rules/25_replace.cf	(working copy)
@@ -69,7 +69,7 @@
 # fuzzy header tests
 
 header SUBJECT_FUZZY_MEDS	Subject =~ /<M><E><D><S>/i
-describe SUBJECT_FUZZY_MEDS	Attempt to obfuscate words in Subject:
+describe SUBJECT_FUZZY_MEDS	Word 'meds', possibly obfuscated, in Subject:
 replace_rules SUBJECT_FUZZY_MEDS
 
 header __SUBJECT_FUZZY_VPILL	Subject =~ /<inter W2><post P3>(?!viagra)<V><I><A><G><R><A>/i