bugfixes for the email importer