Fix incorrect message property leaking through the UI