Feature/chat 2

This should include the message id (given that we test that X by Id is not allowed)