diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 32dc2db3d..d884803b3 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -155,6 +155,7 @@
 "What to Print" = "What to Print";
 "Options" = "Options";
 "Tasks with no due date" = "Tasks with no due date";
+"Display working hours only" = "Display working hours only";
 "Completed tasks" = "Completed Tasks";
 
 /* Appointments */
@@ -313,6 +314,7 @@
 
 "Repeat" = "Repeat";
 "Daily" = "Daily";
+"Multi-Columns" = "Multi-Columns";
 "Weekly" = "Weekly";
 "Monthly" = "Monthly";
 "Yearly" = "Yearly";
@@ -542,6 +544,12 @@ vtodo_class2 = "(Confidential task)";
 "tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?";
 "DestinationCalendarError" = "The source and destination calendars are the same. Please try to copy to a different calendar.";
 "EventCopyError" = "The copy failed. Please try to copy to a difference calendar.";
+"Please select at least one calendar" = "Please select at least one calendar";
+"notice:" = "notice:";
+"error:" = "error:";
+"success:" = "success:";
+"warning:" = "warning:";
+
 
 "Open Task..." = "Open Task...";
 "Mark Completed" = "Mark Completed";
diff --git a/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar b/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar
index 54a5eae10..14e5fcd5e 100644
--- a/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar
+++ b/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar
@@ -21,12 +21,11 @@
       onclick = "return onDayOverview();";
       image = "day-view.png";
       tooltip = "Switch to day view"; },
-    /* disabled until we fix the view */
-    /*    { link = "#";
-            label="Multicolumn Day View";
-            onclick = "return onMulticolumnDayOverview();";
-            image = "day-view-multicolumn.png";
-            tooltip = ""; }, */
+    { link = "#";
+      label="Multi-Columns View";
+      onclick = "return onMulticolumnDayOverview();";
+      image = "day-view-multicolumn.png";
+      tooltip = "Switch to multi-columns day view"; },
     { link = "#";
       label="Week View";
       onclick = "return onWeekOverview();";
diff --git a/UI/Scheduler/UIxCalDayTable.h b/UI/Scheduler/UIxCalDayTable.h
index 88ab136e8..57d91e846 100644
--- a/UI/Scheduler/UIxCalDayTable.h
+++ b/UI/Scheduler/UIxCalDayTable.h
@@ -35,27 +35,27 @@
 
 @interface UIxCalDayTable : UIxCalView
 {
-  unsigned int numberOfDays;
-  NSCalendarDate *startDate;
-  NSCalendarDate *currentTableDay;
-  NSString *currentTableHour;
-  NSMutableArray *daysToDisplay;
-  NSMutableArray *hoursToDisplay;
-  NSArray *weekDays;
   SOGoDateFormatter *dateFormatter;
-  NSString *timeFormat;
+  NSArray *weekDays;
+  NSString *currentView, *timeFormat, *currentTableHour;
+  NSCalendarDate *startDate, *currentTableDay;
+  NSMutableArray *daysToDisplay, *calendarsToDisplay,  *currentCalendar, *hoursToDisplay;
+  unsigned int numberOfDays;
 }
 
 - (void) setNumberOfDays: (NSNumber *) aNumber;
 - (NSNumber *) numberOfDays;
+- (NSString *) currentView;
 
 - (void) setStartDate: (NSCalendarDate *) aStartDate;
 - (NSCalendarDate *) startDate;
 - (NSCalendarDate *) endDate;
 
 - (NSArray *) daysToDisplay;
+- (NSArray *) calendarsToDisplay;
 - (void) setCurrentTableDay: (NSCalendarDate *) aTableDay;
 - (NSCalendarDate *) currentTableDay;
+- (NSMutableArray *) currentCalendar;
 
 @end
 
diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m
index 174e1d1ea..799d55f57 100644
--- a/UI/Scheduler/UIxCalDayTable.m
+++ b/UI/Scheduler/UIxCalDayTable.m
@@ -55,9 +55,12 @@
       ASSIGN (timeFormat, [ud timeFormat]);
 
       daysToDisplay = nil;
+      calendarsToDisplay = nil;
       hoursToDisplay = nil;
       numberOfDays = 1;
       startDate = nil;
+      currentView = nil;
+      currentCalendar = nil;
       currentTableDay = nil;
       currentTableHour = nil;
       weekDays = [locale objectForKey: NSShortWeekDayNameArray];
@@ -75,6 +78,8 @@
 //     [allAppointments release];
   [weekDays release];
   [daysToDisplay release];
+  [calendarsToDisplay release];
+  [currentView release];
   [hoursToDisplay release];
   [dateFormatter release];
   [timeFormat release];
@@ -119,6 +124,16 @@
   return [endDate endOfDay];
 }
 
+- (void) setCurrentView: (NSString *) aView
+{
+  ASSIGN(currentView, aView);
+}
+
+- (NSString *) currentView
+{
+  return currentView;
+}
+
 - (NSArray *) hoursToDisplay
 {
   unsigned int currentHour, lastHour;
@@ -148,22 +163,68 @@
 {
   NSCalendarDate *currentDate;
   int count;
-
+  
   if (!daysToDisplay)
+  {
+    daysToDisplay = [NSMutableArray new];
+    currentDate = [[self startDate] hour: [self dayStartHour]
+                                  minute: 0];
+    
+    for (count = 0; count < numberOfDays; count++)
     {
-      daysToDisplay = [NSMutableArray new];
-      currentDate = [[self startDate] hour: [self dayStartHour]
-                                      minute: 0];
-      for (count = 0; count < numberOfDays; count++)
-	{
-	  [daysToDisplay addObject: currentDate];
-	  currentDate = [currentDate tomorrow];
-	}
+      [daysToDisplay addObject: currentDate];
+      currentDate = [currentDate tomorrow];
     }
-
+  }
+  
   return daysToDisplay;
 }
 
+- (NSArray *) calendarsToDisplay
+{
+  if (!calendarsToDisplay)
+  {
+    int max=0, i;
+    NSArray *folders;
+    SOGoAppointmentFolders *co;
+    SOGoAppointmentFolder *folder;
+    NSMutableDictionary *calendar;
+    unsigned int count, foldersCount;
+    NSString *folderName, *fDisplayName;
+    NSNumber *isActive;
+    
+    co = [self clientObject];
+    folders = [co subFolders];
+    foldersCount = [folders count];
+    calendarsToDisplay = [[NSMutableArray alloc] initWithCapacity: foldersCount];
+    for (count = 0; count < foldersCount; count++)
+    {
+      folder = [folders objectAtIndex: count];
+      isActive = [NSNumber numberWithBool: [folder isActive]];
+      if ([isActive intValue] != 0) {
+        calendar = [NSMutableDictionary dictionary];
+        folderName = [folder nameInContainer];
+        fDisplayName = [folder displayName];
+        if (fDisplayName == nil)
+          fDisplayName = @"";
+        if ([fDisplayName isEqualToString: [co defaultFolderName]])
+          fDisplayName = [self labelForKey: fDisplayName];
+        [calendar setObject: [NSString stringWithFormat: @"/%@", folderName]
+                     forKey: @"id"];
+        [calendar setObject: fDisplayName forKey: @"displayName"];
+        [calendar setObject: folderName forKey: @"folder"];
+        [calendar setObject: [folder calendarColor] forKey: @"color"];
+        [calendar setObject: isActive forKey: @"active"];
+        [calendar setObject: [folder ownerInContext: context]
+                     forKey: @"owner"];
+        [calendarsToDisplay addObject: calendar];
+      }
+    }
+  }
+  
+  return calendarsToDisplay;
+}
+
 - (void) setCurrentTableDay: (NSCalendarDate *) aTableDay
 {
   currentTableDay = aTableDay;
@@ -174,6 +235,16 @@
   return currentTableDay;
 }
 
+- (void) setCurrentCalendar: (NSMutableArray *) aCalendar
+{
+  ASSIGN(currentCalendar, aCalendar);
+}
+
+- (NSMutableArray *) currentCalendar
+{
+  return currentCalendar;
+}
+
 - (void) setCurrentTableHour: (NSString *) aTableHour
 {
   currentTableHour = aTableHour;
@@ -226,6 +297,16 @@
   return [dateFormatter shortFormattedDate: currentTableDay];
 }
 
+- (NSString *) labelForCalendar
+{
+  return [currentCalendar objectForKey: @"displayName"];
+}
+
+- (NSString *) colorForCalendar
+{
+  return [currentCalendar objectForKey:@"color"];
+}
+
 // - (NSDictionary *) _adjustedAppointment: (NSDictionary *) anAppointment
 //                                forStart: (NSCalendarDate *) start
 //                                  andEnd: (NSCalendarDate *) end
@@ -318,7 +399,15 @@
 
 - (NSString *) daysViewClasses
 {
-  return [NSString stringWithFormat: @"daysView daysViewFor%dDays", numberOfDays];
+  NSString *daysView;
+  
+  if ([currentView isEqualToString:@"multicolumndayview"])
+    daysView = @"daysView daysViewForMultipleDays";
+
+  else
+    daysView = [NSString stringWithFormat: @"daysView daysViewFor%dDays", numberOfDays];
+  
+  return daysView;
 }
 
 - (NSString *) dayClasses
@@ -326,19 +415,24 @@
   NSMutableString *classes;
   unsigned int currentDayNbr, realDayOfWeek;
   
-  currentDayNbr = [daysToDisplay indexOfObject: currentTableDay];
-  realDayOfWeek = [currentTableDay dayOfWeek];
-
   classes = [NSMutableString string];
-  [classes appendFormat: @"day day%d", currentDayNbr];
-  if (numberOfDays > 1)
+  if ([currentView isEqualToString:@"multicolumndayview"])
+    [classes appendFormat:@"day dayColumn"];
+  else {
+    currentDayNbr = [daysToDisplay indexOfObject: currentTableDay];
+    realDayOfWeek = [currentTableDay dayOfWeek];
+    
+    [classes appendFormat: @"day day%d", currentDayNbr];
+    
+    if (numberOfDays > 1)
     {
       if (realDayOfWeek == 0 || realDayOfWeek == 6)
         [classes appendString: @" weekEndDay"];
       if ([currentTableDay isToday])
         [classes appendString: @" dayOfToday"];
     }
-
+  }
+       
   return classes;
 }
 
@@ -358,4 +452,20 @@
   return cellClass;
 }
 
+- (BOOL) isMultiColumnView
+{
+  if ([currentView isEqualToString:@"multicolumndayview"])
+    return YES;
+  
+  return NO;
+}
+
+- (BOOL) isNotMultiColumnView
+{
+  if ([currentView isEqualToString:@"dayview"] || [currentView isEqualToString:@"weekview"])
+    return YES;
+  
+  return NO;
+}
+
 @end
diff --git a/UI/Scheduler/UIxCalListingActions.h b/UI/Scheduler/UIxCalListingActions.h
index 4f12d8cfe..41c27cecd 100644
--- a/UI/Scheduler/UIxCalListingActions.h
+++ b/UI/Scheduler/UIxCalListingActions.h
@@ -43,6 +43,7 @@
   NSString *value;
   NSString *criteria;
   NSString *userLogin;
