Datastore bugfix for messaging

I feel so stupid. :)