Message body refactoring