diff --git a/NEWS b/NEWS
index 0d4165cf2..35889fda2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+0.9.0-20071217 (1.0 rc3)
+------------------------
+- mail folders state is now saved;
+- the status of participants in represented with an icon;
+
 0.9.0-20071127 (1.0 rc2)
 ------------------------
 - the user password is no longer transmitted in the url when logging in;
@@ -14,8 +19,6 @@
 - invitation from Google calendar are now correctly parsed;
 - it is now possible to search events by title in the Calendar module;
 - all the writable calendars are now listed in the event edition dialog;
-- mail folders state is now save;
-- the status of participants in represented with an icon;
 
 0.9.0-20071119 (1.0 rc1)
 ------------------------
diff --git a/SoObjects/Appointments/product.plist b/SoObjects/Appointments/product.plist
index af1952f61..3250fef2c 100644
--- a/SoObjects/Appointments/product.plist
+++ b/SoObjects/Appointments/product.plist
@@ -38,7 +38,7 @@
       defaultRoles = {
 	"ViewAllComponent" = ( "Owner", "Organizer", "Participant", "ComponentModifier", "ComponentResponder", "ComponentViewer" );
 	"ViewDAndT" = ( "Organizer", "Participant", "ComponentDAndTViewer" );
-	"ModifyComponent" = ( "Owner", "Organizer" );
+	"ModifyComponent" = ( "Owner", "Organizer", "ComponentModifier" );
 	"RespondToComponent" = ( "Participant", "ComponentModifier", "ComponentResponder" );
 	"Access Object" = ( "Owner", "Organizer", "Participant", "ComponentModifier", "ComponentResponder", "ComponentViewer", "ComponentDAndTViewer" );
 	"Change Images and Files" = ( "Owner", "Organizer", "ComponentModifier" );
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 4e61724da..aa756c844 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -1096,7 +1096,8 @@
     {
       if (![sm validatePermission: SOGoCalendarPerm_ModifyComponent
 	       onObject: clientObject
-	       inContext: context])
+	       inContext: context]
+	  || [component userIsOrganizer: currentUser])
 	toolbarFilename = adminToolbar;
       else
 	toolbarFilename = @"SOGoComponentClose.toolbar";