XMPP configuration from #663 vanished

... please pull in again.
Merge pull request #1135 from itheiss/master

XMPP configuration from #663 vanished