diff --git a/ChangeLog b/ChangeLog
index 3b2992c8c..413fc320f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Contacts/SOGoFolder+CardDAV.m ([SOGoFolder
+	-davAddressbookQuery:queryContext]): when empty values are fed to
+	SOGo, their dictionary should be explicitly set to nil.
+
 2008-01-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoCache.m ([SOGoCache
diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m
index 18b739de2..b8d83bb05 100644
--- a/SoObjects/Contacts/SOGoFolder+CardDAV.m
+++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m
@@ -95,14 +95,17 @@
       [self _isValidFilter: [filterElement attribute: @"name"]])
     {
       ranges = [filterElement getElementsByTagName: @"text-match"];
-     
-      if ([(NSArray *)ranges count] && [(NSArray *)[[ranges objectAtIndex: 0] childNodes] count])
+
+      if ([(NSArray *)ranges count]
+	  && [(NSArray *)[[ranges objectAtIndex: 0] childNodes] count])
 	{
 	  filterData = [NSMutableDictionary new];
 	  [filterData autorelease];
 	  [filterData setObject: [[(NSArray *)[[ranges objectAtIndex: 0] childNodes] lastObject] data]
 		      forKey: [filterElement attribute: @"name"]];
 	}
+      else
+	filterData = nil;
     }
   else
     filterData = nil;