Fix bug where external content (e.g. mail body) was passed to templates parsing code (#6640)

It should have been part of "Fix so templating system does not mess with external (e.g. email)
content (#5499)" (d02e6ea45ea3), but it wasn't.