E-Mail option merge

Describe your problem

Currently options to configure the email service are in two places in the admin interface (workflow configuration modal and e-mail section).

Describe the solution you'd like

Merge these the options into the e-mail admin interface section.