Use MessageDecorator for messages