diff --git a/ChangeLog b/ChangeLog
index e79ac7f67..6a4912073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* OpenChange/MAPIStoreCalendarMessage.m: reordered certain private
 	methods.
+	(-ownerTimeZone): moved into MAPIStoreObject.
 
 	* OpenChange/MAPIStoreMailMessage.m (-_setupBodyData): new
 	centralized method that performs the common operations required to
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index 258172b0a..91cb1d263 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -38,7 +38,6 @@
 #import <NGCards/iCalTimeZone.h>
 #import <NGCards/iCalPerson.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <Appointments/SOGoAppointmentObject.h>
 
 #import "MAPIStoreCalendarAttachment.h"
@@ -84,21 +83,6 @@ static NSTimeZone *utcTZ;
   return self;
 }
 
-- (NSTimeZone *) ownerTimeZone
-{
-  NSString *owner;
-  SOGoUserDefaults *ud;
-  NSTimeZone *tz;
-  WOContext *woContext;
-
-  woContext = [[self context] woContext];
-  owner = [sogoObject ownerInContext: woContext];
-  ud = [[SOGoUser userWithLogin: owner] userDefaults];
-  tz = [ud timeZone];
-
-  return tz;
-}
-
 /* getters */
 - (int) getPrIconIndex: (void **) data // TODO
               inMemCtx: (TALLOC_CTX *) memCtx
diff --git a/OpenChange/MAPIStoreObject.h b/OpenChange/MAPIStoreObject.h
index 00fcb7d13..e8055fde3 100644
--- a/OpenChange/MAPIStoreObject.h
+++ b/OpenChange/MAPIStoreObject.h
@@ -77,6 +77,8 @@
 - (uint64_t) objectId;
 - (NSString *) url;
 
+- (NSTimeZone *) ownerTimeZone;
+
 /* properties */
 
 - (void) addNewProperties: (NSDictionary *) newNewProperties;
diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m
index da4179912..4263509e8 100644
--- a/OpenChange/MAPIStoreObject.m
+++ b/OpenChange/MAPIStoreObject.m
@@ -23,6 +23,8 @@
 #import <Foundation/NSDictionary.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <SOGo/SOGoObject.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
 
 #import "MAPIStoreContext.h"
 #import "MAPIStoreFolder.h"
@@ -207,6 +209,21 @@ static Class NSExceptionK, MAPIStoreFolderK;
                     containerURL, [self nameInContainer]];
 }
 
+- (NSTimeZone *) ownerTimeZone
+{
+  NSString *owner;
+  SOGoUserDefaults *ud;
+  NSTimeZone *tz;
+  WOContext *woContext;
+
+  woContext = [[self context] woContext];
+  owner = [sogoObject ownerInContext: woContext];
+  ud = [[SOGoUser userWithLogin: owner] userDefaults];
+  tz = [ud timeZone];
+
+  return tz;
+}
+
 - (void) addNewProperties: (NSDictionary *) newNewProperties
 {
   [newProperties addEntriesFromDictionary: newNewProperties];