diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile
index f27bbdba..80e3539a 100644
--- a/core/dovecot/Dockerfile
+++ b/core/dovecot/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.7
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && apk add --no-cache \
      dovecot dovecot-sqlite dovecot-pigeonhole-plugin dovecot-pigeonhole-plugin-extdata \
-     rspamd-client@testing python py-jinja2
+     dovecot-fts-lucene rspamd-client@testing python py-jinja2
 
 COPY conf /conf
 COPY sieve /var/lib/dovecot
diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index 94c43901..b7ce1834 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -18,6 +18,20 @@ dict {
   sieve = sqlite:/etc/dovecot/pigeonhole-sieve.dict
 }
 
+###############
+# Full-text search
+###############
+mail_plugins =  $mail_plugins fts fts_lucene
+
+plugin {
+  fts = lucene
+
+  fts_autoindex = yes
+  fts_autoindex_exclude = \Junk
+
+  fts_lucene = whitespace_chars=@.
+}
+
 ###############
 # Mailboxes
 ###############