Fixed up ViewMessage a little more