email: Minor tidy up following IMAP changes