temp fix for message history