Added more email functions