Added email sending support