fix for html in text messages
quick fix nl2br
Merge branch 'develop' into minorUpdates