--- a/plugins/contacts/maemo5/qcontactmaemo5backend.cpp	Fri Sep 17 08:34:34 2010 +0300
+++ b/plugins/contacts/maemo5/qcontactmaemo5backend.cpp	Mon Oct 04 01:37:06 2010 +0300
@@ -295,6 +295,9 @@
     QContactDetailFieldDefinition gsfd; //Generic string field definition
     gsfd.setDataType(QVariant::String);
 
+    // XXX NOTE: only QContactPhoneNumber, QContactOnlineAccount,
+    // QContactEmailAddress and QContactAddress are currently non-unique.
+    
     // QContactAddress
     fields = defns[contactType][QContactAddress::DefinitionName].fields();
     fields.remove(QContactAddress::FieldSubTypes);
@@ -405,13 +408,9 @@
     defns[contactType][QContactPhoneNumber::DefinitionName].setFields(fields);
     defns[contactType][QContactPhoneNumber::DefinitionName].setUnique(false);
 
-    // QContactPresence
-    fields = defns[contactType][QContactPresence::DefinitionName].fields();
-    fields.remove(QContactPresence::FieldTimestamp);
-    fields.remove(QContactPresence::FieldPresenceState);
-    defns[contactType][QContactPresence::DefinitionName].setFields(fields);
-    defns[contactType][QContactPresence::DefinitionName].setUnique(false);
-    
+    // No QContactPresence
+    defns[contactType].remove(QContactPresence::DefinitionName);
+
     // No QContactRingtone
     defns[contactType].remove(QContactRingtone::DefinitionName);
     
@@ -425,7 +424,7 @@
     fields = defns[contactType][QContactTimestamp::DefinitionName].fields();
     fields.remove(QContactDetail::FieldContext);
     defns[contactType][QContactTimestamp::DefinitionName].setFields(fields);
-    
+
     // QContactType
     fields = defns[contactType][QContactType::DefinitionName].fields();
     fields.remove(QContactDetail::FieldContext);
@@ -621,7 +620,7 @@
      } break;
      default:
      {
-       // this engine currently does not support mutable definitions.
+       // symbian engine currently does not support mutable definitions.
      } break;