CLOUD-24: Email changes