diff --git a/ChangeLog b/ChangeLog
index 18153f1f5..ee5eaabb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-26  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Scheduler/UIxComponentEditor.m (-setComponent:): retrieve the
+	organizer from the master component when not present in the
+	current component.
+
 2011-01-24  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/SOGo/LDAPSource.m (_qualifierForFilter:): added
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 891796575..3dac37db6 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -1,8 +1,9 @@
 /* UIxComponentEditor.m - this file is part of SOGo
  *
- * Copyright (C) 2006-2010 Inverse inc.
+ * Copyright (C) 2006-2011 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *         Francis Lachapelle <flachapelle@inverse.ca>
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -589,10 +590,10 @@ iRANGE(2);
    doing this... for example, when the clientObject is set */
 - (void) setComponent: (iCalRepeatableEntityObject *) newComponent
 {
-//   iCalRecurrenceRule *rrule;
   SOGoObject *co;
   SOGoUserManager *um;
   NSString *owner, *ownerEmail;
+  iCalRepeatableEntityObject *masterComponent;
 
   if (!component)
     {
@@ -611,8 +612,16 @@ iRANGE(2);
 	  ASSIGN (status, [component status]);
           ASSIGN (categories,
                   [[component categories] vCardSubvaluesWithSeparator: ',']);
-	  ASSIGN (organizer, [component organizer]);
-	  
+	  if ([[[component organizer] rfc822Email] length])
+	    {
+	      ASSIGN (organizer, [component organizer]);
+	    }
+	  else
+	    {
+	      masterComponent = [[[component parent] allObjects] objectAtIndex: 0];
+	      ASSIGN (organizer, [masterComponent organizer]);
+	    }
+
 	  [self _loadCategories];
           if (!jsonAttendees)
             [self _loadAttendees];