refactor due to core restruction of MessageModel (Message)
refactor due to core restruction of MessageModel (Message)