diff --git a/ChangeLog b/ChangeLog
index 996b13ac1..b12f27ae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-19  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* SoObjects/Appointments/SOGoUserFolder+Appointments.m
+	(_davPersonalCalendarURL): We make sure we handle the
+	presence or not of the trailing slash when we call
+	-davURLAsString on the parent object. See
+	http://www.scalableogo.org/bugs/view.php?id=74 for
+	all details.
+
 2009-12-14  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* UI/MailPartViewers/UIxMailPartHTMLViewer.m
diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.m b/SoObjects/Appointments/SOGoUserFolder+Appointments.m
index 1adf97852..ac1ba9c86 100644
--- a/SoObjects/Appointments/SOGoUserFolder+Appointments.m
+++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.m
@@ -1,6 +1,6 @@
 /* SOGoUserFolder+Appointments.m - this file is part of SOGo
  *
- * Copyright (C) 2008 Inverse inc.
+ * Copyright (C) 2008-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -97,13 +97,17 @@
 
 - (NSArray *) _davPersonalCalendarURL
 {
-  NSArray *tag;
   SOGoAppointmentFolders *parent;
+  NSArray *tag, *parentURL;
 
   parent = [self privateCalendars: @"Calendar" inContext: context];
+  parentURL = [parent davURLAsString];
+
+  if ([parentURL hasSuffix: @"/"])
+    parentURL = [parentURL substringToIndex: [parentURL length]-1];
+  
   tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
-                 [NSString stringWithFormat: @"%@personal/",
-			   [parent davURLAsString]],
+                 [NSString stringWithFormat: @"%@/personal/", parentURL],
 		 nil];
 
   return [NSArray arrayWithObject: tag];
diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m
index 328c610cc..4851301a6 100644
--- a/UI/MailPartViewers/UIxMailPartViewer.m
+++ b/UI/MailPartViewers/UIxMailPartViewer.m
@@ -162,7 +162,7 @@
 - (NSString *) flatContentAsString
 {
   /* Note: we even have the line count in the body-info! */
-  NSString *s, *charset;
+  NSString *charset, *s;
   NSData *content;
 
   content = [self decodedFlatContent];