Added support for Courier (pop3, imap)