Cleanup imapclient stuff; combine batch handler
Update "imap.fetch"