Email related changes

Email related changes