Message model UID fix