RAZ-3325 : Clean up email dialog
Merge branch 'develop' into release/1.7

* develop:
  RAZ-3325 : Clean up email dialog