diff --git a/ChangeLog b/ChangeLog
index d5e0e74d9..15b9d7677 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-27  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoFreeBusyObject.m ([SOGoFreeBusyObject
+	-fetchFreeBusyInfosFrom:_startDateto:_endDate]): specify context
+	when looking up the Calendar folder.
+
 2007-11-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/UIxTaskEditor.m ([UIxTaskEditor -todo]): same as below.
diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m
index 80390a733..4aa053f35 100644
--- a/SoObjects/Appointments/SOGoFreeBusyObject.m
+++ b/SoObjects/Appointments/SOGoFreeBusyObject.m
@@ -80,8 +80,8 @@
 //   SoSecurityManager *sm;
   NSArray *infos;
 
-  calFolder = [[container lookupName: @"Calendar" inContext: nil acquire: NO]
-		lookupName: @"personal" inContext: nil acquire: NO];
+  calFolder = [[container lookupName: @"Calendar" inContext: context acquire: NO]
+		lookupName: @"personal" inContext: context acquire: NO];
 //   sm = [SoSecurityManager sharedSecurityManager];
 //   if (![sm validatePermission: SOGoPerm_FreeBusyLookup
 //            onObject: calFolder
diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m
index 8134af2c0..c5f56913e 100644
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@@ -95,8 +95,7 @@ static NSString *defaultModule = nil;
   NSNumber *status;
   NSCalendarDate *currentDate;
   
-  record = [records nextObject];
-  while (record)
+  while ((record = [records nextObject]))
     {
       status = [record objectForKey: @"c_status"];
  
@@ -117,8 +116,6 @@ static NSString *defaultModule = nil;
 
       for (count = startInterval; count < endInterval; count++)
         [items replaceObjectAtIndex: count withObject: status];
-
-      record = [records nextObject];
     }
 }