diff --git a/plinth/modules/email/__init__.py b/plinth/modules/email/__init__.py
index a3e90ab3f..b6c6a034c 100644
--- a/plinth/modules/email/__init__.py
+++ b/plinth/modules/email/__init__.py
@@ -76,15 +76,11 @@ class EmailApp(plinth.app.App):
             'packages-email', [
                 'postfix', 'postfix-ldap', 'postfix-sqlite', 'dovecot-pop3d',
                 'dovecot-imapd', 'dovecot-ldap', 'dovecot-lmtpd',
-                'dovecot-managesieved'
+                'dovecot-managesieved', 'rspamd', 'redis-server'
             ], conflicts=['exim4-base', 'exim4-config', 'exim4-daemon-light'],
             conflicts_action=Packages.ConflictsAction.IGNORE)
         self.add(packages)
 
-        packages = Packages('packages-email-skip-rec', ['rspamd'],
-                            skip_recommends=True)
-        self.add(packages)
-
         listen_ports = [(25, 'tcp4'), (25, 'tcp6'), (465, 'tcp4'),
                         (465, 'tcp6'), (587, 'tcp4'), (587, 'tcp6')]
         daemon = Daemon('daemon-email-postfix', 'postfix',
@@ -105,6 +101,10 @@ class EmailApp(plinth.app.App):
                         listen_ports=listen_ports)
         self.add(daemon)
 
+        daemon = Daemon('daemon-email-redis', 'redis-server',
+                        listen_ports=[(6379, 'tcp4'), (6379, 'tcp6')])
+        self.add(daemon)
+
         port_names = ['smtp', 'smtps', 'smtp-submission', 'imaps', 'pop3s']
         firewall = Firewall('firewall-email', info.name, ports=port_names,
                             is_external=True)
diff --git a/plinth/modules/email/data/etc/rspamd/local.d/freedombox-redis.conf b/plinth/modules/email/data/etc/rspamd/local.d/freedombox-redis.conf
new file mode 100644
index 000000000..b8c0d6168
--- /dev/null
+++ b/plinth/modules/email/data/etc/rspamd/local.d/freedombox-redis.conf
@@ -0,0 +1,4 @@
+# The file is managed by FreedomBox. Do not to edit.
+
+servers = "127.0.0.1";
+db = "7";  # Use database number 8 not to clash with other clients