diff --git a/ChangeLog b/ChangeLog
index 1e50d1c34..3e9dd8443 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder -_privacySqlString]): the string for the
+	"freebusy" special user should only require opaque elements.
+
 2007-04-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 693bef228..3ca862f15 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -728,15 +728,17 @@ static NSNumber   *sharedYes = nil;
 
 - (NSString *) _privacySqlString
 {
-  NSString *privacySqlString, *owner, *currentUser, *email;
+  NSString *privacySqlString, *owner, *login, *email;
   SOGoUser *activeUser;
 
   activeUser = [context activeUser];
-  currentUser = [activeUser login];
+  login = [activeUser login];
   owner = [self ownerInContext: context];
 
-  if ([currentUser isEqualToString: owner])
+  if ([login isEqualToString: owner])
     privacySqlString = @"";
+  else if ([login isEqualToString: @"freebusy"])
+    privacySqlString = @"and (isopaque = 1)";
   else
     {
       email = [activeUser email];
@@ -746,7 +748,7 @@ static NSNumber   *sharedYes = nil;
                       @"(%@(orgmail = '%@')"
                       @" or ((partmails caseInsensitiveLike '%@%%'"
                       @" or partmails caseInsensitiveLike '%%\\n%@%%')))",
-		    [self _privacyClassificationStringsForUID: currentUser],
+		    [self _privacyClassificationStringsForUID: login],
 		    email, email, email];
     }
 
@@ -941,11 +943,9 @@ static NSNumber   *sharedYes = nil;
 {
   Class objectClass;
   unsigned int count, max;
-  NSString *currentId, *currentUser;
+  NSString *currentId;
   id deleteObject;
 
-  currentUser = [[context activeUser] login];
-
   max = [ids count];
   for (count = 0; count < max; count++)
     {