Some more mailscanner fixes