Plugin SpamAssassin: small fixes and changes