diff --git a/ChangeLog b/ChangeLog
index 24e07bf26..1329affee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-06-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject -date]):
+	applies the user timezone to the date object before returning it.
+
 	* UI/Common/UIxSortButton.m: removed useless class module.
 
 	* UI/Common/UIxSortableTableHeader.m: removed useless class
diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index bfa226d59..6f7d6ad7a 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -20,6 +20,7 @@
 */
 
 #import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
@@ -251,12 +252,24 @@ static BOOL debugSoParts       = NO;
 - (NGImap4Envelope *)envelope {
   return [[self fetchCoreInfos] valueForKey:@"envelope"];
 }
-- (NSString *)subject {
+
+- (NSString *) subject
+{
   return [[self envelope] subject];
 }
-- (NSCalendarDate *)date {
-  return [[self envelope] date];
+
+- (NSCalendarDate *) date
+{
+  NSTimeZone *userTZ;
+  NSCalendarDate *date;
+
+  userTZ = [[context activeUser] timeZone];
+  date = [[self envelope] date];
+  [date setTimeZone: userTZ];
+
+  return date;
 }
+
 - (NSArray *)fromEnvelopeAddresses {
   return [[self envelope] from];
 }