fixing smtp and imap commands