Added extra functionality to email