Make messages a little more logical in their HTML structure