diff --git a/ChangeLog b/ChangeLog
index ed4652b16..b149e7b45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoObject.m ([SOGoObject
+	-lookupName:lookupNameinContext:localContextacquire:acquire]): do
+	not use the object returned by "bindToObject:inContext:".
+	Otherwise the clientObject isn't set in the context.
+
 2008-09-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/MailPartViewers/UIxMailPartAlternativeViewer.m
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 580efdc11..e7ebed6de 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -400,7 +400,7 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
 	{
 	  obj = [[self soClass] lookupKey: lookupName inContext: localContext];
 	  if (obj)
-	    obj = [obj bindToObject: self inContext: localContext];
+	    [obj bindToObject: self inContext: localContext];
 	}
 
       if (obj)