bit more polishing wrt email functionality