Changed mail back to client