Refactors email client Modal