Reworked email client