Changes for imap library update