diff --git a/ChangeLog b/ChangeLog
index dd3b6dd84..4757ac4a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-14  Ludovic Marcotte <ludovic@inverse.ca>
+
+	* SoObjects/Appointments/SOGoCalendarComponent.m
+	We set headers in lowercase so that they get properly
+	encoded by SOPE.
+
+	* SoObjects/Mailer/SOGoDraftObject.m
+	Minor cleanups.	
+
 2007-12-13  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/MailerUI/UIxMailMainFrame.m ([UIxMailMainFrame -saveFoldersStateAction])
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 8411b7941..c8ed4eb3a 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -316,11 +316,11 @@ static BOOL sendEMailNotifications = NO;
 		   * so we'll stick with multipart/mixed for the time being.
 		   */
 		  [headerMap setObject: @"multipart/mixed" forKey: @"content-type"];
-		  [headerMap setObject: sender forKey: @"From"];
-		  [headerMap setObject: recipient forKey: @"To"];
+		  [headerMap setObject: sender forKey: @"from"];
+		  [headerMap setObject: recipient forKey: @"to"];
 		  mailDate = [[NSCalendarDate date] rfc822DateString];
 		  [headerMap setObject: mailDate forKey: @"date"];
-		  [headerMap setObject: subject forKey: @"Subject"];
+		  [headerMap setObject: subject forKey: @"subject"];
 		  msg = [NGMimeMessage messageWithHeader: headerMap];
 
 		  /* multipart body */
@@ -407,11 +407,11 @@ static BOOL sendEMailNotifications = NO;
 	   * so we'll stick with multipart/mixed for the time being.
 	   */
 	  [headerMap setObject: @"multipart/mixed" forKey: @"content-type"];
-	  [headerMap setObject: [attendee mailAddress] forKey: @"From"];
-	  [headerMap setObject: [organizer mailAddress] forKey: @"To"];
+	  [headerMap setObject: [attendee mailAddress] forKey: @"from"];
+	  [headerMap setObject: [organizer mailAddress] forKey: @"to"];
 	  mailDate = [[NSCalendarDate date] rfc822DateString];
 	  [headerMap setObject: mailDate forKey: @"date"];
-	  [headerMap setObject: [p getSubject] forKey: @"Subject"];
+	  [headerMap setObject: [p getSubject] forKey: @"subject"];
 	  msg = [NGMimeMessage messageWithHeader: headerMap];
 
 	  NSLog (@"sending 'REPLY' from %@ to %@",
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index fd3ac5312..8a9215627 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -1164,20 +1164,18 @@ static BOOL        showTextAttachmentsInline  = NO;
   else if (![self isEmptyValue:from])
     [map setObjects:[map objectsForKey: @"from"] forKey: @"reply-to"];
   
-  /* add subject */
   if (inReplyTo)
     [map setObject: inReplyTo forKey: @"in-reply-to"];
 
+  /* add subject */
   if ([(s = [headers objectForKey: @"subject"]) length] > 0)
     [map setObject: [s asQPSubjectString: @"utf-8"]
 	 forKey: @"subject"];
-//     [map setObject: [s asQPSubjectString: @"utf-8"] forKey: @"subject"];
 
   [map setObject: [headers objectForKey: @"message-id"]
        forKey: @"message-id"];
 
   /* add standard headers */
-
   dateString = [[NSCalendarDate date] rfc822DateString];
   [map addObject: dateString forKey: @"date"];
   [map addObject: @"1.0" forKey: @"MIME-Version"];