General mark-up fixes to HTML emails