diff --git a/ChangeLog b/ChangeLog
index baee5b509..0725d6235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* OpenChange/MAPIStoreCalendarMessage.m (-save): handle all day
 	events based on the value of PidLidAppointmentSubType.
+	Don't add the timezone component to the vCalendar in that case.
 
 2011-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index 07a34ee52..214f1c76d 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -712,14 +712,17 @@
       if (value)
         [newEvent setLocation: value];
 
-      tzName = [[self ownerTimeZone] name];
-      tz = [iCalTimeZone timeZoneForName: tzName];
-      [vCalendar addTimeZone: tz];
-
       isAllDay = [[properties
                     objectForKey: MAPIPropertyKey (PidLidAppointmentSubType)]
                    boolValue];
 
+      if (!isAllDay)
+        {
+          tzName = [[self ownerTimeZone] name];
+          tz = [iCalTimeZone timeZoneForName: tzName];
+          [vCalendar addTimeZone: tz];
+        }
+
       // start
       value = [properties objectForKey: MAPIPropertyKey (PR_START_DATE)];
       if (!value)