Revert "Messages fix & compare objects instead of ID's"

This reverts commit 899bf9eeb2e2a9b92988ff2c2c5d1a68942fe00a.