email functionality changes