diff --git a/NEWS b/NEWS
index be294b0b0..c2973d638 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@
 Enhancements
 - [web] create card from sender or recipient address (#3002, #4610)
 
+Bug fixes
+- [web] Fix all-day event dates with different timezone
+
 4.0.5 (2019-01-09)
 ------------------
 
diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
index bea74c726..911445a55 100644
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -31,7 +31,9 @@
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
 
+#import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalEvent.h>
+#import <NGCards/iCalTimeZone.h>
 #import <NGCards/iCalTrigger.h>
 #import <NGCards/iCalRecurrenceRule.h>
 
@@ -689,7 +691,6 @@
   iCalEvent *event;
 
   BOOL resetAlarm;
-  NSInteger offset;
   NSUInteger snoozeAlarm;
 
   event = [self event];
@@ -703,6 +704,21 @@
 
   if (isAllDay)
     {
+      iCalDateTime *dt;
+      iCalTimeZone *tz;
+      NSInteger offset;
+
+      // An all-day event usually doesn't have a timezone associated to its
+      // start-end dates; however, if it does, we convert them to GMT.
+      dt = (iCalDateTime*) [event uniqueChildWithTag: @"dtstart"];
+      tz = [(iCalDateTime*) dt timeZone];
+      if (tz)
+        eventStartDate = [tz computedDateForDate: eventStartDate];
+      dt = (iCalDateTime*) [event uniqueChildWithTag: @"dtend"];
+      tz = [(iCalDateTime*) dt timeZone];
+      if (tz)
+        eventEndDate = [tz computedDateForDate: eventEndDate];
+
       eventEndDate = [eventEndDate dateByAddingYears: 0 months: 0 days: -1];
 
       // Convert the dates to the user's timezone