#680493 keep all References in messages