Tidy up message sensitisation a bit more, and add sensitisation of