diff --git a/NEWS b/NEWS
index 8a7a7aa20..4b88640e7 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Bug fixes
  - correctly handle the References header over EAS (#3365)
  - make sure English is always used when generating Date headers using EAS (#3356)
  - don't escape quoted strings during versit generation
+ - we now return all cards when we receive an empty addressbook-query REPORT
 
 2.3.2 (2015-09-16)
 ------------------
diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.h b/SoObjects/Contacts/SOGoFolder+CardDAV.h
index 2e0e88b0f..4ab4278ce 100644
--- a/SoObjects/Contacts/SOGoFolder+CardDAV.h
+++ b/SoObjects/Contacts/SOGoFolder+CardDAV.h
@@ -1,8 +1,6 @@
 /* NSObject+CardDAV.h - this file is part of SOGo
  *
- * Copyright (C) 2007 Inverse inc.
- *
- * Author: Ludovic Marcotte <ludovic@inverse.ca>
+ * Copyright (C) 2007-2015 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m
index 2644e228f..3c9130670 100644
--- a/SoObjects/Contacts/SOGoFolder+CardDAV.m
+++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m
@@ -1,8 +1,6 @@
 /* NSObject+CardDAV.m - this file is part of SOGo
  *
- * Copyright (C) 2007-2011 Inverse inc.
- *
- * Author: Ludovic Marcotte <ludovic@inverse.ca>
+ * Copyright (C) 2007-2015 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -187,6 +185,10 @@
         [filters addObject: filter];
     }
 
+  // If no filters are provided, we return everything.
+  if (![filters count])
+      [filters addObject: [NSDictionary dictionaryWithObject: @"."  forKey: @"mail"]];
+
   return filters;
 }