diff --git a/data/conf/dovecot/dovecot.conf b/data/conf/dovecot/dovecot.conf
index 5a7717ac..2be1fff6 100644
--- a/data/conf/dovecot/dovecot.conf
+++ b/data/conf/dovecot/dovecot.conf
@@ -159,18 +159,6 @@ service lmtp {
   }
   user = vmail
 }
-### FTS-XAPIAN
-service indexer-worker {
-    vsz_limit = 1024m
-}
-
-service decode2text {
-    executable = script /usr/libexec/dovecot/decode2text.sh
-    user = dovecot
-    unix_listener decode2text {
-        mode = 0666
-    }
-}
 
 listen = *,[::]
 ssl_cert = </etc/ssl/mail/cert.pem
@@ -255,20 +243,7 @@ plugin {
   mail_log_events = delete undelete expunge copy mailbox_delete mailbox_rename
   mail_log_fields = uid box msgid size
   mail_log_cached_only = yes
-
-### FTS XAPIAN
-
-  fts = xapian
-  fts_xapian = partial=3 full=20
-
-  fts_autoindex = yes
-  fts_enforced = yes
-
-  fts_autoindex_exclude = \Trash
-
-    # Index attachements
-  fts_decoder = decode2text
-}
+  
 service quota-warning {
   executable = script /usr/local/bin/quota_notify.py
   # use some unprivileged user for executing the quota warnings
@@ -323,6 +298,7 @@ replication_dsync_parameters = -d -l 30 -U -n INBOX
 !include_try /etc/dovecot/extra.conf
 !include_try /etc/dovecot/sogo-sso.conf
 !include_try /etc/dovecot/shared_namespace.conf
+!include_try /etc/dovecot/FTS_Xapian.conf
 # </Includes>
 default_client_limit = 10400
 default_vsz_limit = 1024 M