diff --git a/ChangeLog b/ChangeLog
index 307d0b8cc..d9070ac43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoGCSFolder.m
+	(-initializeQuickTablesAclsInContext:): don't give the right to
+	view everything to users who can delete objects. This may cause
+	deletion from working from a web method, but everyone who uses
+	such as configuration will probably use DAV instead.
+
 2009-08-18  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Scheduler/UIxCalendarProperties.m ([UIxCalendarProperties
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index edcc5c0fd..b4eec7d26 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -1171,10 +1171,8 @@ static NSArray *childRecordFields = nil;
       /* we only grant "userCanAccessAllObjects" for role "ObjectEraser" and
          not "ObjectCreator" because the latter doesn't imply we can read
          properties from subobjects or even know their existence. */
-      userCanAccessAllObjects = ([[self ownerInContext: localContext]
-                                       isEqualToString: login]
-                                 || [[self aclsForUser: login]
-                                        containsObject: SOGoRole_ObjectEraser]);
+      userCanAccessAllObjects
+        = [[self ownerInContext: localContext] isEqualToString: login];
     }
 }
 
diff --git a/debian/control b/debian/control
index e467e416a..07a1934a1 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.8.2
 Package: sogo
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, apache2
+Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper
 Suggests: nginx
 Description: a modern and scalable groupware
  SOGo is a groupware server built around OpenGroupware.org (OGo) and
diff --git a/debian/rules b/debian/rules
index af4f59612..8ad6d9e1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,8 @@ install-arch: build-arch
 	cp Scripts/sogod-wrapper debian/tmp/usr/sbin/sogod-wrapper
 	mkdir -p debian/tmp/usr/share/lintian/overrides
 	cp debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo
-	cp Apache/SOGo-debian.conf /etc/apache2/conf.d/SOGo.conf
+	mkdir -p debian/tmp/etc/apache2/conf.d
+	cp Apache/SOGo-debian.conf debian/tmp/etc/apache2/conf.d/SOGo.conf
 
 binary-indep: build-indep install-indep