Improvements to message layout.