Add ability to specify ESMTP options and envelope FROM address