Email notification dialog changes. Closed #915