diff --git a/ChangeLog b/ChangeLog
index b4c1e0b1e..54360bd72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-03-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxAttendeesEditor.m ([UIxAttendeesEditor
+	-zoomList]): new method that returns the list of available zoom factors.
+
 	* UI/Scheduler/UIxTaskEditor.m ([UIxTaskEditor
 	-changeStatusAction]): rewrote method.
 
diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 047259cd3..2a97ad70b 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -299,6 +299,12 @@
 "reminder_1_WEEK_BEFORE" = "1 week before";
 "reminder_CUSTOM" = "Custom...";
 
+"zoom_400" = "400%";
+"zoom_200" = "200%";
+"zoom_100" = "100%";
+"zoom_50" = "50%";
+"zoom_25" = "25%";
+
 /* validation errors */
 
 validate_notitle           = "No title is set, continue?";
diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index 4663adb8d..187fef43d 100644
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -300,6 +300,12 @@
 "reminder_1_WEEK_BEFORE" = "1 semaine avant";
 "reminder_CUSTOM" = "Personnaliser...";
 
+"zoom_400" = "400%";
+"zoom_200" = "200%";
+"zoom_100" = "100%";
+"zoom_50" = "50%";
+"zoom_25" = "25%";
+
 /* validation errors */
 
 validate_notitle           = "Le titre n'est pas rempli. Continuer quand-même ?";
diff --git a/UI/Scheduler/UIxAttendeesEditor.h b/UI/Scheduler/UIxAttendeesEditor.h
index dc58eedab..ad556e5ce 100644
--- a/UI/Scheduler/UIxAttendeesEditor.h
+++ b/UI/Scheduler/UIxAttendeesEditor.h
@@ -26,6 +26,18 @@
 #import <SOGoUI/UIxComponent.h>
 
 @interface UIxAttendeesEditor : UIxComponent
+{
+  NSString *item;
+//   NSString *zoom;
+}
+
+- (void) setItem: (NSString *) newItem;
+- (NSString *) item;
+
+- (NSArray *) zoomList;
+- (void) setZoom: (NSString *) zoom;
+- (NSString *) zoom;
+- (NSString *) itemZoomText;
 
 @end
 
diff --git a/UI/Scheduler/UIxAttendeesEditor.m b/UI/Scheduler/UIxAttendeesEditor.m
index 103cb1201..0191c921a 100644
--- a/UI/Scheduler/UIxAttendeesEditor.m
+++ b/UI/Scheduler/UIxAttendeesEditor.m
@@ -34,4 +34,44 @@
   return self;
 }
 
+- (void) setItem: (NSString *) newItem
+{
+  item = newItem;
+}
+
+- (NSString *) item
+{
+  return item;
+}
+
+- (NSArray *) zoomList
+{
+  static NSArray *zoomItems = nil;
+
+  if (!zoomItems)
+    {
+      zoomItems = [NSArray arrayWithObjects: @"400", @"200", @"100",
+			   @"50", @"25", nil];
+      [zoomItems retain];
+    }
+
+  return zoomItems;
+}
+
+- (void) setZoom: (NSString *) zoom
+{
+//   ASSIGN (zoom, _zoom);
+}
+
+- (NSString *) zoom
+{
+  return @"100";
+//   return zoom;
+}
+
+- (NSString *) itemZoomText
+{
+  return [self labelForKey: [NSString stringWithFormat: @"zoom_%@", item]];
+}
+
 @end
diff --git a/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox b/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
index 62a89147b..1a37f96c4 100644
--- a/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
@@ -12,6 +12,20 @@
   const:popup="YES">
   <script type="text/javascript" rsrc:src="skycalendar.js"><!-- space --></script>
   <div id="attendeesView">
+    <div id="freeBusyViewButtons">
+      <var:string label:value="Suggest time slot:"/>
+      <a href="#" class="button _disabled"
+	><var:string label:value="Previous slot" /></a>
+      <a href="#" class="button _disabled"
+	><var:string label:value="Next slot" /></a>
+    </div>
+    <div id="freeBusyZoomButtons">
+      <var:string label:value="Zoom:"/>
+      <a href="#" class="button _disabled"><var:string label:value="-" /></a>
+      <var:popup list="zoomList" item="item"
+	string="itemZoomText" selection="zoom"/>
+      <a href="#" class="button _disabled"><var:string label:value="+" /></a>
+    </div>
     <div id="freeBusyView">
       <table id="freeBusy"
 	xmlns="http://www.w3.org/1999/xhtml"
@@ -57,10 +71,6 @@
 	</ul>
       </div>
       <div id="freeBusyButtons">
-        <a href="#" class="button _disabled"
-	  ><var:string label:value="Previous slot" /></a>
-        <a href="#" class="button _disabled"
-	  ><var:string label:value="Next slot" /></a><br />
         <a href="#" class="button _disabled"
 	  ><var:string label:value="Previous hour" /></a>
         <a href="#" class="button _disabled"
diff --git a/UI/WebServerResources/UIxAttendeesEditor.css b/UI/WebServerResources/UIxAttendeesEditor.css
index be9c1f2bc..f8592b78a 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.css
+++ b/UI/WebServerResources/UIxAttendeesEditor.css
@@ -10,6 +10,7 @@ DIV#attendeesView
 
 DIV#freeBusyView
 { position: static;
+  margin-top: 2em;
   margin-left: 12.5em;
   overflow: auto;
   border-top: 2px solid #222;
@@ -154,13 +155,31 @@ SPAN[class~="freeBusyZoneElement"].maybe-busy
 SPAN[class~="colorBox"].noFreeBusy
 { background-color: #559; }
 
+DIV#freeBusyViewButtons
+{ position: absolute;
+  margin: 0px;
+  border: 0px;
+  padding: 3px;
+  height: 2em;
+  top: 0px;
+  left: 13em; }
+
+DIV#freeBusyZoomButtons
+{ position: absolute;
+  margin: 0px;
+  border: 0px;
+  padding: 0px;
+  height: 2em;
+  top: 0px;
+  right: 0px; }
+
 DIV#freeBusyButtons
 { position: absolute;
-  top: 6em;
+  top: 7em;
   left: 0px;
-  width: 30em;
-  height: 4em;
-  text-align: center; }
+  text-align: left;
+  width: 20em;
+  height: 2em; }
 
 DIV#freeBusyButtons A.button
 { width: 5em; }
diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js
index e924afd94..b7d979566 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.js
+++ b/UI/WebServerResources/UIxAttendeesEditor.js
@@ -302,6 +302,16 @@ function initializeWindowButtons() {
 
    okButton.addEventListener("click", onEditorOkClick, false);
    cancelButton.addEventListener("click", onEditorCancelClick, false);
+
+   var buttons = $("freeBusyViewButtons").childNodesWithTag("a");
+   for (var i = 0; i < buttons.length; i++)
+      buttons[i].addEventListener("click", listRowMouseDownHandler, false);
+   buttons = $("freeBusyZoomButtons").childNodesWithTag("a");
+   for (var i = 0; i < buttons.length; i++)
+      buttons[i].addEventListener("click", listRowMouseDownHandler, false);
+   buttons = $("freeBusyButtons").childNodesWithTag("a");
+   for (var i = 0; i < buttons.length; i++)
+      buttons[i].addEventListener("click", listRowMouseDownHandler, false);
 }
 
 function onEditorOkClick(event) {