Added back the emailing functionallity