Adjusted line breaks to text

Adjusted line breaks for text and not HTML
Merge branch 'tb-contacthtmlfix' into staging