Please open a bug in bugzilla at bugzilla.spamassassin.org and attach your patch there (using the "create a new attachment" link after the bug has been opened).
Two separate bugs might make more sense since there are two problems here. Thanks! -- Daniel Quinlan anti-spam (SpamAssassin), Linux, http://www.pathname.com/~quinlan/ and open source consulting
