Merge change I6f9a7185 into eclair

* changes:
  Fix the number off by one when typing in the contact list.