diff --git a/Scripts/tmpwatch b/Scripts/tmpwatch
index b834a417d..989191b2f 100644
--- a/Scripts/tmpwatch
+++ b/Scripts/tmpwatch
@@ -3,5 +3,5 @@
 # SOGOSPOOL must match the value of the configuration parameter SOGoMailSpoolPath
 SOGOSPOOL=/var/spool/sogo
 
-/usr/sbin/tmpwatch 24 "$SOGOSPOOL"
+find "$SOGOSPOOL" -type f -user sogo -atime +23 -delete > /dev/null
 find "$SOGOSPOOL" -mindepth 1 -type d -user sogo -empty -delete > /dev/null
diff --git a/packaging/debian-multiarch/control b/packaging/debian-multiarch/control
index d3376f5c2..b22e7a1cc 100644
--- a/packaging/debian-multiarch/control
+++ b/packaging/debian-multiarch/control
@@ -10,7 +10,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3, zip, liblasso3 (>= 2.3.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3, zip, liblasso3 (>= 2.3.5)
 Recommends: memcached
 Suggests: nginx
 Description: a modern and scalable groupware
diff --git a/packaging/debian-multiarch/control-no-openchange b/packaging/debian-multiarch/control-no-openchange
index 02dc887f3..f8dd18089 100644
--- a/packaging/debian-multiarch/control-no-openchange
+++ b/packaging/debian-multiarch/control-no-openchange
@@ -10,7 +10,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3, zip, liblasso3 (>= 2.3.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3, zip, liblasso3 (>= 2.3.5)
 Recommends: memcached
 Suggests: nginx
 Description: a modern and scalable groupware
diff --git a/packaging/debian-multiarch/sogo.cron.daily b/packaging/debian-multiarch/sogo.cron.daily
index d28a8faa8..989191b2f 100644
--- a/packaging/debian-multiarch/sogo.cron.daily
+++ b/packaging/debian-multiarch/sogo.cron.daily
@@ -1,6 +1,7 @@
 #!/bin/sh
 
+# SOGOSPOOL must match the value of the configuration parameter SOGoMailSpoolPath
 SOGOSPOOL=/var/spool/sogo
 
-/usr/sbin/tmpreaper 24 "$SOGOSPOOL"
+find "$SOGOSPOOL" -type f -user sogo -atime +23 -delete > /dev/null
 find "$SOGOSPOOL" -mindepth 1 -type d -user sogo -empty -delete > /dev/null
diff --git a/packaging/debian/control b/packaging/debian/control
index ceee29543..b81405206 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.1
 Package: sogo
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3, zip, liblasso3 (>= 2.3.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3, zip, liblasso3 (>= 2.3.5)
 Recommends: memcached
 Suggests: nginx
 Description: a modern and scalable groupware
diff --git a/packaging/debian/control-squeeze b/packaging/debian/control-squeeze
index 9e8ab3a82..e43e2df25 100644
--- a/packaging/debian/control-squeeze
+++ b/packaging/debian/control-squeeze
@@ -8,7 +8,7 @@ Standards-Version: 3.9.1
 Package: sogo
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3, liblasso3 (>= 2.3.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3, liblasso3 (>= 2.3.5)
 Recommends: memcached
 Suggests: nginx
 Description: a modern and scalable groupware
diff --git a/packaging/debian/sogo.cron.daily b/packaging/debian/sogo.cron.daily
index d28a8faa8..989191b2f 100644
--- a/packaging/debian/sogo.cron.daily
+++ b/packaging/debian/sogo.cron.daily
@@ -1,6 +1,7 @@
 #!/bin/sh
 
+# SOGOSPOOL must match the value of the configuration parameter SOGoMailSpoolPath
 SOGOSPOOL=/var/spool/sogo
 
-/usr/sbin/tmpreaper 24 "$SOGOSPOOL"
+find "$SOGOSPOOL" -type f -user sogo -atime +23 -delete > /dev/null
 find "$SOGOSPOOL" -mindepth 1 -type d -user sogo -empty -delete > /dev/null
diff --git a/packaging/rhel/sogo.spec b/packaging/rhel/sogo.spec
index c2ca0ab1d..daa61928f 100644
--- a/packaging/rhel/sogo.spec
+++ b/packaging/rhel/sogo.spec
@@ -36,7 +36,7 @@ Group:        Productivity/Groupware
 Source:       SOGo-%{sogo_version}.tar.gz
 Prefix:       /usr
 AutoReqProv:  off
-Requires:     gnustep-base >= 1.23, sope%{sope_major_version}%{sope_minor_version}-core, httpd, sope%{sope_major_version}%{sope_minor_version}-core, sope%{sope_major_version}%{sope_minor_version}-appserver, sope%{sope_major_version}%{sope_minor_version}-ldap, sope%{sope_major_version}%{sope_minor_version}-cards >= %{sogo_version}, sope%{sope_major_version}%{sope_minor_version}-gdl1-contentstore >= %{sogo_version}, sope%{sope_major_version}%{sope_minor_version}-sbjson, libmemcached, memcached, tmpwatch, zip
+Requires:     gnustep-base >= 1.23, sope%{sope_major_version}%{sope_minor_version}-core, httpd, sope%{sope_major_version}%{sope_minor_version}-core, sope%{sope_major_version}%{sope_minor_version}-appserver, sope%{sope_major_version}%{sope_minor_version}-ldap, sope%{sope_major_version}%{sope_minor_version}-cards >= %{sogo_version}, sope%{sope_major_version}%{sope_minor_version}-gdl1-contentstore >= %{sogo_version}, sope%{sope_major_version}%{sope_minor_version}-sbjson, libmemcached, memcached, zip
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:  gcc-objc gnustep-base gnustep-make sope%{sope_major_version}%{sope_minor_version}-appserver-devel sope%{sope_major_version}%{sope_minor_version}-core-devel sope%{sope_major_version}%{sope_minor_version}-ldap-devel sope%{sope_major_version}%{sope_minor_version}-mime-devel sope%{sope_major_version}%{sope_minor_version}-xml-devel sope%{sope_major_version}%{sope_minor_version}-gdl1-devel sope%{sope_major_version}%{sope_minor_version}-sbjson-devel libmemcached-devel sed %{?oc_build_depends}