Bug 805501 - Support different username / password / credentials for SMTP server from IMAP server

(The first commit does NOT contain GELAM changes; the second commit does.)