Compare messages by id instead of reference
Merge branch 'hotfix/compare-messages-by-id'