More message fiddling.