+  NSString *currentView;
   BOOL dayBasedView;
   WORequest *request;
   SOGoDateFormatter *dateFormatter;
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index 2a579be5f..7c34b8f71 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -75,6 +75,8 @@ static NSArray *tasksFields = nil;
 #define maxBlocks (offsetBlocks * 2)    // maximum number of blocks to search
 // for a free slot (10 days)
 
+@class SOGoAppointment;
+
 @implementation UIxCalListingActions
 
 + (void) initialize
@@ -118,6 +120,7 @@ static NSArray *tasksFields = nil;
     ASSIGN (dateFormatter, [user dateFormatterInContext: context]);
     ASSIGN (userTimeZone, [[user userDefaults] timeZone]);
     dayBasedView = NO;
+    currentView = nil;
   }
   
   return self;
@@ -236,6 +239,7 @@ static NSArray *tasksFields = nil;
       endDate = nil;
     
     param = [request formValueForKey: @"view"];
+    currentView = param;
     dayBasedView = ![param isEqualToString: @"monthview"];
   }
 }
@@ -1041,47 +1045,117 @@ _computeBlocksPosition (NSArray *blocks)
   /* ... _computeBlocksMultiplier() ... */
 }
 
+- (NSArray *) _selectedCalendars
+{
+  SOGoAppointmentFolders *co;
+  SOGoAppointmentFolder *folder;
+  NSMutableArray *selectedCalendars;
+  NSArray *folders;
+  NSString *fDisplayName;
+  NSNumber *isActive;
+  unsigned int count, foldersCount;
+  int max=0, i;
+  
+  co = [self clientObject];
+  folders = [co subFolders];
+  foldersCount = [folders count];
+  selectedCalendars = [[NSMutableArray alloc] initWithCapacity: foldersCount];
+  for (count = 0; count < foldersCount; count++)
+  {
+    folder = [folders objectAtIndex: count];
+    isActive = [NSNumber numberWithBool: [folder isActive]];
+    if ([isActive intValue] != 0) {
+      fDisplayName = [folder displayName];
+      if (fDisplayName == nil)
+        fDisplayName = @"";
+      if ([fDisplayName isEqualToString: [co defaultFolderName]])
+        fDisplayName = [self labelForKey: fDisplayName];
+      [selectedCalendars addObject: fDisplayName];
+    }
+  }
+  return selectedCalendars;
+}
+
 - (WOResponse *) eventsBlocksAction
 {
   int count, max;
   NSArray *events, *event, *eventsBlocks;
-  NSMutableArray *allDayBlocks, *blocks, *currentDay;
+  NSMutableArray *allDayBlocks, *blocks, *currentDay, *calendars, *eventsByCalendars, *eventsForCalendar;
   NSNumber *eventNbr;
   BOOL isAllDay;
+  int i, j;
   
   [self _setupContext];
   
-  [self _prepareEventBlocks: &blocks withAllDays: &allDayBlocks];
-  events = [self _fetchFields: eventsFields
-           forComponentOfType: @"vevent"];
-  eventsBlocks = [NSArray arrayWithObjects: events, allDayBlocks, blocks, nil];
-  max = [events count];
-  for (count = 0; count < max; count++)
-  {
-    event = [events objectAtIndex: count];
-    //      NSLog(@"***[UIxCalListingActions eventsBlocksAction] %i = %@ : %@ / %@ / %@", count,
-    //	    [event objectAtIndex: eventTitleIndex],
-    //	    [event objectAtIndex: eventStartDateIndex],
-    //	    [event objectAtIndex: eventEndDateIndex],
-    //	    [event objectAtIndex: eventRecurrenceIdIndex]);
-    eventNbr = [NSNumber numberWithUnsignedInt: count];
-    isAllDay = [[event objectAtIndex: eventIsAllDayIndex] boolValue];
-    if (dayBasedView && isAllDay)
-      [self _fillBlocks: allDayBlocks withEvent: event withNumber: eventNbr];
-    else
-      [self _fillBlocks: blocks withEvent: event withNumber: eventNbr];
-  }
+  events = [self _fetchFields: eventsFields forComponentOfType: @"vevent"];
   
-  max = [blocks count];
-  for (count = 0; count < max; count++)
+  if ([currentView isEqualToString: @"multicolumndayview"])
   {
-    currentDay = [blocks objectAtIndex: count];
-    [currentDay sortUsingSelector: @selector (compareEventByStart:)];
-    [self _addBlocksWidth: currentDay];
+    calendars = [self _selectedCalendars];
+    eventsByCalendars = [NSMutableArray arrayWithCapacity:[calendars count]];
+    for (i = 0; i < [calendars count]; i++) // For each calendar
+    {
+      eventsForCalendar = [NSMutableArray array];
+      [self _prepareEventBlocks: &blocks withAllDays: &allDayBlocks];
+      for (j = 0; j < [events count]; j++) {
+        if ([[[events objectAtIndex:j] objectAtIndex:2] isEqualToString:[calendars objectAtIndex:i]]) {
+          [eventsForCalendar addObject: [events objectAtIndex:j]];
+        }
+      }
+      eventsBlocks = [NSArray arrayWithObjects:eventsForCalendar, allDayBlocks, blocks, nil];
+      max = [eventsForCalendar count];
+      for (count = 0; count < max; count++)
+      {
+        event = [eventsForCalendar objectAtIndex: count];
+        eventNbr = [NSNumber numberWithUnsignedInt: count];
+        isAllDay = [[event objectAtIndex: eventIsAllDayIndex] boolValue];
+        if (dayBasedView && isAllDay)
+          [self _fillBlocks: allDayBlocks withEvent: event withNumber: eventNbr];
+        else
+          [self _fillBlocks: blocks withEvent: event withNumber: eventNbr];
+      }
+      max = [blocks count];
+      for (count = 0; count < max; count++)
+      {
+        currentDay = [blocks objectAtIndex: count];
+        [currentDay sortUsingSelector: @selector (compareEventByStart:)];
+        [self _addBlocksWidth: currentDay];
+      }
+      
+      [eventsByCalendars insertObject:eventsBlocks atIndex:i];
+    }
+    return [self _responseWithData: eventsByCalendars];
+  }
+  else
+  {
+    [self _prepareEventBlocks: &blocks withAllDays: &allDayBlocks];
+    eventsBlocks = [NSArray arrayWithObjects: events, allDayBlocks, blocks, nil];
+    max = [events count];
+    for (count = 0; count < max; count++)
+    {
+      event = [events objectAtIndex: count];
+      //      NSLog(@"***[UIxCalListingActions eventsBlocksAction] %i = %@ : %@ / %@ / %@", count,
+      //	    [event objectAtIndex: eventTitleIndex],
+      //	    [event objectAtIndex: eventStartDateIndex],
+      //	    [event objectAtIndex: eventEndDateIndex],
+      //	    [event objectAtIndex: eventRecurrenceIdIndex]);
+      eventNbr = [NSNumber numberWithUnsignedInt: count];
+      isAllDay = [[event objectAtIndex: eventIsAllDayIndex] boolValue];
+      if (dayBasedView && isAllDay)
+        [self _fillBlocks: allDayBlocks withEvent: event withNumber: eventNbr];
+      else
+        [self _fillBlocks: blocks withEvent: event withNumber: eventNbr];
+    }
+    
+    max = [blocks count];
+    for (count = 0; count < max; count++)
+    {
+      currentDay = [blocks objectAtIndex: count];
+      [currentDay sortUsingSelector: @selector (compareEventByStart:)];
+      [self _addBlocksWidth: currentDay];
+    }
+    return [self _responseWithData: eventsBlocks];
   }
-  
-  return [self _responseWithData: eventsBlocks];
-  //   timeIntervalSinceDate:
 }
 
 - (NSString *) _getStatusClassForStatusCode: (int) statusCode
diff --git a/UI/Scheduler/UIxCalMulticolumnDayView.m b/UI/Scheduler/UIxCalMulticolumnDayView.m
index 6c1683d1a..b96241686 100644
--- a/UI/Scheduler/UIxCalMulticolumnDayView.m
+++ b/UI/Scheduler/UIxCalMulticolumnDayView.m
@@ -39,25 +39,25 @@
 - (id) init
 {
   if ((self = [super init]))
-    {
-//       allAppointments = nil;
-      subscriptionUsers = nil;
-      hoursToDisplay = nil;
-      currentTableUser = nil;
-      currentTableHour = nil;
-//       dateFormatter = [[SOGoDateFormatter alloc]
-//                         initWithLocale: [self locale]];
-    }
-
+  {
+    //       allAppointments = nil;
+    subscriptionUsers = nil;
+    hoursToDisplay = nil;
+    currentTableUser = nil;
+    currentTableHour = nil;
+    //       dateFormatter = [[SOGoDateFormatter alloc]
+    //                         initWithLocale: [self locale]];
+  }
+  
   return self;
 }
 
 - (void) dealloc
 {
-//   [allAppointments release];
+  //   [allAppointments release];
   [subscriptionUsers release];
   [hoursToDisplay release];
-//   [dateFormatter release];
+  //   [dateFormatter release];
   [super dealloc];
 }
 
@@ -188,16 +188,6 @@
 
 /* fetching */
 
-// - (NSCalendarDate *) startDate
-// {
-//   return [[self selectedDate] beginOfDay];
-// }
-
-// - (NSCalendarDate *) endDate
-// {
-//   return [[self selectedDate] endOfDay];
-// }
-
 // - (NSArray *) appointmentsForCurrentUser
 // {
 //   NSMutableArray *filteredAppointments;
@@ -292,4 +282,11 @@
                                      * (100.0 / [users count]))];
 }
 
+- (id <WOActionResults>) defaultAction
+{
+  [super setCurrentView: @"multicolumndayview"];
+  
+  return self;
+}
+
 @end
diff --git a/UI/Scheduler/UIxCalViewPrint.h b/UI/Scheduler/UIxCalViewPrint.h
index ac3de23a8..a0977d594 100644
--- a/UI/Scheduler/UIxCalViewPrint.h
+++ b/UI/Scheduler/UIxCalViewPrint.h
@@ -24,6 +24,7 @@
 @interface UIxCalViewPrint : UIxComponent
 {
   id item;
+  SOGoUserSettings *us;
 }
 
 @end
diff --git a/UI/Scheduler/UIxCalViewPrint.m b/UI/Scheduler/UIxCalViewPrint.m
index af94b9792..d186ef4fa 100644
--- a/UI/Scheduler/UIxCalViewPrint.m
+++ b/UI/Scheduler/UIxCalViewPrint.m
@@ -22,6 +22,9 @@
 #import <Foundation/NSString.h>
 #import <Foundation/NSArray.h>
 
+#import <SOGo/SOGoUserSettings.h>
+#import <SOGo/SOGoUser.h>
+
 #import <UIxCalViewPrint.h>
 
 static NSArray *layoutItems = nil;
