A couple of changes to handle story text in email