Corrected IMAP handlings