diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.m b/SoObjects/Appointments/iCalEntityObject+SOGo.m
index 65ed31fdf..92e8813cf 100644
--- a/SoObjects/Appointments/iCalEntityObject+SOGo.m
+++ b/SoObjects/Appointments/iCalEntityObject+SOGo.m
@@ -355,12 +355,12 @@ NSNumber *iCalDistantFutureNumber = nil;
   if ([o isKindOfClass: [NSArray class]])
     [self _setAttendees: o];
 
-  o = [data objectForKey: @"alarm"];
-  if ([o isKindOfClass: [NSDictionary class]])
-    {
-      owner = [data objectForKey: @"owner"];
-      [self _setAlarm: o forOwner: owner];
-    }
+  // o = [data objectForKey: @"alarm"];
+  // if ([o isKindOfClass: [NSDictionary class]])
+  //   {
+  //     owner = [data objectForKey: @"owner"];
+  //     [self _setAlarm: o forOwner: owner];
+  //   }
 
   // Other attributes depend on the client object and therefore are set in [UIxComponentEditor setAttributes:]:
   // - organizer & "created-by"
diff --git a/SoObjects/Appointments/iCalEvent+SOGo.m b/SoObjects/Appointments/iCalEvent+SOGo.m
index 87c19d974..722b898f5 100644
--- a/SoObjects/Appointments/iCalEvent+SOGo.m
+++ b/SoObjects/Appointments/iCalEvent+SOGo.m
@@ -372,6 +372,7 @@
 {
   NSCalendarDate *aptStartDate, *aptEndDate, *allDayStartDate;
   NSInteger offset, nbrDays;
+  NSString *owner;
   NSTimeZone *timeZone;
   iCalDateTime *startDate;
   iCalTimeZone *tz;
@@ -454,6 +455,16 @@
             }
         }
     }
+
+  //To make an ics conforme with outlook live (bouh), valarm must be the last element of vevent
+  //Try to set it here
+  o = [data objectForKey: @"alarm"];
+  if ([o isKindOfClass: [NSDictionary class]])
+    {
+      owner = [data objectForKey: @"owner"];
+      [self _setAlarm: o forOwner: owner];
+    }
+
 }
 
 - (iCalTimeZone *) adjustInContext: (WOContext *) context