Add support for e-mail and e-mail deployments