diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index fd6855fb0..56cd09738 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -1566,8 +1566,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 
       if (records)
         {
-          if (r)
-            records = [self _fixupRecords: records];
+          records = [self _fixupRecords: records];
           ma = [NSMutableArray arrayWithArray: records];
         }
       else
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index e3bede592..e39bacd52 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -286,7 +286,7 @@ static NSArray *tasksFields = nil;
    */
   
   //NSLog(@"***[UIxCalListingActions _fixDates:] %@", [theRecord objectForKey: @"c_title"]);
-  if (dayBasedView || [[theRecord objectForKey: @"c_isallday"] boolValue])
+  if (currentView && (dayBasedView || [[theRecord objectForKey: @"c_isallday"] boolValue]))
   {
     for (count = 0; count < 2; count++)
     {