diff --git a/OpenChange/MAPIStoreDraftsMessage.m b/OpenChange/MAPIStoreDraftsMessage.m
index 8bd7cd6ff..aba42dac4 100644
--- a/OpenChange/MAPIStoreDraftsMessage.m
+++ b/OpenChange/MAPIStoreDraftsMessage.m
@@ -20,6 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -658,14 +659,14 @@ e)
 - (NSDate *) creationTime
 {
   return ([sogoObject isKindOfClass: SOGoDraftObjectK]
-          ? [newProperties objectForKey: MAPIPropertyKey (PR_CREATION_TIME)]
+          ? (NSDate *) [newProperties objectForKey: MAPIPropertyKey (PR_CREATION_TIME)]
           : [super creationTime]);
 }
 
 - (NSDate *) lastModificationTime
 {
   return ([sogoObject isKindOfClass: SOGoDraftObjectK]
-          ? [newProperties
+          ? (NSDate *) [newProperties
               objectForKey: MAPIPropertyKey (PR_LAST_MODIFICATION_TIME)]
           : [super lastModificationTime]);
 }
diff --git a/OpenChange/MAPIStoreObject.h b/OpenChange/MAPIStoreObject.h
index 9920b664e..d68023aae 100644
--- a/OpenChange/MAPIStoreObject.h
+++ b/OpenChange/MAPIStoreObject.h
@@ -27,7 +27,7 @@
 
 #import <Foundation/NSObject.h>
 
-@class NSCalendarDate;
+@class NSDate;
 @class NSData;
 @class NSString;
 @class NSMutableArray;