Tweak the message so it doesn't need to be read twice.