fix adapter for messages