Single-quote issue

URI Escaped single-quotes before passing to message parser.