Think we've solved the HTML escaping issue, and plain text