diff --git a/ChangeLog b/ChangeLog
index dc52d445a..554f87236 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,14 @@
 	refreshUnseenCounts so the unseen count is updated when the user
 	clicks on the "Get Mail" button.
 
+2010-11-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Scheduler/UIxAppointmentEditor.m (-saveAction): check the
+	equality of componentCalendar and previousCalendar by comparing
+	their ocsPath, since the objects themselves might be different
+	instances when the current user has logged in with a different
+	identifier than his/her uid.
+
 2010-11-12  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/MailerUI.js (messageFlagCallback): now
diff --git a/SoObjects/SOGo/SOGoUserManager.m b/SoObjects/SOGo/SOGoUserManager.m
index d98edd1fd..9ab8aa2d3 100644
--- a/SoObjects/SOGo/SOGoUserManager.m
+++ b/SoObjects/SOGo/SOGoUserManager.m
@@ -443,8 +443,8 @@
         setUserAttributes: [currentUser jsonRepresentation]
                  forLogin: _login];
     }
-    else
-      checkOK = NO;
+  else
+    checkOK = NO;
 
   return checkOK;
 }
diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings
index cfb939155..c6afeb7dc 100644
--- a/UI/PreferencesUI/German.lproj/Localizable.strings
+++ b/UI/PreferencesUI/German.lproj/Localizable.strings
@@ -184,7 +184,7 @@
 
 /* Return receipts */
 "When I receive a request for a return receipt:" = "Wenn ich die Anforderung einer Empfangsbestätigung erhalte:";
-"Never send a return receipt" = "Niemals eine Beatätigung senden";
+"Never send a return receipt" = "Niemals eine Bestätigung senden";
 "Allow return receipts for some messages" = "Erlaube eine Bestätigung für einige Nachrichten";
 "If I'm not in the To or Cc of the message:" = "Wenn ich nicht in An oder Cc der Nachricht bin:";
 "If the sender is outside my domain:" = "Wenn der Absender außerhalb meiner Domain ist:";
diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
index e13d76644..1478e529a 100644
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -375,7 +375,9 @@
 
   if ([co isNew])
     {
-      if (componentCalendar && componentCalendar != previousCalendar)
+      if (componentCalendar
+          && ![[componentCalendar ocsPath]
+                isEqualToString: [previousCalendar ocsPath]])
 	{
 	  // New event in a different calendar -- make sure the user can
 	  // write to the selected calendar since the rights were verified
@@ -397,7 +399,9 @@
       // The event was modified -- save it.
       [co saveComponent: event];
 
-      if (componentCalendar && componentCalendar != previousCalendar)
+      if (componentCalendar
+          && ![[componentCalendar ocsPath]
+                isEqualToString: [previousCalendar ocsPath]])
 	{
 	  // The event was moved to a different calendar.
 	  if (![sm validatePermission: SoPerm_DeleteObjects