Merge pull request #861 from MrPetovan/task/unsupport-xmpp