Plugin SpamAssassin: Some small fixes