mail: put imap and pop3 code to where it belongs