Add Jabber messaging and tidy file