diff --git a/ChangeLog b/ChangeLog
index 3f0847334..13d6bcab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoObject.m
+	(_urlPreferringParticle:overThisOne:): instead of risking
+	confusion between SOPE, NSURL and friends, we revert this change
+	(see below) and choose other ways to avoid escaping of "@", "%",
+	etc...
+
+	* SoObjects/SOGo/NSString+Utilities.m (-stringByEscapingURLPart):
+	(revert) removed useless method.
+
 2009-09-28  Cyril Robert <crobert@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAptMailInvitation.m: Added Spanish definition.
diff --git a/SoObjects/SOGo/NSString+Utilities.h b/SoObjects/SOGo/NSString+Utilities.h
index 801e17973..1b29c1df2 100644
--- a/SoObjects/SOGo/NSString+Utilities.h
+++ b/SoObjects/SOGo/NSString+Utilities.h
@@ -44,8 +44,6 @@
 
 - (NSString *) doubleQuotedString;
 
-- (NSString *) stringByEscapingURLPart;
-
 - (NSString *) jsonRepresentation;
 
 - (NSString *) asCSSIdentifier;
diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index f166ca0ea..792ea6a0b 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -304,19 +304,6 @@ static NSMutableCharacterSet *urlStartChars = nil;
   return [self doubleQuotedString];
 }
 
-- (NSString *) stringByEscapingURLPart
-{
-  NSString *rc;
-
-  rc = [self stringByUnescapingURL];
-  rc = [rc stringByReplacingString: @"@"
-                        withString: @"%40"];
-  rc = [rc stringByReplacingString: @" "
-                        withString: @"%20"];
-
-  return rc;
-}
-
 - (NSString *) asCSSIdentifier
 {
   NSMutableString *cssIdentifier;
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index bcf9b3372..e508c6d9f 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -1143,12 +1143,11 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
 {
   NSURL *serverURL, *url;
   NSMutableArray *path;
-  NSString *baseURL, *urlMethod, *fullHost, *part;
+  NSString *baseURL, *urlMethod, *fullHost;
   NSNumber *port;
-  int count, max;
 
   serverURL = [context serverURL];
-  baseURL = [self baseURLInContext: context];
+  baseURL = [[self baseURLInContext: context] stringByUnescapingURL];
   path = [NSMutableArray arrayWithArray: [baseURL componentsSeparatedByString:
 						    @"/"]];
   if ([baseURL hasPrefix: @"http"])
@@ -1166,14 +1165,6 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
 	[path insertObject: expected atIndex: 2];
     }
 
-  max = [path count];
-  for (count = 3; count < max; count++)
-    {
-      part = [path objectAtIndex: count];
-      [path replaceObjectAtIndex: count
-                      withObject: [part stringByEscapingURLPart]];
-    }
-
   port = [serverURL port];
   if (port)
     fullHost = [NSString stringWithFormat: @"%@:%@",