Merged Feb7 changes with master.
Changed raw message handling, removing special formatting code from messageformatter.