@@ -32,21 +35,22 @@ static NSArray *layoutItems = nil;
 {
   if (!layoutItems)
   {
-    layoutItems = [NSArray arrayWithObjects: @"LIST", @"Daily", @"Weekly", nil];
+    layoutItems = [NSArray arrayWithObjects: @"LIST", @"Daily", @"Multi-Columns", @"Weekly", nil];
     [layoutItems retain];
   }
 
 }
+
 - (id) init
 {
   item = nil;
-  return [super init];
+  
+  return self;
 }
 
 - (void) dealloc
 {
   [item release];
-  [super dealloc];
 }
 
 /****************************************************************/
@@ -72,10 +76,29 @@ static NSArray *layoutItems = nil;
   return [self labelForKey: [NSString stringWithFormat: item]];
 }
 
-- (NSString *) layoutSelectedByUser
+- (NSString *) parentPrintLayout
 {
-  return nil;
+  // The objective here is to return the parent view layout and select the print layout corresponding. Default print view: list view
+  SOGoUser *activeUser;
+  NSString *parentView;
+  
+  activeUser = [context activeUser];
+  us = [activeUser userSettings];
+  parentView = [[us objectForKey:@"Calendar"] objectForKey:@"View" ];
+  
+  if ([parentView isEqualToString:@"dayview"])
+    return @"Daily";
+  
+  else if ([parentView isEqualToString:@"weekview"])
+    return @"Weekly";
+  
+  else if ([parentView isEqualToString:@"multicolumndayview"])
+    return @"Multi-Columns";
+  
+  else
+    return @"LIST";
 }
+
 /******************************************************************/
 /*  */
 
diff --git a/UI/Templates/SchedulerUI/UIxCalDayTable.wox b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
index 5bb9f63ee..3f488286d 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayTable.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
@@ -7,51 +7,105 @@
   xmlns:rsrc="OGo:url"
   xmlns:label="OGo:label">
   <div id="calendarHeader" var:class="daysViewClasses">
-    <div class="dayLabels"
-      ><var:foreach list="daysToDisplay" item="currentTableDay"
-	><div var:class="dayClasses"
-	  ><var:string value="labelForDate"/><br
-	    /><span class="dayOfWeek"><var:string value="labelForDay"/></span
-	    ></div
-	  ></var:foreach>
-    </div>
-    <div class="days"
-      ><var:foreach list="daysToDisplay" item="currentTableDay"
-	><div var:class="dayClasses"
-	  var:day="currentTableDay.shortDateString"
-          var:id="currentAllDayId"
-	  hour="allday"
-	  ><!-- space --></div
-	  ></var:foreach
-	></div>
+
+<!-- MultiColumnView -->
+    <!-- Display the name of the calendar -->
+    <var:if condition="isMultiColumnView">
+      <div class="calendarLabels">
+        <var:foreach list="calendarsToDisplay" item="currentCalendar">
+          <div class="calendarsToDisplay">
+            <var:string value="labelForCalendar"/>
+          </div>
+        </var:foreach>
+      </div>
+      
+      <!-- Display today abreviation and date -->
+      <div class="dayLabels">
+        <var:foreach list="daysToDisplay" item="currentTableDay">
+          <div var:class="dayClasses">
+            <var:string value="labelForDate"/><br/>
+            <span class="dayOfWeek"><var:string value="labelForDay"/></span>
+          </div>
+        </var:foreach>
+      </div>
+      
+      <!-- All day cells -->
+      <div class="days">
+        <var:foreach list="calendarsToDisplay" item="currentCalendar">
+          <var:foreach list="daysToDisplay" item="currentTableDay">
+            <div var:class="dayClasses" var:day="currentTableDay.shortDateString" var:id="currentAllDayId" hour="allday"><!-- space --></div>
+          </var:foreach>
+        </var:foreach>
+      </div>
+    </var:if>
+
+<!-- DayView or WeekView -->
+    <var:if condition="isNotMultiColumnView">
+      <!-- Display today abreviation and date -->
+      <div class="dayLabels">
+        <var:foreach list="daysToDisplay" item="currentTableDay">
+          <div var:class="dayClasses">
+            <var:string value="labelForDate"/><br/>
+            <span class="dayOfWeek"><var:string value="labelForDay"/></span>
+          </div>
+        </var:foreach>
+      </div>
+    
+      <!-- All day cells -->
+      <div class="days">
+        <var:foreach list="daysToDisplay" item="currentTableDay">
+          <div var:class="dayClasses" var:day="currentTableDay.shortDateString" var:id="currentAllDayId" hour="allday"><!-- space --></div>
+        </var:foreach>
+      </div>
+    </var:if>
   </div>
-
+  
+  
+  <!-- The hours cells -->
   <div id="daysView" var:class="daysViewClasses">
-    <div class="hours"
-      ><var:foreach list="hoursToDisplay" item="currentTableHour"
-        ><div class="hour" var:id="currentHourId"
-          ><var:string value="currentTableHour"/></div
-          ></var:foreach>
-    </div>
-
-    <div class="days">
-      <var:foreach list="daysToDisplay" item="currentTableDay"
-        ><div var:class="dayClasses"
-          var:id="currentDayId"
-          var:day-number="currentDayNumber"
-          var:day="currentTableDay.shortDateString">
-          <div class="hourCells">
-            <var:foreach list="hoursToDisplay" item="currentTableHour"
-              ><div var:class="clickableHourCellClass"
-        	var:day="currentTableDay.shortDateString"
-        	var:hour="currentAppointmentHour">
-              <span class="minutes15"><!-- space --></span>
-              <span class="minutes30"><!-- space --></span>
-              <span class="minutes45"><!-- space --></span>
-            </div></var:foreach></div>
-          <div class="events"><!-- space --></div>
+    <div class="hours">
+      <var:foreach list="hoursToDisplay" item="currentTableHour">
+        <div class="hour" var:id="currentHourId">
+          <var:string value="currentTableHour"/>
         </div>
       </var:foreach>
     </div>
+    <div class="days">
+      <!-- MultiColumnView -->
+      <var:if condition="isMultiColumnView">
+        <var:foreach list="calendarsToDisplay" item="currentCalendar">
+          <var:foreach list="daysToDisplay" item="currentTableDay">
+            <div var:class="dayClasses" var:id="currentDayId" var:day-number="currentDayNumber" var:day="currentTableDay.shortDateString">
+              <div class="hourCells">
+                <var:foreach list="hoursToDisplay" item="currentTableHour">
+                  <div var:class="clickableHourCellClass" var:day="currentTableDay.shortDateString" var:hour="currentAppointmentHour">
+                    <span class="minutes15"><!-- space --></span>
+                    <span class="minutes30"><!-- space --></span>
+                    <span class="minutes45"><!-- space --></span>
+                  </div>
+                </var:foreach>
+              </div>
+              <div class="events"><!-- space --></div>
+            </div>
+          </var:foreach>
+        </var:foreach>
+      </var:if>
+      <var:if condition="isNotMultiColumnView">
+        <var:foreach list="daysToDisplay" item="currentTableDay">
+          <div var:class="dayClasses" var:id="currentDayId" var:day-number="currentDayNumber" var:day="currentTableDay.shortDateString">
+            <div class="hourCells">
+              <var:foreach list="hoursToDisplay" item="currentTableHour">
+                <div var:class="clickableHourCellClass" var:day="currentTableDay.shortDateString" var:hour="currentAppointmentHour">
+                  <span class="minutes15"><!-- space --></span>
+                  <span class="minutes30"><!-- space --></span>
+                  <span class="minutes45"><!-- space --></span>
+                </div>
+              </var:foreach>
+            </div>
+            <div class="events"><!-- space --></div>
+          </div>
+        </var:foreach>
+      </var:if>
+    </div>
   </div>
 </container>
diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox
index 676d65d54..83cf7c21c 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox
@@ -40,6 +40,7 @@
           className="UIxCalDayTable"
           startDate="startDate"
           const:CSSClass="dayOverview"
-          const:numberOfDays="1" />
+          const:numberOfDays="1"
+          const:currentView="dayview"/>
     </div>
   </container>
diff --git a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
index 62ee604e3..862a0026b 100644
--- a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
@@ -5,40 +5,33 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label">
-    <a href="#"
-      id="leftNavigationArrow"
-      var:date="prevDayQueryParameters.day"
-      onclick="return onCalendarGotoDay(this);"
-      ><img rsrc:src="arrow-left.png"/></a>
+    
+    <div class="menu" id="currentViewMenu">
+      <ul>
+        <li><var:string label:value="New Event..."/></li>
+        <li><var:string label:value="New Task..."/></li>
+        <li><!-- separator --></li>
+        <li><var:string label:value="Previous Day"/></li>
+        <li><var:string label:value="Next Day"/></li>
+        <li><!-- separator --></li>
+        <li><var:string label:value="Delete Event"/></li>
+        <li><var:string label:value="Copy event to my calendar"/></li>
+        <li><var:string label:value="View Raw Source"/></li>
+      </ul>
+    </div>
+    <!-- Navigation header -->
     <span class="daysHeader">
-      <span class="day2"><a href="#"
-          var:date="dayBeforePrevDayQueryParameters.day"
-          onclick="return onCalendarGotoDay(this);"
-          ><var:string value="dayBeforeYesterdayName"
-            /></a></span
-        ><span class="day1"><a href="#"
-          var:date="prevDayQueryParameters.day"
-          onclick="return onCalendarGotoDay(this);"
-          ><var:string value="yesterdayName"
-            /></a></span
-        ><span class="day0"><var:string value="currentDayName" /></span
-        ><span class="day1"><a href="#"
-          var:date="nextDayQueryParameters.day"
-          onclick="return onCalendarGotoDay(this);"
-          ><var:string value="tomorrowName"
-            /></a></span
-        ><span class="day2"><a href="#"
-          var:date="dayAfterNextDayQueryParameters.day"
-          onclick="return onCalendarGotoDay(this);"
-          ><var:string value="dayAfterTomorrowName"
-            /></a></span
-        ></span>
-    <a href="#"
-      id="rightNavigationArrow"
-      var:date="nextDayQueryParameters.day"
-      onclick="return onCalendarGotoDay(this);"
-      ><img rsrc:src="arrow-right.png"/></a>
+      <span class="day1">
+        <a href="#" id="leftNavigationArrow" var:date="prevDayQueryParameters.day" onclick="return onCalendarGotoDay(this);">
+          <img rsrc:src="arrow-left.png"/></a></span>
+      <span class="day0"><var:string value="currentDayName" /></span>
+      <span class="day1">
+        <a href="#" id="rightNavigationArrow" var:date="nextDayQueryParameters.day" onclick="return onCalendarGotoDay(this);">
+          <img rsrc:src="arrow-right.png"/></a></span>
+      <a href="#" id="listCollapse"><img var:class="collapseBtnClass" rsrc:src="collapse.png"/></a>
+    </span>
 
