More Jabber fine-tuning