Merge "Messaging: Refactor msg body count feature."