diff --git a/ChangeLog b/ChangeLog
index 4db25ca89..1ceca075b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoUserFolder.m: initialize max to the correct value.
+
 2009-03-18  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/MainUI/SOGoRootPage.m ([SOGoRootPage -version]): new method
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index 94ce19c9b..4f4600ea6 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -125,6 +125,7 @@ static NSString *LDAPContactInfoAttribute = nil;
 
   filter = [NSMutableDictionary dictionaryWithCapacity: 2];
   children = [parentNode getElementsByTagName: @"prop-match"];
+  max = [children count];
   for (count = 0; count < max; count++)
     {
       node = [children objectAtIndex: count];