Revert "Fix email replyTo and replyToName order, and email port in the mail driver."

This reverts commit 9cde3ca718c8990917e0746fcea6bffd1189afeb.