diff --git a/ChangeLog b/ChangeLog
index 23678ee00..db529721d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-04-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoCalendarComponent.m
+	(-lookupOccurence:): the looked up occurrence might be the master
+	event.
+
 	* UI/WebServerResources/UIxMailPopupView.js (initPopupMailer): we
 	assign window.messageUID from here now (by concatenating
 	"mailboxName" and "messageName", as it will disappear if the
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 2aebb0be3..b20668814 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -257,7 +257,8 @@
   return iCalString;
 }
 
-static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID)
+static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
+                                    NSString *recID)
 {
   unsigned int seconds, recSeconds;
   
@@ -290,6 +291,9 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, NSStr
 	    count++;
 	}
     }
+  else if (_occurenceHasID (component, recID))
+    /* The "master" event could be that occurrence. */
+    occurence = component;
 
   return occurence;
 }