diff --git a/ChangeLog b/ChangeLog
index 2f348ce12..7e1d24b41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoObject.m ([SOGoObject -userTimeZone]): retain
+	the timezone even when it's the server timezone.
+
 	* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder
 	-privateContacts:inContext:]): no long configure the calendar
 	object with the user's timezone since it's now accessible
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 1cde0f91d..ca9169e58 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -402,10 +402,9 @@ static NSTimeZone *serverTimeZone = nil;
       userPrefs = [[context activeUser] userDefaults];
       userTimeZone = [NSTimeZone
                        timeZoneWithName: [userPrefs stringForKey: @"timezonename"]];
-      if (userTimeZone)
-        [userTimeZone retain];
-      else
+      if (!userTimeZone)
         userTimeZone = [self serverTimeZone];
+      [userTimeZone retain];
     }
 
   return userTimeZone;