#18 unify fromCommon and fromXmpp to fromCommon