Merge change Ia961aa60 into eclair

* changes:
  Contacts: fixed custom label handling in GenericEditorView.