diff --git a/Vector/Utils/EventFormatter.m b/Vector/Utils/EventFormatter.m
index bb8c04346..af6a0fc51 100644
--- a/Vector/Utils/EventFormatter.m
+++ b/Vector/Utils/EventFormatter.m
@@ -22,6 +22,11 @@
      The calendar used to retrieve the today date.
      */
     NSCalendar *calendar;
+
+    /**
+     The local time zone
+     */
+    NSTimeZone *localTimeZone;
 }
 @end
 
@@ -35,6 +40,8 @@
         calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
         // Note: NSDate object always shows time according to GMT, so the calendar should be in GMT too.
         calendar.timeZone = [NSTimeZone timeZoneWithAbbreviation:@"GMT"];
+
+        localTimeZone = [NSTimeZone localTimeZone];
     }
     return self;
 }
@@ -56,7 +63,9 @@
     NSDateComponents *components = [calendar components:(NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay) fromDate:[NSDate date]];
     NSDate *today = [calendar dateFromComponents:components];
     
-    NSTimeInterval interval = -[date timeIntervalSinceDate:today];
+    NSTimeInterval localZoneOffset = [localTimeZone secondsFromGMT];
+    
+    NSTimeInterval interval = -[date timeIntervalSinceDate:today] - localZoneOffset;
     if (interval > 60*60*24*6)
     {
         dateFormat = @"EEE MMM dd yyyy";