o Refactor imap fetch code for better defer handling. Closes: #3423