Merge change 26137 into eclair

* changes:
  Contacts: Fixed to choose correct item in list, counting header in.