diff --git a/ChangeLog b/ChangeLog
index d879621d3..afff66d78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoParentFolder.m ([SOGoParentFolder
+	-subFolders]): returns a sorted array using the "compare:"
+	selector.
+
 2007-09-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/UIxCalendarSelector.m ([UIxCalendarSelector
diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m
index 6bdf0f783..37604a352 100644
--- a/SoObjects/SOGo/SOGoParentFolder.m
+++ b/SoObjects/SOGo/SOGoParentFolder.m
@@ -263,7 +263,8 @@
   if (!subFolders)
     [self initSubFolders];
 
-  return [subFolders allValues];
+  return [[subFolders allValues]
+	   sortedArrayUsingSelector: @selector (compare:)];
 }
 
 /* acls */