Added support for custom recipient email address