Needs review - Issue 212 fix motd message escaping