SpamAssassin plugin fixes