diff --git a/ChangeLog b/ChangeLog
index 65b9a4fab..227eea70c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-14  Cyril Robert <crobert@inverse.ca>
+
+	* UI/Scheduler/UIxComponentEditor.m: Added a default title for
+	vevents and vtodos
+
 2009-07-14  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/Appointments/SOGoCalendarComponent.m
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 089a67ebc..5fbc6afd7 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -614,6 +614,19 @@ iRANGE(2);
 
 - (NSString *) title
 {
+  SOGoObject <SOGoComponentOccurence> *co;
+  NSString *tag;
+
+  co = [self clientObject];
+  if ([co isNew] && [co isKindOfClass: [SOGoCalendarComponent class]])
+    {
+      tag = [co componentTag];
+      if ([tag isEqualToString: @"vevent"])
+        [self setTitle: [self labelForKey: @"New Event"]];
+      else if ([tag isEqualToString: @"vtodo"])
+        [self setTitle: [self labelForKey: @"New Task"]];
+    }
+
   return title;
 }
 
diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js
index dabd8af18..0b8940ebc 100644
--- a/UI/WebServerResources/UIxComponentEditor.js
+++ b/UI/WebServerResources/UIxComponentEditor.js
@@ -135,11 +135,17 @@ function onComponentEditorLoad(event) {
   $("repeatList").observe("change", onPopupRecurrenceWindow);
 	$("reminderHref").observe("click", onPopupReminderWindow);
 	$("reminderList").observe("change", onPopupReminderWindow);
+  $("summary").observe("keyup", onSummaryChange);
 
 	Event.observe(window, "resize", onWindowResize);
 
   onPopupRecurrenceWindow(null);
 	onPopupReminderWindow(null);
+  onSummaryChange (null);
+}
+
+function onSummaryChange (e) {
+  document.title = $("summary").value;
 }
 
 function onWindowResize(event) {