We now store the endpoints explicitly as new messages are imported