Email Format changes