Merge "Update message layout"