Removed some redundancies between imap and pop3