#28 separate XDelay and Delay from XmppCommon module