JIRA-1716 - Message text formatting fix

Contributing a patch for the issue reporter.