Merge change 9668 into eclair-dev

* changes:
  Single line phone/sms view list item.