Update mail.html.tmpl for trunk