IMAP google code issue 1707: fixed patch