bug 3038, 3118 - groupchat fixes

Signed-off-by: phoenix_nz <robinm@paradise.net.nz>