Plugin SpamAssassin: small fixes and some changes