Convert some smtp.* params to email.*, and added some new email.* params.