Merge change I319bf9ee into eclair-mr2

* changes:
  Make vCard exporter check invalid phone numbers and re-format them if needed.