improved language on smtp and imap