Have the message-entity-owner logic handle 3 more cases