Revert "Email client again..."

This reverts commit e40e4e7a642dbf5a6b10b61526686393e2006fa2.