diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index 1a649f726..73ebdf88e 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -2905,7 +2905,7 @@ void handle_eas_terminate(int signum)
   NSData *d;
   int OofState, time, i;
   id setElements;
-  NSCalendarDate *endDate;
+  NSCalendarDate *startDate, *endDate;
   NSString *autoReplyText;
   NSArray *OofMessages;
 
@@ -2937,9 +2937,10 @@ void handle_eas_terminate(int signum)
           [s appendString: @"<Get>"];
           [s appendFormat: @"<OofState>%d</OofState>", OofState];
 
-          time = [[vacationOptions objectForKey: @"endDate"] intValue];
+          time = [[vacationOptions objectForKey: @"startDate"] intValue];
+          [s appendFormat: @"<StartTime>%@</StartTime>", [[NSCalendarDate dateWithTimeIntervalSince1970: time] activeSyncRepresentationInContext: context]];
 
-          [s appendFormat: @"<StartTime>%@</StartTime>", [[NSCalendarDate calendarDate] activeSyncRepresentationInContext: context]];
+          time = [[vacationOptions objectForKey: @"endDate"] intValue];
           [s appendFormat: @"<EndTime>%@</EndTime>", [[NSCalendarDate dateWithTimeIntervalSince1970: time] activeSyncRepresentationInContext: context]];
 
           [s appendFormat: @"<OofMessage>"];
@@ -2994,6 +2995,14 @@ void handle_eas_terminate(int signum)
           [vacationOptions setObject: [NSNumber numberWithBool: (OofState > 0) ? YES : NO]
                     forKey: @"enabled"];
 
+          startDate = [[[(id)[setElements getElementsByTagName: @"StartTime"] lastObject] textValue] calendarDate];
+
+          if (startDate)
+            [vacationOptions setObject: [NSNumber numberWithInt: [startDate timeIntervalSince1970]] forKey: @"startDate"];
+
+          [vacationOptions setObject: [NSNumber numberWithBool: (OofState == 2) ? YES : NO]
+                    forKey: @"startDateEnabled"];
+
           [vacationOptions setObject: [NSNumber numberWithBool: (OofState == 2) ? YES : NO]
                     forKey: @"endDateEnabled"];