diff --git a/ChangeLog b/ChangeLog
index efb9ae8ec..ca5486e35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-03-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoFolder+CardDAV.m (_isValidFilter:):
+	accept "email" as filter name.
+	(_appendObject:withBaseURL:toREPORTResponse:): fixed the ordering
+	of XML elements as the address*-data props where put outside of
+	the <D:prop> tree.
+
 	* SoObjects/SOGo/LDAPSource.m (-allEntryIDs): take the _filter
 	ivar into account.
 
diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m
index fed4c2105..3466e940e 100644
--- a/SoObjects/Contacts/SOGoFolder+CardDAV.m
+++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m
@@ -73,17 +73,17 @@
       etagLine = [NSString stringWithFormat: @"<D:getetag>%@</D:getetag>",
                            [component davEntityTag]];
       [r appendContentString: etagLine];
-      [r appendContentString: @"</D:prop>"
-                        @"<D:status>HTTP/1.1 200 OK</D:status>"
-                       @"</D:propstat>"
-                        @"<C:addressbook-data>"];
+      [r appendContentString: @"<C:address-data>"];
       contactString = [[component contentAsString] stringByEscapingXMLString];
       [r appendContentString: contactString];
-      [r appendContentString: @"</C:addressbook-data>"
-                        @"<C:address-data>"];
-      [r appendContentString: contactString];
       [r appendContentString: @"</C:address-data>"
-                     @"</D:response>"];
+                        @"<C:addressbook-data>"];
+      [r appendContentString: contactString];
+      [r appendContentString: @"</C:addressbook-data>"
+         @"</D:prop>"
+         @"<D:status>HTTP/1.1 200 OK</D:status>"
+         @"</D:propstat>"
+         @"</D:response>"];
     }
 }
 
@@ -124,6 +124,7 @@
 
   return ([newString isEqualToString: @"sn"]
 	  || [newString isEqualToString: @"givenname"]
+	  || [newString isEqualToString: @"email"]
 	  || [newString isEqualToString: @"mail"]
 	  || [newString isEqualToString: @"telephonenumber"]);
 }