Removed removal of the mail client