{org} email replacement consistent everywhere