email related changes

email related changes