Move message formatting around to get at content parser
Version update