diff --git a/ChangeLog b/ChangeLog
index 571e4010b..415c50a45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-06-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoObject.m ([SOGoObject
+	-_urlPreferringParticle:expectedoverThisOne:possible]): remove the
+	first 3 elements of the path array if the url returned by
+	baseURLInContext: returns a hostname.
+
 	* SoObjects/Mailer/SOGoMailFolder.m ([SOGoMailFolder
 	-_adjustOwner]): sharedFolderName and otherUsersFolderName may be
 	nil, in which case a crash happens when calling hasPrefix:.
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 46fffc697..33d660174 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -828,6 +828,12 @@ static BOOL kontactGroupDAV = YES;
   baseURL = [[self baseURLInContext: context] stringByUnescapingURL];
   path = [NSMutableArray arrayWithArray: [baseURL componentsSeparatedByString:
 						    @"/"]];
+  if ([baseURL hasPrefix: @"http"])
+    {
+      [path removeObjectAtIndex: 2];
+      [path removeObjectAtIndex: 1];
+      [path removeObjectAtIndex: 0];
+    }
   urlMethod = [path objectAtIndex: 2];
   if (![urlMethod isEqualToString: expected])
     {