diff --git a/ChangeLog b/ChangeLog
index 735ae6831..f8dea3890 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-17  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/Contacts/SOGoFolder+CardDAV.m (-parseContactFilter:):
+	we now consider all DOM elements from the text-match element. This
+	fixes problems when the query contains one or more HTML entities.
+
 2011-02-16  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxPreferences.js (-appendSieveFilterRow):
diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m
index db9da4aef..2f62f1641 100644
--- a/SoObjects/Contacts/SOGoFolder+CardDAV.m
+++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m
@@ -1,6 +1,6 @@
 /* NSObject+CardDAV.m - this file is part of SOGo
  *
- * Copyright (C) 2007-2009 Inverse inc.
+ * Copyright (C) 2007-2011 Inverse inc.
  *
  * Author: Ludovic Marcotte <ludovic@inverse.ca>
  *
@@ -30,6 +30,7 @@
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
 #import <DOM/DOMProtocols.h>
+#import <DOM/DOMNode.h>
 #import <SaxObjC/SaxObjC.h>
 #import <SaxObjC/XMLNamespaces.h>
 
@@ -142,8 +143,8 @@
 	  && [(NSArray *) [[ranges objectAtIndex: 0] childNodes] count])
 	{
 	  filterData = [NSMutableDictionary dictionary];
-	  [filterData setObject: [[(NSArray *)[[ranges objectAtIndex: 0] childNodes] lastObject] data]
-		      forKey: [filterElement attribute: @"name"]];
+	  [filterData setObject: [(NGDOMNode *)[ranges objectAtIndex: 0] textValue]
+			 forKey: [filterElement attribute: @"name"]];
 	}
     }