merge from cloudcoderdotorg
Fixed problem with IMAP authentication.
fixed problem with IMAP authentication