Merge change 20978 into eclair-dev

* changes:
  Fix Null pointer for exchange contacts IM