diff --git a/ChangeLog b/ChangeLog
index 342cd380d..d87116f9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 	set "showCompletedTasks" earlier in order to properly fetch the
 	tasks upon the first refresh.
 
+	* UI/Scheduler/UIxAppointmentEditor.m
+	(-takeValuesFromRequest:inContext:): we no longer associate a
+	vTimeZone to start/end dates of an all-day vEvent.
+
 2011-03-17  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/Appointments/iCalEvent+SOGo.m (-quickRecord): 
diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
index 4be043942..39704cfda 100644
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -531,12 +531,16 @@
     {
       iCalTimeZone *tz;
 
-      ud = [[context activeUser] userDefaults];
+      // Don't add a vTimeZone to all-day events
+      if (!isAllDay)
+      {
+	  ud = [[context activeUser] userDefaults];
       
-      tz = [iCalTimeZone timeZoneForName: [ud timeZoneName]];
-      [[event parent] addTimeZone: tz];
-      [(iCalDateTime *)[event uniqueChildWithTag: @"dtstart"] setTimeZone: tz];
-      [(iCalDateTime *)[event uniqueChildWithTag: @"dtend"] setTimeZone: tz];
+	  tz = [iCalTimeZone timeZoneForName: [ud timeZoneName]];
+	  [[event parent] addTimeZone: tz];
+	  [(iCalDateTime *)[event uniqueChildWithTag: @"dtstart"] setTimeZone: tz];
+	  [(iCalDateTime *)[event uniqueChildWithTag: @"dtend"] setTimeZone: tz];
+      }
     }
 
   [event setTransparency: (isTransparent? @"TRANSPARENT" : @"OPAQUE")];