@peterp is planning to put messages in a different content block so we don't have to duplicate this everywhere.