fix messages with new adapter format