Comparing #BuddyPress 1.7 (left) messages with 1.6, it soooo needed cleaning up: