improve PEEK logic in IMAP