diff --git a/ChangeLog b/ChangeLog
index 7f46fd92c..60a8bfaf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-05-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoCalendarComponent.m
+	([SOGoCalendarComponent +initialize]): the default language for
+	mail templates is now set to English.
+
 	* UI/SOGoUI/SOGoACLFrenchRemovalAdvisory.[hm]: new subclass of
 	SOGoACLAdvisory implementing the french template for user removal
 	from acls.
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 39b3d1afe..e6a6a65c3 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -57,7 +57,7 @@ static BOOL sendEMailNotifications = NO;
       mailTemplateDefaultLanguage = [[ud stringForKey:@"SOGoDefaultLanguage"]
                                       retain];
       if (!mailTemplateDefaultLanguage)
-        mailTemplateDefaultLanguage = @"French";
+        mailTemplateDefaultLanguage = @"English";
 
       sendEMailNotifications
         = [ud boolForKey: @"SOGoAppointmentSendEMailNotifications"];
@@ -377,6 +377,8 @@ static BOOL sendEMailNotifications = NO;
           else
             recipient = email;
 
+#warning this could be optimized in a class hierarchy common with the \
+          SOGoObject's acl notification mechanism
           /* create page name */
           // TODO: select user's default language?
           pageName = [NSString stringWithFormat: @"SOGoAptMail%@%@",