diff --git a/ChangeLog b/ChangeLog
index a8dfd905f..7695bcefc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-02-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreContactsMessageTable.m
+	(-sortIdentifierForProperty:): implemented basic table for
+	supporting the sorting implied by the use of the addressbook label
+	buttons.
+
 	* OpenChange/MAPIStoreTasksMessageTable.m
 	(-sortIdentifierForProperty:): implemented basic table for
 	supporting common header sorts from the OL interface.
diff --git a/OpenChange/MAPIStoreContactsMessageTable.m b/OpenChange/MAPIStoreContactsMessageTable.m
index c1acf600d..5fc7205c4 100644
--- a/OpenChange/MAPIStoreContactsMessageTable.m
+++ b/OpenChange/MAPIStoreContactsMessageTable.m
@@ -566,6 +566,8 @@
 			  forKey: MAPIPropertyKey (PidLidEmail3EmailAddress)];
       [knownProperties setObject: @"c_cn"
 			  forKey: MAPIPropertyKey (PR_DISPLAY_NAME_UNICODE)];
+      [knownProperties setObject: @"c_cn"
+			  forKey: MAPIPropertyKey (PidLidFileUnder)];
     }
 
   return [knownProperties objectForKey: MAPIPropertyKey (property)];
@@ -604,4 +606,20 @@
   return rc;
 }
 
+/* sorting */
+
+- (NSString *) sortIdentifierForProperty: (enum MAPITAGS) property
+{
+  static NSMutableDictionary *knownProperties = nil;
+
+  if (!knownProperties)
+    {
+      knownProperties = [NSMutableDictionary new];
+      [knownProperties setObject: @"c_cn"
+                          forKey: MAPIPropertyKey (PidLidFileUnder)];
+    }
+
+  return [knownProperties objectForKey: MAPIPropertyKey (property)];
+}
+
 @end