+    <!-- TODO : Move this inside the schedulerUI.css -->
     <style type="text/css">
       DIV.day
       {
@@ -51,69 +44,13 @@
       }
       </var:foreach>
     </style>
-
+    
+    <!-- Display the calendar header and the table view -->
     <div id="calendarContent">
-      <div id="daysView" class="daysView multicolumnDayView">
-        <div class="hours">
-          <var:foreach list="hoursToDisplay" item="currentTableHour"
-            ><div class="hour"><var:string value="currentTableHour" />:00</div
-              ></var:foreach>
-        </div>
-        <div class="hourLines">
-          <div class="hourLine hourLine0"><!-- space --></div
-            ><div class="hourLine hourLine1"><!-- space --></div
-            ><div class="hourLine hourLine2"><!-- space --></div
-            ><div class="hourLine hourLine3"><!-- space --></div
-            ><div class="hourLine hourLine4"><!-- space --></div
-            ><div class="hourLine hourLine5"><!-- space --></div
-            ><div class="hourLine hourLine6"><!-- space --></div
-            ><div class="hourLine hourLine7"><!-- space --></div
-            ><div class="hourLine hourLine8"><!-- space --></div
-            ><div class="hourLine hourLine9"><!-- space --></div
-            ><div class="hourLine hourLine10"><!-- space --></div
-            ><div class="hourLine hourLine11"><!-- space --></div
-            ><div class="hourLine hourLine12"><!-- space --></div
-            ><div class="hourLine hourLine13"><!-- space --></div
-            ><div class="hourLine hourLine14"><!-- space --></div
-            ><div class="hourLine hourLine15"><!-- space --></div
-            ><div class="hourLine hourLine16"><!-- space --></div
-            ><div class="hourLine hourLine17"><!-- space --></div
-            ><div class="hourLine hourLine18"><!-- space --></div
-            ><div class="hourLine hourLine19"><!-- space --></div
-            ><div class="hourLine hourLine20"><!-- space --></div
-            ><div class="hourLine hourLine21"><!-- space --></div
-            ><div class="hourLine hourLine22"><!-- space --></div
-            ><div class="hourLine hourLine23"><!-- space --></div>
-        </div>
-
-        <div class="days" var:day="selectedDate.shortDateString">
-          <var:foreach list="subscriptionUsers" item="currentTableUser"
-            ><div var:class="currentUserClasses"
-              var:user="currentTableUser"
-              ><div class="header"><var:string value="currentTableUser" /></div>
-              <div class="appointments">
-                <var:foreach list="hoursToDisplay" item="currentTableHour"
-                  ><div var:class="clickableHourCellClass"
-                    var:hour="currentAppointmentHour">
-                  </div></var:foreach>
-                <var:foreach list="appointmentsForCurrentUser" item="currentAppointment"
-                  ><var:component className="UIxCalInlineAptView"
-                    dayStartHour="dayStartHour"
-                    dayEndHour="dayEndHour"
-                    appointment="currentAppointment"
-                    formatter="aptFormatter"
-                    tooltipFormatter="aptTooltipFormatter"
-                    url="appointmentViewURL"
-                    const:style="dayoverview"
-                    queryDictionary="currentDateQueryParameters"
-                    referenceDate="selectedDate"
-                    canAccess="canAccessApt"
-                    /></var:foreach
-                  >
-              </div>
-            </div>
-          </var:foreach>
-        </div>
-      </div>
+      <var:component
+      className="UIxCalDayTable"
+      startDate="startDate"
+      const:CSSClass="dayOverview"
+      const:currentView="multicolumndayview"/>
     </div>
-  </container>
+  </container>
\ No newline at end of file
diff --git a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox
index cbee832c1..f8370f0f5 100644
--- a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox
+++ b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox
@@ -25,10 +25,10 @@
         <td>
           <var:popup list="printLayoutList" item="item"
           const:id="printLayoutList"
-          string="itemPrintLayoutText" /></td>
+          string="itemPrintLayoutText" selection="parentPrintLayout" /></td>
       </tr>
     </table>
-    
+  
     <!-- What to print -->
     <span class="caption"><var:string label:value="What to Print" /></span>
     <table class="frame">
@@ -81,6 +81,16 @@
     <!-- Options -->
     <span class="caption"><var:string label:value="Options" /></span>
     <table class="frame">
+      <tr>
+        <td>
+          <label>
+            <input type="checkbox" name="printWorkingHours" id="printHours" checked="true" onChange="onPrintWorkingHoursCheck(this);" />
+            <var:string label:value="Display working hours only" /></label></td></tr>
+      <tr>
+        <td>
+          <label>
+            <hr /></label></td></tr>
+      
       <tr>
         <td>
           <label>
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekView.wox b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
index 6b5debbb1..6e36775ef 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
@@ -40,6 +40,7 @@
           className="UIxCalDayTable"
           startDate="startDate"
           const:CSSClass="weekOverview"
-          const:numberOfDays="7" />
+          const:numberOfDays="7"
+          const:currentView="weekview"/>
     </div>
   </container>
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index 52eedff6b..5079bd7ad 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -392,7 +392,7 @@ DIV#daysView
   left: 0px; }
 
 DIV#daysView
-{ top: 120px;
+{ top: 97px;
   bottom: 0px;
   border-top: 1px solid #ccc;
   overflow: auto;
@@ -400,11 +400,12 @@ DIV#daysView
   right: 0px;}
 
 DIV#calendarHeader
-{ top: 50px;
+{ top: 25px;
   border: 0px;
-  height: 100px;
+  height: 85px;
   right: 0px; }
 
+DIV#calendarHeader DIV.calendarLabels,
 DIV#calendarHeader DIV.dayLabels,
 DIV#calendarHeader DIV.days
 { position: absolute;
@@ -414,8 +415,16 @@ DIV#calendarHeader DIV.days
   /* 'right' is computed from JS code when daysView is first drawn */
   overflow: hidden; }
 
+DIV#calendarHeader DIV.calendarLabels
+{ top: 11px;
+  height: 20px; 
+  border-left: 1px solid #ccc;
+  text-align: center;
+  font-style:italic;
+  font-size:150%;
+}
 DIV#calendarHeader DIV.dayLabels
-{ top: 0px;
+{ top: 32px;
   height: 35px; }
 
 DIV#calendarHeader DIV.dayLabels DIV.day
@@ -432,7 +441,11 @@ DIV#calendarHeader DIV.dayLabels
 DIV#calendarHeader DIV.days
 { cursor: pointer;
   bottom: 0px;
-  top: 35px; }
+  top: 67px;
+  z-index:0;
+  border-bottom:1px solid #ccc;
+  background:white;
+ }
 
 DIV#calendarHeader DIV.day,
 DIV#daysView DIV.day
@@ -530,7 +543,8 @@ DIV.monthView DIV.dayHeader
   text-align: right;
   cursor: pointer;
   color: #666;
-  -moz-user-select: none; }
+  -moz-user-select: none; 
+  }
 
 DIV#monthDaysView DIV.selectedDay DIV.dayHeader
 { font-weight: bold; }
@@ -540,7 +554,8 @@ DIV.monthView DIV.days
   cursor: pointer;
   bottom: 0px;
   left: 0px;
-  right: 0px; }
+  right: 0px; 
+  }
 
 DIV.monthView DIV.day
 { position: absolute;
@@ -1279,13 +1294,14 @@ DIV#daysView DIV.event.lasts96
 DIV.event > DIV.eventInside
 { position: absolute;
   overflow: hidden;
-  padding: 1px;
   top: 0px;
   bottom: 0px;
-  left: 2px;
-  right: 1px;
   -webkit-border-radius: 2px;
   border-radius: 2px; }
+  
+DIV.eventInside {
+  width:100%;
+}
 
 DIV.eventInside SPAN.location
 { font-size: smaller; }
@@ -1471,7 +1487,7 @@ DIV.event.draggable:hover DIV.rightDragGrip
 #ghostEndHour
 { bottom: -14px; }
 
-DIV#nowLineDisplay
+DIV.nowLineDisplay
 { position: relative;
   width: 100%;
   height: 2px;
@@ -1486,3 +1502,38 @@ DIV#freeBusyReplicas DIV
 { display: inline-block; height: 2em; }
 TD.attendees A.button
 { float: left; left: 19px; margin-top: 5px; }
+
+DIV#calendarContent .alert-box {
+    color:#555;
+    border-radius:10px;
+    font-family:Tahoma,Geneva,Arial,sans-serif;font-size:11px;
+    padding:10px 10px 10px 36px;
+    margin:10px;
+}
+
+DIV#calendarContent .alert-box span {
+    font-weight:bold;
+    text-transform:uppercase;
+}
+
+.error {
+    background:#ffecec url('error.png') no-repeat 10px 50%;
+    border:1px solid #f5aca6;
+}
+.success {
+    background:#e9ffd9 url('success.png') no-repeat 10px 50%;
+    border:1px solid #a6ca8a;
+}
+.warning {
+    background:#fff8c4 url('warning.png') no-repeat 10px 50%;
+    border:1px solid #f2c779;
+}
+.notice {
+    background:#e3f7fc url('notice.png') no-repeat 10px 50%;
+    border:1px solid #8ed9f6;
+}
+
+
+
+
+
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 33d179daa..8d2004357 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -34,15 +34,32 @@ var categoriesStyleSheet = null;
 var clipboard = null;
 var eventsToCopy = [];
 
