diff --git a/ChangeLog b/ChangeLog
index b85807a10..9aa05fb7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Mailer/SOGoDraftObject.m: invoke the new
+	"rfc822DateString" category method on the date we put in the
+	header.
+
 2007-04-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Common/UIxUserRightsEditor.m ([UIxUserRightsEditor -defaultAction]) 
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 9f66bb9e7..8b9ad4c20 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -21,6 +21,7 @@
 
 #include "SOGoDraftObject.h"
 #include <SoObjects/SOGo/WOContext+Agenor.h>
+#include <SoObjects/SOGo/NSCalendarDate+SOGo.h>
 #include <NGMail/NGMimeMessage.h>
 #include <NGMail/NGMimeMessageGenerator.h>
 #include <NGMail/NGSendMail.h>
@@ -608,7 +609,7 @@ static NSString    *fromInternetSuffixPattern = nil;
   NGMutableHashMap *map;
   NSDictionary *lInfo; // TODO: this should be some kind of object?
   NSArray      *emails;
-  NSString     *s;
+  NSString     *s, *dateString;
   id           from, replyTo;
   
   if ((lInfo = [self fetchInfo]) == nil)
@@ -657,10 +658,11 @@ static NSString    *fromInternetSuffixPattern = nil;
     [map setObject: [s asQPSubjectString] forKey:@"subject"];
   
   /* add standard headers */
-  
-  [map addObject:[NSCalendarDate date] forKey:@"date"];
-  [map addObject:@"1.0"                forKey:@"MIME-Version"];
-  [map addObject:userAgent             forKey:@"X-Mailer"];
+
+  dateString = [[NSCalendarDate date] rfc822DateString];
+  [map addObject: dateString forKey:@"date"];
+  [map addObject: @"1.0"                forKey:@"MIME-Version"];
+  [map addObject: userAgent             forKey:@"X-Mailer"];
 
   /* add custom headers */