Jabber fixes backport
v0_74-branch
2003-11-25, Ethan Blanton