Adding environmental email address support