[feature] untest xmessage change!