bringing in most updated template from mail2

we’d had that weird editor issue
removing straggling </p>s and adding alt tags