Mail refactor.