diff --git a/ChangeLog b/ChangeLog
index 2cd1afe47..cb3021d12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,25 @@
+<<<<<<< variant A
 2012-07-20  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* UI/MailPartViewers/UIxMailRenderingContext.m
 	(_shouldDisplayAsAttachment:): refactored to consider
 	the "bodyId" parameter only for non text/* parts.
 
+>>>>>>> variant B
+2012-07-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	(_appendCycleException:firstInstanceCalendarDateRange:fromRow:forRange:withTimeZone:toArray:):
+	return immediately if the occurrence does not have a valid
+	recurrence-id.
+
+####### Ancestor
+======= end
 2012-07-20  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/MailerUI.js (onEmailTo): append the email
+	address from the href attribute if it doesn't appear in the link content.
+
 	* UI/MailPartViewers/UIxMailPartHTMLViewer.m
 	(-startElement:namespace:rawName:attributes:): don't skip "mailto:"
 	href.
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 29a64b77b..50cdd92f9 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -863,6 +863,11 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 
   newRecord = nil;
   recurrenceId = [component recurrenceId];
+  if (!recurrenceId)
+    {
+      [self errorWithFormat: @"ignored component with an empty EXCEPTION-ID"];
+      return;
+    }
   
   if (tz)
     {
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 3422fee67..25af280f4 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -1790,7 +1790,11 @@ function newContactFromEmail(event) {
 }
 
 function onEmailTo(event) {
-    openMailTo(this.innerHTML.strip());
+    var s = this.innerHTML.strip();
+    if (!/@/.test(s)) {
+        s += ' <' + this.href.substr(7) + '>';
+    }
+    openMailTo(s);
     Event.stop(event);
     return false;
 }