Improve SIP friends support (should address bugs #1063 & #1052)