Merge change I82be558f into eclair

* changes:
  Fix vCard composer in three points.