New-style emails

There is quite a bit of duplicated markup here, e.g. the markup here and from line 118 is the same. I'm also not a fan of the amount of conditionals in this view. Elsewhere in the app we've used presenters to avoid this.