Progress on IMAP importer