+
+// This should probably go in the generic.js
 function printView() {
+  var flag = false;
+  var calendarsList = $("calendarList").children;
+  for (var i = 0; i < calendarsList.length; i++) {
+    if (calendarsList[i].down("input").checked) {
+      flag = true;
+      break;
+    }
+  }
+  if (flag)
+    window.open("printView","","width=660,height=470");
+
+  else
+    showAlertDialog("Please select at least one calendar");
   
-  window.open("printView","","width=660,height=470");
   
-  return false; /* stop following the link */
+  return false;
 }
 
 function newEvent(type, day, hour, duration) {
     var folder = null;
+   /* if (currentView == "multicolumndayview") {
+    	Need to find where the click register is saved
+    }*/
     if (UserDefaults['SOGoDefaultCalendar'] == 'personal')
         folder = $("calendarList").down("li");
     else if (UserDefaults['SOGoDefaultCalendar'] == 'first') {
@@ -911,8 +928,8 @@ function onDaySelect(node) {
                        && day != currentDay);
 
     var td = $(node).getParentWithTagName("td");
-    var table = $(td).getParentWithTagName("table");
-
+    
+    //  var table = $(td).getParentWithTagName("table");
     //   log ("table.selected: " + table.selected);
 
     if (document.selectedDate)
@@ -1613,7 +1630,7 @@ function refreshCalendarEvents(scrollEvent) {
     if (!currentDay)
         currentDay = todayDate.getDayString();
 
-    if (currentView == "dayview") {
+    if (currentView == "dayview" || currentView == "multicolumndayview") {
         sd = currentDay;
         ed = sd;
     }
@@ -1651,28 +1668,54 @@ function refreshCalendarEvents(scrollEvent) {
                               "scrollEvent": scrollEvent});
 }
 
-function _parseEvents(list) {
+function _parseEvents(list, calendars) {
     var newCalendarEvents = {};
 
-    for (var i = 0; i < list.length; i++) {
+    if (currentView == "multicolumndayview") {
+      var list;
+      for (var i = 0; i < calendars.length; i++) {
+    	list = calendars[i][0];
+        for (var j = 0; j < list.length; j++) {
+          var event = list[j];
+          var cname = event[0];
+          var calendar = event[1];
+          // log("parsed cname: " + cname + "; calendar: " + calendar);
+          var calendarDict = newCalendarEvents[calendar];
+          if (!calendarDict) {
+           calendarDict = {};
+           newCalendarEvents[calendar] = calendarDict;
+          }
+          var occurences = calendarDict[cname];
+          if (!occurences) {
+            occurences = [];
+            calendarDict[cname] = occurences;
+          }
+          event.blocks = [];
+          occurences.push(event);
+        }
+      }	
+    }
+    else {
+      for (var i = 0; i < list.length; i++) {
         var event = list[i];
         var cname = event[0];
         var calendar = event[1];
         // log("parsed cname: " + cname + "; calendar: " + calendar);
         var calendarDict = newCalendarEvents[calendar];
         if (!calendarDict) {
-            calendarDict = {};
-            newCalendarEvents[calendar] = calendarDict;
+         calendarDict = {};
+         newCalendarEvents[calendar] = calendarDict;
         }
         var occurences = calendarDict[cname];
         if (!occurences) {
-            occurences = [];
-            calendarDict[cname] = occurences;
+          occurences = [];
+          calendarDict[cname] = occurences;
         }
         event.blocks = [];
         occurences.push(event);
+      }
+    	
     }
-
     return newCalendarEvents;
 }
 
@@ -1704,15 +1747,28 @@ function refreshCalendarEventsCallback(http) {
     if (http.readyState == 4
         && http.status == 200) {
         if (http.responseText.length > 0) {
-            var eventsBlocks = http.responseText.evalJSON(true);
-            calendarEvents = _parseEvents(eventsBlocks[0]);
-            if (currentView == "monthview")
-                _drawMonthCalendarEvents(eventsBlocks[2], eventsBlocks[0]);
-            else {
-                _drawCalendarAllDayEvents(eventsBlocks[1], eventsBlocks[0]);
-                _drawCalendarEvents(eventsBlocks[2], eventsBlocks[0]);
-            }
-            _setupEventsDragAndDrop(eventsBlocks[0]);
+        	var eventsBlocks = http.responseText.evalJSON(true);
+        	
+        	if (currentView == "multicolumndayview") {
+        		calendarEvents = _parseEvents(null, eventsBlocks);
+        		_drawCalendarAllDayEvents(null, null, eventsBlocks);
+                _drawCalendarEvents(null, null, eventsBlocks);
+                for (var i = 0 ; i < eventsBlocks.length; i++) {
+                	_setupEventsDragAndDrop(eventsBlocks[i][0]);
+                }
+        	}
+        	else {
+        		calendarEvents = _parseEvents(eventsBlocks[0], null);
+                allDayEventsList = eventsBlocks[1];
+                eventsList = eventsBlocks[2];
+                if (currentView == "monthview")
+                    _drawMonthCalendarEvents(eventsList, eventsBlocks[0], null);
+                else {
+                    _drawCalendarAllDayEvents(allDayEventsList, eventsBlocks[0], null);
+                    _drawCalendarEvents(eventsList, eventsBlocks[0], null);
+                }
+                _setupEventsDragAndDrop(eventsBlocks[0]);
+        	}
             resetCategoriesStyles();
             onWindowResize(null);
         }
@@ -1875,20 +1931,37 @@ function newBaseEventDIV(eventRep, event, eventText) {
     return eventCell;
 }
 
-function _drawCalendarAllDayEvents(events, eventsData) {
+function _drawCalendarAllDayEvents(events, eventsData, columnsData) {
     var headerView = $("calendarHeader");
     var subdivs = headerView.childNodesWithTag("div");
-    var days = subdivs[1].childNodesWithTag("div");
-    for (var i = 0; i < days.length; i++) {
+    
+    if (currentView == "multicolumndayview"){
+      var days = subdivs[2].childNodesWithTag("div");
+    	for (var i = 0; i < days.length; i++) {
+    	  var parentDiv = days[i];
+    	  var calendar = columnsData[i];
+    	  var calendarAllDayEvents = calendar[1][0];
+    	  var calendarAllDayEventsData = calendar[0];
+    	  for (var j = 0; j < calendarAllDayEvents.length; j++) {
+            var eventRep = calendarAllDayEvents[j];
+            var nbr = eventRep.nbr;
+            var eventCell = newAllDayEventDIV(eventRep, calendarAllDayEventsData[nbr]);
+            parentDiv.appendChild(eventCell);
+          }
+      }
+    }
+    else {
+      var days = subdivs[1].childNodesWithTag("div");
+      for (var i = 0; i < days.length; i++) {
         var parentDiv = days[i];
         for (var j = 0; j < events[i].length; j++) {
-            var eventRep = events[i][j];
-            var nbr = eventRep.nbr;
-            var eventCell = newAllDayEventDIV(eventRep, eventsData[nbr]);
-            parentDiv.appendChild(eventCell);
+          var eventRep = events[i][j];
+          var nbr = eventRep.nbr;
+          var eventCell = newAllDayEventDIV(eventRep, eventsData[nbr]);
+          parentDiv.appendChild(eventCell);
         }
+      }
     }
-
     resizeCalendarHeaderDIV();
 }
 
@@ -1900,15 +1973,17 @@ function resizeCalendarHeaderDIV() {
     var daysView = $("daysView");
     if (headerView && daysView) {
         /* consts */
-        var headerViewBaseHeight = 70;
-        var daysViewBaseTop = 120;
-        var maxDelta = 80;
+        var headerViewBaseHeight = 90;
+        var daysViewBaseTop = 95;
         /* /consts */
 
         var maxEventPerDay = 0;
 
         var subdivs = headerView.childNodesWithTag("div");
-        var days = subdivs[1].childNodesWithTag("div");
+        if (currentView == "multicolumndayview")
+          var days = subdivs[2].childNodesWithTag("div");
+        else
+          var days = subdivs[1].childNodesWithTag("div");
         for (var i = 0; i < days.length; i++) {
             var parentDiv = days[i];
             var divs = parentDiv.childNodesWithTag("div");
@@ -1916,16 +1991,31 @@ function resizeCalendarHeaderDIV() {
                 maxEventPerDay = divs.length;
             }
         }
-
-        if (maxEventPerDay > 2) {
-            var delta = ((maxEventPerDay - 2) * 22) + 10;
-            if (delta > maxDelta) {
-                delta = maxDelta;
-            }
-            daysView.style.top = String(delta + daysViewBaseTop) + "px";
-            headerView.style.height = String(delta + headerViewBaseHeight) + "px";
+        if (maxEventPerDay > 0 && maxEventPerDay <= 4) {
+          var moveDaysView = (maxEventPerDay * 19.5);
+          var expendHeaderHeight = ((maxEventPerDay - 1) * 20);
+          var deltaMax = 60;
+          if (expendHeaderHeight > deltaMax){
+            expendHeaderHeight = deltaMax;
+            moveDaysView = deltaMax;
+          }
+          daysView.style.top = String(daysViewBaseTop + moveDaysView) + "px";
+          headerView.style.height = String(headerViewBaseHeight + expendHeaderHeight) + "px";
+        }
+        	
+        else if (maxEventPerDay > 4) {
+        	var deltaMax = 60;
+            daysView.style.top = String(daysViewBaseTop + deltaMax + 19) + "px";
+            headerView.style.height = String(headerViewBaseHeight + deltaMax) + "px";
         }
         else {
+        	var headerDays = document.getElementsByClassName("days")[0];
+        	headerDays.observe("mouseenter", function(event){
+        		headerDays.style.zIndex = "1";
+        	});	
+        	headerDays.observe("mouseleave", function(event){
+        		headerDays.style.zIndex = "0";
+        	});	
             daysView.style.top = null;
             headerView.style.height = null;
         }
@@ -1940,21 +2030,37 @@ function newAllDayEventDIV(eventRep, event) {
     return eventCell;
 }
 
-function _drawCalendarEvents(events, eventsData) {
+function _drawCalendarEvents(events, eventsData, columnsData) {
     var daysView = $("daysView");
     var subdivs = daysView.childNodesWithTag("div");
     for (var i = 0; i < subdivs.length; i++) {
         var subdiv = subdivs[i];
         if (subdiv.hasClassName("days")) {
             var days = subdiv.childNodesWithTag("div");
-            for (var j = 0; j < days.length; j++) {
+            if (currentView == "multicolumndayview") {
+              for (var j = 0; j < days.length; j++) {
+                  var parentDiv = days[j].childNodesWithTag("div")[0];
+                  var calendar = columnsData[j];
+                  var calendarEvents = calendar[2][0];
+                  var calendarEventsData = calendar[0];
+                  for (var k = 0; k < calendarEvents.length; k++) {
+                    var eventRep = calendarEvents[k];
+                    var nbr = eventRep.nbr;
+                    var eventCell = newEventDIV(eventRep, calendarEventsData[nbr]);
+                    parentDiv.appendChild(eventCell);
+                  }
+                } 
+            }
+            else {
+              for (var j = 0; j < days.length; j++) {
                 var parentDiv = days[j].childNodesWithTag("div")[0];
                 for (var k = 0; k < events[j].length; k++) {
-                    var eventRep = events[j][k];
-                    var nbr = eventRep.nbr;
-                    var eventCell = newEventDIV(eventRep, eventsData[nbr]);
-                    parentDiv.appendChild(eventCell);
+                  var eventRep = events[j][k];
+                  var nbr = eventRep.nbr;
+                  var eventCell = newEventDIV(eventRep, eventsData[nbr]);
+                  parentDiv.appendChild(eventCell);
                 }
+              } 	
             }
         }
     }
@@ -2033,7 +2139,8 @@ function adjustCalendarHeaderDIV() {
         var delta = ch.clientWidth - dv.clientWidth - 1;
         var styleElement = document.createElement("style");
         styleElement.type = "text/css";
-        var selectors = ["DIV#calendarHeader DIV.dayLabels",
+        var selectors = ["DIV#calendarHeader DIV.calendarLabels",
+                         "DIV#calendarHeader DIV.dayLabels",
                          "DIV#calendarHeader DIV.days"];
         var rule = ("right: " + delta + "px");
         if (styleElement.styleSheet && styleElement.styleSheet.addRule) {
@@ -2050,6 +2157,37 @@ function adjustCalendarHeaderDIV() {
     }
 }
 
+function adjustMultiColumnCalendarHeaderDIV() {
+	
+    var ch = $("calendarHeader");
+    var calendarLabels = ch.getElementsByClassName("calendarLabels")[0];
+    var calendarsToDisplay = calendarLabels.getElementsByClassName("calendarsToDisplay");
+    var dayLabels = ch.getElementsByClassName("dayLabels")[0].getElementsByClassName("dayColumn")[0];
+    var days = ch.getElementsByClassName("days")[0].getElementsByClassName("dayColumn");
+    var daysView = $("daysView").getElementsByClassName("dayColumn");
+    
+    var nbCalendars = calendarsToDisplay.length;
+    
+    if (nbCalendars > 0) {
+      var width = 100/nbCalendars;
+      var left = 0;
+      var position = "absolute";
+      for(var i=0; i < nbCalendars; i++){
+    	calendarsToDisplay[i].setStyle({ width: width + '%', left: left + '%', position: position}).show();
+    	days[i].setStyle({ width: width + '%', left: left + '%'}).show();
+    	daysView[i].setStyle({ width: width + '%', left: left + '%'}).show();
+        left += width;
+      }
+      dayLabels.setStyle({ width: '100%'}).show();	  
+    }
+    else {
+      $("calendarHeader").remove();
+      $("daysView").remove();
+      var htmlText = "<div class='alert-box notice'><span>" + _("notice:") + "</span>"+_("Please go ahead and select calendars")+"</div>";
+      $("calendarContent").innerHTML = htmlText;
+    }
+}
+
 function calendarDisplayCallback(http) {
     var div = $("calendarView");
     var daysView = $("daysView");
@@ -2078,6 +2216,9 @@ function calendarDisplayCallback(http) {
             currentView = http.callbackData["view"];
         if (http.callbackData["day"])
             currentDay = http.callbackData["day"];
+        
+        if (currentView == "multicolumndayview")
+        	adjustMultiColumnCalendarHeaderDIV();
 
         // Initialize contextual menu
         var menu = new Array(onMenuNewEventClick,
@@ -2091,10 +2232,7 @@ function calendarDisplayCallback(http) {
                              onMenuRawEvent
                             );
         var observer;
-        if (currentView == 'dayview') {
-            observer = $("daysView");
-        }
-        else if (currentView == 'weekview') {
+        if (currentView == 'dayview' || currentView == 'weekview' || currentView == 'multicolumndayview') {
             observer = $("daysView");
         }
         else {
@@ -2276,9 +2414,9 @@ function onHeaderClick(event) {
 
 function refreshCurrentFolder(id) {
     if (id == 'tasks')
-        refreshTasks();
+      refreshTasks();
     else
-        refreshEvents();
+      refreshEvents();
 }
 
 /* refreshes the "unifinder" list */
@@ -3388,39 +3526,61 @@ function onWindowResize(event) {
 }
 
 function drawNowLine() {
-    var d = new Date();
-    var hours = d.getHours();
-    var minutes = d.getMinutes();
-
-    if (currentView == "dayview") {
-        var today = new Date();
-        var m = parseInt(today.getMonth()) + 1;
-        var d = today.getDate();
-        if (m < 10)
-            m = "0" + m;
-        if (d < 10)
-            d = "0" + d;
-        var day = today.getFullYear() + "" + m + "" + d;
-        var targets = $$("DIV#daysView DIV.days DIV.day[day=" + day
-                         + "] DIV.clickableHourCell");
-    }
-    else if (currentView == "weekview")
-        var targets = $$("DIV#daysView DIV.days DIV.dayOfToday DIV.clickableHourCell");
-
-    if (targets) {
-        var target = targets[hours];
-
+  var d = new Date();
+  var hours = d.getHours();
+  var minutes = d.getMinutes();
+  
+  if (currentView == "dayview") {
+    var today = new Date();
+    var m = parseInt(today.getMonth()) + 1;
+    var d = today.getDate();
+    if (m < 10)
+      m = "0" + m;
+    if (d < 10)
+      d = "0" + d;
+    var day = today.getFullYear() + "" + m + "" + d;
+    var targets = $$("DIV#daysView DIV.days DIV.day[day=" + day
+                     + "] DIV.hourCells");
+  }
+  else if (currentView == "multicolumndayview") {
+    var targets = $$("DIV#daysView DIV.hourCells");
+  }
+  else if (currentView == "weekview")
+    var targets = $$("DIV#daysView DIV.days DIV.dayOfToday DIV.hourCells");
+  
+  else {
+    var targets = [];
+  }
+  
+  if (targets[0] != undefined) {
+    if (currentView == "multicolumndayview") {
+      var nbCalendars = targets.length;
+      for(var i = 0; i < nbCalendars; i++){
+        var target = targets[i].getElementsByClassName("clickableHourCell")[hours];
+        
         if (target) {
-            var div = $("nowLineDisplay");
-            if (!div)
-                div = new Element("div", {'id': 'nowLineDisplay'});
-
-            div.style.top = parseInt((minutes * target.offsetHeight / 60) - 1) + "px";
-            target.insertBefore(div, target.firstChild);
-
-            setTimeout("drawNowLine ();", 60000); // 1 min.
+          var div = targets[i].getElementsByClassName("nowLineDisplay")[0];
+          if (!div)
+            div = new Element("div", {'class': 'nowLineDisplay'});
+          
+          div.style.top = parseInt((minutes * target.offsetHeight / 60) - 1) + "px";
+          target.insertBefore(div, target.firstChild);
         }
+      }
     }
+    else {
+      var target = targets[0].getElementsByClassName("clickableHourCell")[hours];
+      if (target) {
+        var div = targets[0].getElementsByClassName("nowLineDisplay")[0];
+        if (!div)
+          div = new Element("div", {'class': 'nowLineDisplay'});
+        
+        div.style.top = parseInt((minutes * target.offsetHeight / 60) - 1) + "px";
+        target.insertBefore(div, target.firstChild);
+      }
+    }
+    setTimeout("drawNowLine ();", 60000); // 1 min.
+  }
 }
 
 function onListCollapse(event, element) {
diff --git a/UI/WebServerResources/UIxCalViewPrint.css b/UI/WebServerResources/UIxCalViewPrint.css
index ce51b67f6..71e161208 100644
--- a/UI/WebServerResources/UIxCalViewPrint.css
+++ b/UI/WebServerResources/UIxCalViewPrint.css
@@ -120,7 +120,7 @@ DIV#rightSide {
     DIV#rightFrame TD.label {
         color: #666;
         text-align: right;
-        width: 30%;
+        min-width:52px;
     }
 
 /********** Overriding SchedulerUI.css **********/
@@ -128,10 +128,20 @@ DIV#rightSide {
 DIV#calendarHeader {
   position:relative;
   top:0;
-  height:70px;
+  height:38px;
   right: 0px;
 }
 
+DIV#calendarHeader DIV.calendarLabels
+{ top: 1px;
+  height: 20px; 
+  border-left: 1px solid #ccc;
+  text-align: center;
+  font-style:italic;
+  font-size:150%;
+}
+
+DIV#calendarHeader DIV.calendarLabels,
 DIV#calendarHeader DIV.dayLabels,
 DIV#calendarHeader DIV.days {
   position:relative;
@@ -139,9 +149,12 @@ DIV#calendarHeader DIV.days {
   margin-left:50px;
 }
 
+DIV#calendarHeader DIV.dayLabels
+{ top: 1px; }
+
 DIV#calendarHeader DIV.days {
   top: 0;
-  height: 33px;
+  height: 1px;
   left: 0;
   right: 0;
 }
@@ -170,9 +183,13 @@ DIV#daysView DIV.hour {
 
 DIV.event {
   z-index:1;
-  border:solid black 1px;
-  background-color:white;
+  background-color: white;
   border-radius:5px;
+  border:1px solid black;
+
+}
+DIV.eventInside {
+  width:100%;
 }
 
 DIV#daysView DIV.event.starts0
@@ -596,10 +613,15 @@ LABEL {
     position:static;
     top:5px;
     left:5px;
+
   }
 
   DIV#rightFrame {
     border:none;
     overflow:visible;
   }
+
+  BODY {
+    background-color:white;
+  }
 }
diff --git a/UI/WebServerResources/UIxCalViewPrint.js b/UI/WebServerResources/UIxCalViewPrint.js
index d9910fd00..1fa1b6ddd 100644
--- a/UI/WebServerResources/UIxCalViewPrint.js
+++ b/UI/WebServerResources/UIxCalViewPrint.js
@@ -26,7 +26,7 @@ var firstDayOfWeek = window.opener.firstDayOfWeek;
 var printCompletedTasks=1;
 var printNoDueDateTasks=1;
 var eventsBlocks;
-var currentView;
+var currentPreview;
 var currentDay = window.parentvar("currentDay");
 var sd, ed;
 
@@ -38,7 +38,7 @@ function refreshContent() {
 }
 
 function updateDisplayView(data, newView) {
-  newView = ((newView) ? newView : currentView);
+  newView = ((newView) ? newView : currentPreview);
   var url = ApplicationBaseURL + "/" + newView;
   var day = null;
   
@@ -97,9 +97,24 @@ function previewDisplayCallback(http) {
     $("currentViewMenu").remove();
     $("listCollapse").remove();
     
-    // TODO : Month
-    _drawAllDayEvents(eventsBlocks[1], eventsBlocks[0]);
-    _drawEvents(eventsBlocks[2], eventsBlocks[0]);
+    if (currentPreview == "multicolumndayview") {
+      _drawCalendarAllDayEvents(null, null, eventsBlocks);
+    }
+    else {
+      allDayEventsList = eventsBlocks[1];
+      if (currentPreview == "monthview") {
+        //_drawMonthCalendarEvents(eventsList, eventsBlocks[0], null);
+      }
+      else {
+        _drawCalendarAllDayEvents(allDayEventsList, eventsBlocks[0], null);
+      }
+    }
+    // This ensure the diplay working hours checkbox when switching views
+    var printHoursCheckBox = $("printHours");
+    onPrintWorkingHoursCheck(printHoursCheckBox);
+    
+    // Add events color for each calendars
+    addCalendarsColor();
   }
   else
     log ("calendarDisplayCallback Ajax error ("+ http.readyState + "/" + http.status + ")");
@@ -107,17 +122,33 @@ function previewDisplayCallback(http) {
   return false;
 }
 
+function addCalendarsColor () {
+  var activeCalendarsId = [];
+  var allCalendars = window.parent$("calendarList");
+  var allColors = window.parentvar("UserSettings")['Calendar']['FolderColors'];
+  for (var i = 0; i < allCalendars.children.length; i++) {
+    if (allCalendars.children[i].down("input").checked){
+      folderName = allCalendars.children[i].getAttribute("id").substr(1);
+      color = allColors["sogo1:Calendar/" + folderName];
+      if (!color) {
+        color = "#AAAAAA";
+      }
+      appendStyleElement(folderName, color);
+    }
+  }
+}
+
 function refreshEvents() {
   var todayDate = new Date();
   
   if (!currentDay)
     currentDay = todayDate.getDayString();
   
-  if (currentView == "dayview") {
+  if (currentPreview == "dayview" || currentPreview == "multicolumndayview") { // dayView and MultiColumns View
     sd = currentDay;
     ed = sd;
   }
-  else if (currentView == "weekview") {
+  else if (currentPreview == "weekview") { // WeekView
     var startDate;
     startDate = currentDay.asDate();
     startDate = startDate.beginOfWeek();
@@ -144,7 +175,7 @@ function refreshEvents() {
     document.refreshEventsAjaxRequest.abort();
   }
   var url = (ApplicationBaseURL + "/eventsblocks?sd=" + sd + "&ed=" + ed
-             + "&view=" + currentView);
+             + "&view=" + currentPreview);
   
   document.refreshEventsAjaxRequest
   = triggerAjaxRequest(url, refreshEventsCallback,
@@ -157,9 +188,13 @@ function refreshTasks(){
     document.tasksListAjaxRequest.abort();
   }
   
+  var taskListFilter = window.parentvar("taskListFilter");
   url = window.parentvar("ApplicationBaseURL") + "/" + "taskslist?show-completed=" + printCompletedTasks
   + "&asc=" + sorting["task-ascending"]
-  + "&sort=" + sorting["task-attribute"];
+  + "&sort=" + sorting["task-attribute"]
+  + "&filterpopup=" + taskListFilter;
+  
+  // TODO : Is that really necessary ?
   var tasksList = window.parent$("tasksList");
   var selectedIds;
   if (tasksList)
@@ -176,11 +211,13 @@ function refreshEventsCallback(http) {
     if (http.responseText.length > 0) {
       eventsBlocks = http.responseText.evalJSON(true);
       $("rightFrameEvents").innerHTML = "";
-      if ($("printLayoutList").value == "0")
+      if ($("printLayoutList").value == "0" && eventsBlocks.length > 0) {
         _drawEventsCells(eventsBlocks);
-      else {
-        updateDisplayView(null, currentView);
       }
+      else {
+        updateDisplayView(null, currentPreview);
+      }
+      adjustFrames();
     }
   }
   else
@@ -193,8 +230,10 @@ function refreshTasksListCallback(http) {
     if (http.responseText.length > 0) {
       var tasksBlocks = http.responseText.evalJSON(true);
       $("rightFrameTasks").innerHTML = "";
-      var layout = $("printLayoutList").value;
-      _drawTasksCells(tasksBlocks);
+      if (tasksBlocks.length > 0) {
+        _drawTasksCells(tasksBlocks);
+        adjustFrames();
+      }
     }
   }
   else
@@ -204,10 +243,21 @@ function refreshTasksListCallback(http) {
 function _drawEventsCells(eventsBlocks) {
   var events = _("Events");
   $("rightFrameEvents").insert("<h3>"+events+"</h3>");
-  for(var i=0; i < eventsBlocks[0].length; i++)
-  {
-    var event = _parseEvent(eventsBlocks[0][i]);
-    $("rightFrameEvents").insert(event);
+  if (currentPreview == "multicolumndayview") {
+    for(var i=0; i < eventsBlocks.length; i++) // calendars
+    {
+      for (var j = 0; j < eventsBlocks[i][0].length; j++) {
+        var event = _parseEvent(eventsBlocks[i][0][j]);
+        $("rightFrameEvents").insert(event);
+      }
+    }
+  }
+  else {
+    for(var i=0; i < eventsBlocks[0].length; i++)
+    {
+      var event = _parseEvent(eventsBlocks[0][i]);
+      $("rightFrameEvents").insert(event);
+    }
   }
 }
 
@@ -225,44 +275,113 @@ function _drawTasksCells(tasksBlocks) {
 
 // TODO : Maybe use the drawfunction from the schedulerUI.js
 
-function _drawEvents(events, eventsData) {
+function _drawCalendarEvents(events, eventsData, columnsData) {
   var daysView = $("daysView");
   var subdivs = daysView.childNodesWithTag("div");
+  var printHoursCheckBox = $("printHours");
   for (var i = 0; i < subdivs.length; i++) {
     var subdiv = subdivs[i];
     if (subdiv.hasClassName("days")) {
       var days = subdiv.childNodesWithTag("div");
-      for (var j = 0; j < days.length; j++) {
-        var parentDiv = days[j].childNodesWithTag("div")[0];
-        for (var k = 0; k < events[j].length; k++) {
-          var eventRep = events[j][k];
-          var nbr = eventRep.nbr;
-          var eventCell = newEventDIV(eventRep, eventsData[nbr]);
-          parentDiv.appendChild(eventCell);
+      if (currentPreview == "multicolumndayview") {
+        for (var j = 0; j < days.length; j++) {
+          var parentDiv = days[j].childNodesWithTag("div")[0];
+          var calendar = columnsData[j];
+          var calendarEvents = calendar[2][0];
+          var calendarEventsData = calendar[0];
+          if (parentDiv.getElementsByClassName("event").length > 0) {
+            var oldEvents = parentDiv.getElementsByClassName("event");
+            var length = oldEvents.length - 1;
+            for (var x = length; x >= 0; x--){
+              oldEvents[x].remove();
+            }
+          }
+          for (var k = 0; k < calendarEvents.length; k++) {
+            var eventRep = calendarEvents[k];
+            var nbr = eventRep.nbr;
+            
+            if (printHoursCheckBox.checked) {
+              var offset = _computeOffset(parentDiv);
+              if ((eventRep.start - offset[0]) > 0 && (eventRep.start - offset[0]) < offset[1]) {
+                var eventCell = newEventDIV(eventRep, calendarEventsData[nbr], offset[0]);
+                parentDiv.appendChild(eventCell);
+              }
+            }
+            else {
+              var eventCell = newEventDIV(eventRep, calendarEventsData[nbr], null);
+              parentDiv.appendChild(eventCell);
+            }
+          }
+        }
+      }
+      else {
+        for (var j = 0; j < days.length; j++) {
+          var parentDiv = days[j].childNodesWithTag("div")[0];
+          if (parentDiv.getElementsByClassName("event").length > 0) {
+            var oldEvents = parentDiv.getElementsByClassName("event");
+            var length = oldEvents.length - 1;
+            for (var x = length; x >= 0; x--){
+              oldEvents[x].remove();
+            }
+          }
+          for (var k = 0; k < events[j].length; k++) {
+            var eventRep = events[j][k];
+            var nbr = eventRep.nbr;
+            if (printHoursCheckBox.checked) {
+              var offset = _computeOffset(parentDiv);
+              if ((eventRep.start - offset[0]) > 0 && (eventRep.start - offset[0]) < offset[1]) {
+                var eventCell = newEventDIV(eventRep, eventsData[nbr], offset[0]);
+                parentDiv.appendChild(eventCell);
+              }
+            }
+            else {
+              var eventCell = newEventDIV(eventRep, eventsData[nbr], null);
+              parentDiv.appendChild(eventCell);
+            }
+          }
         }
       }
     }
   }
 }
 
-function _drawAllDayEvents(events, eventsData) {
+function _drawCalendarAllDayEvents(events, eventsData, columnsData) {
   var headerView = $("calendarHeader");
   var subdivs = headerView.childNodesWithTag("div");
-  var days = subdivs[1].childNodesWithTag("div");
-  for (var i = 0; i < days.length; i++) {
-    var parentDiv = days[i];
-    for (var j = 0; j < events[i].length; j++) {
-      var eventRep = events[i][j];
-      var nbr = eventRep.nbr;
-      var eventCell = newAllDayEventDIV(eventRep, eventsData[nbr]);
-      parentDiv.appendChild(eventCell);
+  
+  if (currentPreview == "multicolumndayview"){
+    var days = subdivs[2].childNodesWithTag("div");
+    for (var i = 0; i < days.length; i++) {
+      var parentDiv = days[i];
+      var calendar = columnsData[i];
+      var calendarAllDayEvents = calendar[1][0];
+      var calendarAllDayEventsData = calendar[0];
+      for (var j = 0; j < calendarAllDayEvents.length; j++) {
+        var eventRep = calendarAllDayEvents[j];
+        var nbr = eventRep.nbr;
+        var eventCell = newAllDayEventDIV(eventRep, calendarAllDayEventsData[nbr]);
+        parentDiv.appendChild(eventCell);
+      }
     }
   }
+  else {
+    var days = subdivs[1].childNodesWithTag("div");
+    for (var i = 0; i < days.length; i++) {
+      var parentDiv = days[i];
+      for (var j = 0; j < events[i].length; j++) {
+        var eventRep = events[i][j];
+        var nbr = eventRep.nbr;
+        var eventCell = newAllDayEventDIV(eventRep, eventsData[nbr]);
+        parentDiv.appendChild(eventCell);
+      }
+    }
+  }
+  adjustPreviewHeader();
 }
 
 // todo : month
 
-function newEventDIV(eventRep, event) {
+function newEventDIV(eventRep, event, offset) {
   var eventCell = newBaseEventDIV(eventRep, event, event[4]);
   
   var pc = 100 / eventRep.siblings;
@@ -270,7 +389,12 @@ function newEventDIV(eventRep, event) {
   eventCell.style.left = left + "%";
   var right = Math.floor(100 - (eventRep.position + 1) * pc);
   eventCell.style.right = right + "%";
-  eventCell.addClassName("starts" + eventRep.start);
+  if (offset != null) {
+    eventCell.addClassName("starts" + (eventRep.start - offset));
+  }
+  else {
+    eventCell.addClassName("starts" + eventRep.start);
+  }
   eventCell.addClassName("lasts" + eventRep.length);
   
   if (event[7]) {
@@ -376,6 +500,17 @@ function newBaseEventDIV(eventRep, event, eventText) {
   return eventCell;
 }
 
+function appendStyleElement(folderPath, color) {
+  if (document.styleSheets) {
+    var fgColor = getContrastingTextColor(color);
+    var styleElement = document.styleSheets[3];
+    
+    styleElement.insertRule(".calendarFolder" + folderPath +
+                            "{background-color: " + color + " !important;" +
+                            " color: " + fgColor + " !important;}", styleElement.cssRules.length);
+  }
+}
+
 function _parseEvent(event) {
   // Localized strings :
   var start = _("Start:");
@@ -426,6 +561,29 @@ function _parseTask(task) {
   return parsedTask;
 }
 
+function _computeOffset(hoursCells) {
+  var outOfDayCells = hoursCells.getElementsByClassName("outOfDay");
+  var count = 1;
+  var offset = [];
+  var buffer;
+  var j = 1;
+  for (var i = 0; i < outOfDayCells.length; i++) {
+    hourCell1 = parseInt(outOfDayCells[i].getAttribute("hour")) + 100;
+    hourCell2 = parseInt(outOfDayCells[j].getAttribute("hour"));
+    if (hourCell1 == hourCell2) {
+      count += 1;
+    }
+    else {
+      break;
+    }
+    j ++;
+  }
+  offset.push(count * 4);
+  offset.push((hourCell2 / 100 * 4) - (count * 4));
+  
+  return offset;
+}
+
 /************************************** Preview Navigation *****************************************/
 
 function onCalendarGotoDay(node) {
@@ -481,74 +639,157 @@ function dateSelectorCallback(http) {
   return false;
 }
 
-/*********************** Input Field, Checkboxes, Radio and listMenu *********************************/
+/*********************** Input Field, listMenu, Checkboxes and Radio *********************************/
 
 function onInputTitleChange(event){
   var inputFieldTitle = $("inputFieldTitle").value;
   if (inputFieldTitle)
     document.getElementById("rightFrameTitle").innerHTML = inputFieldTitle + "<br />";
   else
-    document.getElementById("rightFrameTitle").innerHTML = inputFieldTitle;
+    document.getElementById("rightFrameTitle").remove();
+  
+  return false;
 }
 
 function onPrintLayoutListChange() {
-  var selectedLayout = $("printLayoutList").value;
   var parentView = window.parentvar("currentView");
+  var selectedLayout = $("printLayoutList").value;
+  document.getElementById("printHours").disabled = (selectedLayout == 0);
   switch(selectedLayout) {
     case "0": // List view
       window.resizeTo(700,500);
-      currentView = parentView;
-      ajustFrames();
+      currentPreview = parentView;
       break;
       
     case "1": // Day view
       window.resizeTo(1010,500);
-      currentView = "dayview";
-      ajustFrames(currentView);
+      currentPreview = "dayview";
       break;
-      
-    case "2": // Week view
+    
+    case "2": // Multi-columns view
       window.resizeTo(1010,500);
-      currentView = "weekview";
-      ajustFrames(currentView);
+      currentPreview = "multicolumndayview";
       break;
       
-      //todo : month
+    case "3": // Week view
+      window.resizeTo(1010,500);
+      currentPreview = "weekview";
+      break;
+    
+    /*case "4": // Month view
+      window.resizeTo(1010,500);
+      currentPreview = "monthview";
+      break;*/
   }
-  
   refreshContent();
+  return false;
 }
 
-function ajustFrames(view) {
-  if (view == "dayview" || view == "weekview") {
+function adjustPreviewHeader() {
+  // 1 - Check if there is any allDay Events. If not reduce the space taken
+  var selectedLayout = $("printLayoutList").value;
+  if (selectedLayout != 0) {
+    var calendarHeader = $("calendarHeader");
+    var allDayDisplay = $("calendarHeader").getElementsByClassName("days");
+    var allDayEvents = $("calendarHeader").getElementsByClassName("eventInside");
+    var eventHeight = 22;
+    var headerHeight = 38;
+    if (selectedLayout == 1) { // Since there is only one column in day view
+      height = allDayEvents.length * eventHeight;
+    }
+    else { // Applies only on week view and multi-columns view
+      var nbEventsMax = 0
+      var eventClass = $("calendarHeader").getElementsByClassName("event");
+      for (var i = 0; i < allDayDisplay[0].childNodes.length; i++) {
+        if (allDayDisplay[0].childNodes[i].firstChild != null) {
+          count = allDayDisplay[0].childNodes[i].getElementsByClassName("event").length;
+          if (count > nbEventsMax) {
+            nbEventsMax = count;
+          }
+        }
+      }
+      height = nbEventsMax * eventHeight;
+      if (selectedLayout == 2) {
+        headerHeight = 58;
+        adjustMultiColumnCalendarHeaderDIV();
+      }
+    }
+    calendarHeader.style.height = (height + headerHeight) + "px";
+    allDayDisplay[0].style.height = height + "px";
+  }
+}
+
+function adjustMultiColumnCalendarHeaderDIV() {
+  var ch = $("calendarHeader");
+  var calendarLabels = ch.getElementsByClassName("calendarLabels")[0];
+  var calendarsToDisplay = calendarLabels.getElementsByClassName("calendarsToDisplay");
+  var dayLabels = ch.getElementsByClassName("dayLabels")[0].getElementsByClassName("dayColumn")[0];
+  var days = ch.getElementsByClassName("days")[0].getElementsByClassName("dayColumn");
+  var daysView = $("daysView").getElementsByClassName("dayColumn");
+  
+  var nbCalendars = calendarsToDisplay.length;
+  
+  if (nbCalendars > 0) {
+    var width = 100/nbCalendars;
+    var left = 0;
+    var position = "absolute";
+    for(var i=0; i < nbCalendars; i++){
+    	calendarsToDisplay[i].setStyle({ width: width + '%', left: left + '%', position: position}).show();
+    	days[i].setStyle({ width: width + '%', left: left + '%'}).show();
+    	daysView[i].setStyle({ width: width + '%', left: left + '%'}).show();
+      left += width;
+    }
+    dayLabels.setStyle({ width: '100%'}).show();
+  }
+  else {
+    $("calendarHeader").remove();
+    $("daysView").remove();
+    var htmlText = "<div class='alert-box notice'><span>" + _("notice:") + "</span>"+_("Please go ahead and select calendars")+"</div>";
+    $("calendarContent").innerHTML = htmlText;
+  }
+}
+
+function adjustFrames() {
+  var view = $("printLayoutList").value;
+  if (view == 0) {
+    var eventsCheckBox = $("printEvents");
+    var tasksCheckBox = $("printTasks");
+    onEventsCheck(eventsCheckBox);
+    onTasksCheck(tasksCheckBox);
+    document.getElementById("rightFrameTasks").style.pageBreakBefore = 'auto';
+    document.getElementById("rightFrameTasks").style.pageBreakInside = 'auto';
+  }
+  else {
     document.getElementById("rightFrameEvents").style.width = '100%';
     document.getElementById("rightFrameTasks").style.width = '100%';
     document.getElementById("rightFrameTasks").style.pageBreakBefore = 'always';
     document.getElementById("rightFrameTasks").style.pageBreakInside = 'avoid';
-    
   }
-  else {
-    document.getElementById("rightFrameEvents").style.width = '49.5%';
-    document.getElementById("rightFrameTasks").style.width = '49.5%';
-    document.getElementById("rightFrameTasks").style.pageBreakBefore = 'auto';
-    document.getElementById("rightFrameTasks").style.pageBreakInside = 'auto';
-  }
-  
+  return false;
 }
 
 function onEventsCheck(checkBox) {
-  if(checkBox.checked){
-    document.getElementById("rightFrameEvents").style.display = 'block';
+  var printOptions = document.getElementById("printHours");
+  var selectedLayout = $("printLayoutList").value;
+  if (!checkBox.checked || selectedLayout == 0)
+    printOptions.disabled = true;
+  else
+    printOptions.disabled = false;
+  
+  var events = $("rightFrameEvents").childNodesWithTag("DIV");
+  if(checkBox.checked && events.length > 0){
+    $("rightFrameEvents").style.display = 'block';
     if ($("printLayoutList").value == 0){
-      document.getElementById("rightFrameTasks").style.width = '49.5%';
+      $("rightFrameTasks").style.width = '49.5%';
     }
   }
   else {
-    document.getElementById("rightFrameEvents").style.display = 'none';
+    $("rightFrameEvents").style.display = 'none';
     if ($("printLayoutList").value == 0){
-      document.getElementById("rightFrameTasks").style.width = '100%';
+      $("rightFrameTasks").style.width = '100%';
     }
   }
+  return false;
 }
 
 function onTasksCheck(checkBox) {
@@ -556,18 +797,58 @@ function onTasksCheck(checkBox) {
   for (var i = 0; i < printOptions.length; i++)
     printOptions[i].disabled = !checkBox.checked;
   
-  if(checkBox.checked) {
-    document.getElementById("rightFrameTasks").style.display = 'block';
+  var tasks = $("rightFrameTasks").childNodesWithTag("DIV");
+  if(checkBox.checked && tasks.length > 0) {
+    $("rightFrameTasks").style.display = 'block';
     if ($("printLayoutList").value == 0){
-      document.getElementById("rightFrameEvents").style.width = '49.5%';
+      $("rightFrameEvents").style.width = '49.5%';
     }
   }
   else {
-    document.getElementById("rightFrameTasks").style.display = 'none';
+    $("rightFrameTasks").style.display = 'none';
     if ($("printLayoutList").value == 0){
-      document.getElementById("rightFrameEvents").style.width = '100%';
+      $("rightFrameEvents").style.width = '100%';
     }
   }
+  return false;
+}
+
+function onPrintWorkingHoursCheck(checkBox) {
+  var isCheked = checkBox.checked;
+  var outOfDayCells = $$("DIV#daysView .outOfDay");
+  var hours = $$("DIV#daysView .hour");
+  var hoursOutOfDay = [];
+  for (var i = 0; i < outOfDayCells.length; i++) {
+    var buffer = outOfDayCells[i].getAttribute("hour").substr(0,1);
+    if (buffer != "0") {
+      buffer += outOfDayCells[i].getAttribute("hour").substr(1,1);
+    }
+    else {
+      buffer = outOfDayCells[i].getAttribute("hour").substr(1,1);
+    }
+    if(isCheked) {
+      outOfDayCells[i].hide();
+      hours[buffer].hide();
+    }
+    else {
+      outOfDayCells[i].show();
+      hours[buffer].show();
+    }
+  }
+  
+  if (currentPreview == "multicolumndayview") {
+    _drawCalendarEvents(null, null, eventsBlocks);
+  }
+  else {
+    eventsList = eventsBlocks[2];
+    if (currentPreview == "monthview") {
+      //_drawMonthCalendarEvents(eventsList, eventsBlocks[0], null);
+    }
+    else {
+      _drawCalendarEvents(eventsList, eventsBlocks[0], null);
+    }
+  }
+  return false;
 }
 
 /*function onPrintDateCheck() {
@@ -580,12 +861,12 @@ function onTasksCheck(checkBox) {
 
 function onPrintCompletedTasksCheck(checkBox) {
   printCompletedTasks = (checkBox.checked ? 1 : 0);
-  refreshTasks();
+  refreshContent();
 }
 
 function onPrintNoDueDateTasksCheck(checkBox) {
   printNoDueDateTasks = (checkBox.checked ? 1 : 0);
-  refreshTasks();
+  refreshContent();
 }
 
 /************** Date picker functions *************
@@ -633,7 +914,6 @@ function onPrintClick(event) {
 /**************************** Initialization *******************************************/
 
 function init() {
-  
   initializePrintSettings();
   //initializeWhatToPrint();
   //initializeOptions();
@@ -661,6 +941,6 @@ function initializePrintSettings() {
  }*/
 
 /*function initializeOptions() {
- }*/
+}*/
 
 document.observe("dom:loaded", init);
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 3da86b4cf..bd2e7b43a 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -28,7 +28,8 @@ TABLE, DIV, IMG
   font-size: inherit;
   border: 0px;
   margin: 0px;
-  padding: 0px; }
+  padding: 0px;
+  word-break:break-all; }
 
 FIELDSET
 { border: 1px solid #aaa;