diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index 290f5d27c..c6ac91242 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.m
@@ -209,33 +209,78 @@ static NSArray *folderListingFields = nil;
   return qualifier;
 }
 
+/**
+ * Normalize keys of dictionary representing a contact.
+ * @param contactRecord a dictionary with pairs from the quick table
+ * @see [UIxContactView dataAction]
+ */
 - (void) fixupContactRecord: (NSMutableDictionary *) contactRecord
 {
   NSString *data;
 
-  data = [contactRecord objectForKey: @"c_cn"];
-  if (![data length])
-    {
-      data = [contactRecord keysWithFormat: @"%{c_givenname} %{c_sn}"];
-      if ([data length] > 1)
-        {
-          [contactRecord setObject: data forKey: @"c_cn"];
-        }
-      else
-        {
-          data = [contactRecord objectForKey: @"c_o"];
-          [contactRecord setObject: data forKey: @"c_cn"];          
-        }
-    }
+  // c_component => tag
+  data = [contactRecord objectForKey: @"c_component"];
+  if ([data length])
+    [contactRecord setObject: data forKey: @"tag"];
+  [contactRecord removeObjectForKey: @"c_component"];
 
-  if (![contactRecord objectForKey: @"c_mail"])
-    [contactRecord setObject: @"" forKey: @"c_mail"];
-  if (![contactRecord objectForKey: @"c_screenname"])
-    [contactRecord setObject: @"" forKey: @"c_screenname"];
-  if (![contactRecord objectForKey: @"c_o"])
-    [contactRecord setObject: @"" forKey: @"c_o"];
-  if (![contactRecord objectForKey: @"c_telephonenumber"])
-    [contactRecord setObject: @"" forKey: @"c_telephonenumber"];
+  // c_categories => categories
+  data = [contactRecord objectForKey: @"c_categories"];
+  if ([data length])
+    [contactRecord setObject: data forKey: @"categories"];
+  [contactRecord removeObjectForKey: @"c_categories"];
+
+  // c_name => id
+  data = [contactRecord objectForKey: @"c_name"];
+  if ([data length])
+    [contactRecord setObject: data forKey: @"id"];
+  [contactRecord removeObjectForKey: @"c_name"];
+
+  // c_cn => fn
+  data = [contactRecord objectForKey: @"c_cn"];
+  if ([data length])
+    [contactRecord setObject: data forKey: @"fn"];
+  [contactRecord removeObjectForKey: @"c_cn"];
+
+  // c_givenname => givenname
+  data = [contactRecord objectForKey: @"c_givenname"];
+  if ([data length])
+    [contactRecord setObject: data forKey: @"givenname"];
+  [contactRecord removeObjectForKey: @"c_givenname"];
+
+  // c_sn => sn
+  data = [contactRecord objectForKey: @"c_sn"];
+  if ([data length])
+    [contactRecord setObject: data forKey: @"sn"];
+  [contactRecord removeObjectForKey: @"c_sn"];
+
+  // c_screenname => X-AIM
+
+  // c_o => org
+  data = [contactRecord objectForKey: @"c_o"];
+  if ([data length])
+      [contactRecord setObject: data forKey: @"org"];
+  [contactRecord removeObjectForKey: @"c_o"];
+
+  // c_mail => emails[]
+  data = [contactRecord objectForKey: @"c_mail"];
+  if ([data length])
+    {
+      NSDictionary *email;
+      email = [NSDictionary dictionaryWithObjectsAndKeys: @"pref", @"type", data, @"value", nil];
+      [contactRecord setObject: [NSArray arrayWithObject: email] forKey: @"emails"];
+    }
+  [contactRecord removeObjectForKey: @"c_mail"];
+
+  // c_telephonenumber => phones
+  data = [contactRecord objectForKey: @"c_telephonenumber"];
+  if ([data length])
+    {
+      NSDictionary *phonenumber;
+      phonenumber = [NSDictionary dictionaryWithObjectsAndKeys: @"pref", @"type", data, @"value", nil];
+      [contactRecord setObject: [NSArray arrayWithObject: phonenumber] forKey: @"phones"];
+    }
+  [contactRecord removeObjectForKey: @"c_telephonenumber"];
 }
 
 - (NSArray *) _flattenedRecords: (NSArray *) records