diff --git a/ChangeLog b/ChangeLog
index 1fa470919..838d0abbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-06-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder -folderIsMandatory]): returns YES since
+	users must have one Calendar folder (one and only one).
+
 	* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder -ocsFolder]): new
 	method that create the folder if considered mandatory.
 	([SOGoFolder -folderIsMandatory]): new method that determines
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 66d5c14cc..6f098b7b5 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -111,6 +111,11 @@ static NSNumber   *sharedYes = nil;
   return logger;
 }
 
+- (BOOL) folderIsMandatory
+{
+  return YES;
+}
+
 /* selection */
 
 - (NSArray *) calendarUIDs 
@@ -745,12 +750,12 @@ static NSNumber   *sharedYes = nil;
       privacySqlString
         = [NSString stringWithFormat:
                       @"(%@(orgmail = '%@')"
-                      @" or ((partmails caseInsensitiveLike '%@%%'"
-                      @" or partmails caseInsensitiveLike '%%\\n%@%%')))",
+		    @" or ((partmails caseInsensitiveLike '%@%%'"
+		    @" or partmails caseInsensitiveLike '%%\n%@%%')))",
 		    [self _privacyClassificationStringsForUID: login],
 		    email, email, email];
     }
-
+  
   return privacySqlString;
 }