Fix issue for message CRUD