Re: Patch for imap.inc: Fixes #1483977 and #1483886