Rationalised message handling