diff --git a/ChangeLog b/ChangeLog
index 2d3aa24aa..48da56814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder -setTimeZone:newTZ]): new method to
+	configure the timezone from SOGoUserFolder when the instance is
+	being created.
+	([SOGoAppointmentFolder -viewTimeZone]): MET was removed. Returns
+	the value of the new "timezone" ivar.
+
 2006-08-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/WebServerResources/SchedulerUI.{css,js}: added a tabview with
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.h b/SoObjects/Appointments/SOGoAppointmentFolder.h
index 853ef0dc1..1af117732 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.h
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.h
@@ -41,9 +41,12 @@
 @class NSString, NSArray, NSCalendarDate, NSException, NSMutableDictionary;
 @class GCSFolder;
 
+@class NSTimeZone;
+
 @interface SOGoAppointmentFolder : SOGoFolder
 {
   NSMutableDictionary *uidToFilename;
+  NSTimeZone *timeZone;
 }
 
 /* selection */
@@ -96,6 +99,9 @@
 
 - (NSArray *)fetchAllSOGoAppointments;
 
+- (void) setTimeZone: (NSTimeZone *) newTZ;
+- (NSTimeZone *) viewTimeZone;
+
 @end
 
 #endif /* __Appointments_SOGoAppointmentFolder_H__ */
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 19deeb3e5..48e0ce5cd 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -38,7 +38,6 @@
 @implementation SOGoAppointmentFolder
 
 static NGLogger   *logger    = nil;
-static NSTimeZone *MET       = nil;
 static NSNumber   *sharedYes = nil;
 
 + (int) version
@@ -61,7 +60,6 @@ static NSNumber   *sharedYes = nil;
   lm      = [NGLoggerManager defaultLoggerManager];
   logger  = [lm loggerForDefaultKey:@"SOGoAppointmentFolderDebugEnabled"];
 
-  MET       = [[NSTimeZone timeZoneWithAbbreviation:@"MET"] retain];
   sharedYes = [[NSNumber numberWithBool:YES] retain];
 }
 
@@ -71,6 +69,17 @@ static NSNumber   *sharedYes = nil;
   [super dealloc];
 }
 
+/* timezone */
+
+- (void) setTimeZone: (NSTimeZone *) newTZ
+{
+  timeZone = newTZ;
+}
+
+- (NSTimeZone *) viewTimeZone
+{
+  return timeZone;
+}
 
 /* logging */
 
@@ -134,14 +143,6 @@ static NSNumber   *sharedYes = nil;
   return [NSException exceptionWithHTTPStatus:404 /* Not Found */];
 }
 
-/* timezone */
-
-- (NSTimeZone *) viewTimeZone
-{
-  // TODO: should use a cookie for configuration? we default to MET
-  return MET;
-}
-
 /* vevent UID handling */
 
 - (NSString *) resourceNameForEventUID: (NSString *)_u