#18 prepared to unify fromCommon and fromXmpp