LOC-307
Changed the way messages are merged to match the logic in Pages.