diff --git a/ChangeLog b/ChangeLog
index 3eb1a972e..15845363d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
 	* UI/WebServerResources/MailerUI.js
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 9046b3229..435d723a8 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 */