spamassassin: Steve's patch