Added support to the email sending API