RAZ-3325 : Clean up email dialog