More IMAP hacking