Fix these mailscanner files, too