Bug 998621 - Clean up some XMPP code, fix spacing, r=florian.
Bug 998621 - Clean up some XMPP code, fix usage of Components, r=florian.