Some old changes
merge
Some settings regarding the jabber.el