New style mail template
Stopped email highlight