IM fixes (compatible with server 1623+)