diff --git a/ChangeLog b/ChangeLog
index d24aacfb9..fafec959e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,11 @@
 	rather use CSS capabilities for proper formatting.
 	This is _WAY_ faster on very large mails.
  
+2007-10-10  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Scheduler/UIxComponentEditor.m
+	([UIxComponentEditor -componentCalendar]): returns the calendar
+	object of the current event.
 
 2007-10-05  Ludovic Marcotte  <ludovic@inverse.ca>
 
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index b82a1b299..a972885d6 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -365,7 +365,11 @@
 
 - (NSString *) componentCalendar
 {
-  return @"/";
+  SOGoAppointmentFolder *calendar;
+
+  calendar = [[self clientObject] container];
+  
+  return calendar;
 }
 
 /* priorities */
diff --git a/UI/WebServerResources/UIxCalUserRightsEditor.js b/UI/WebServerResources/UIxCalUserRightsEditor.js
index 6ef7e2fd6..174cf154c 100644
--- a/UI/WebServerResources/UIxCalUserRightsEditor.js
+++ b/UI/WebServerResources/UIxCalUserRightsEditor.js
@@ -3,7 +3,7 @@ function onCancelClick(event) {
 }
 
 function initACLButtons() {
-   $("cancelButton").addEventListener("click", onCancelClick, false);
+  Event.observe($("cancelButton"), "click", onCancelClick);
 }
 
 addEvent(window, "load", initACLButtons);