diff --git a/setup/dovecot-fts-xapian.sh b/setup/dovecot-fts-xapian.sh
index 4ba84096..e985bf8d 100755
--- a/setup/dovecot-fts-xapian.sh
+++ b/setup/dovecot-fts-xapian.sh
@@ -25,7 +25,7 @@ apt_install libxapian30
 # the IMAP specification expects.
 tools/editconf.py /etc/dovecot/conf.d/10-mail.conf \
         mail_plugins="fts fts_xapian" \
-		mail_home="/home/user-data/mail/homes/%d/%n"
+        mail_home="$STORAGE_ROOT/mail/homes/%d/%n"
 
 # Install cronjobs to keep FTS up to date.
 hide_output install -m 755 conf/cron/miab_dovecot /etc/cron.daily/
@@ -74,9 +74,9 @@ restart_service dovecot
 
 # Per doveadm-fts manpage: Scan what mails exist in the full text search index
 # and compare those to what actually exist in mailboxes.
-# This removes mails from the index that have already been expunged  and  makes
+# This removes mails from the index that have already been expunged and makes
 # sure that the next doveadm index will index all the missing mails (if any).
-# doveadm fts rescan -A
+doveadm fts rescan -A
 
 # Adds unindexed files to the fts database
 # * `-q`: Queues the indexing to be run by indexer process. (will background the indexing)
diff --git a/setup/mail-dovecot.sh b/setup/mail-dovecot.sh
index 52bfade8..b50e28d5 100755
--- a/setup/mail-dovecot.sh
+++ b/setup/mail-dovecot.sh
@@ -193,33 +193,6 @@ EOF
 cp conf/sieve-spam.txt /etc/dovecot/sieve-spam.sieve
 sievec /etc/dovecot/sieve-spam.sieve
 
-### Compression
-
-# Create configuration file to enable compression
-cat > /etc/dovecot/conf.d/90-plugin-zlib.conf << EOF;
-# Enable Zlib for imap
-protocol imap {
-  mail_plugins = $mail_plugins zlib
-}
-# Enable Zlib for pop3
-protocol pop3 {
-  mail_plugins = $mail_plugins zlib
-}
-# Enable Zlib for lmtp
-protocol lmtp {
-  mail_plugins = $mail_plugins zlib
-}
-# Increase memory allowed for imap as it costs more to read compressed files
-service imap {
-  vsz_limit = 1024MB
-}
-# Configure the zlib plugin
-plugin {
-  zlib_save_level = 6
-  zlib_save = lz4
-}
-EOF
-
 # PERMISSIONS
 
 # Ensure configuration files are owned by dovecot and not world readable.
@@ -228,7 +201,9 @@ chmod -R o-rwx /etc/dovecot
 
 # Ensure mailbox files have a directory that exists and are owned by the mail user.
 mkdir -p $STORAGE_ROOT/mail/mailboxes
+mkdir -p $STORAGE_ROOT/mail/homes
 chown -R mail.mail $STORAGE_ROOT/mail/mailboxes
+chown -R mail.mail $STORAGE_ROOT/mail/homes
 
 # Same for the sieve scripts.
 mkdir -p $STORAGE_ROOT/mail/sieve