diff --git a/CHANGES b/CHANGES
index 4f83b4792..b95b656a9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2871,4 +2871,5 @@
 * Add sqlite3 addon
 * docker: update docker to 27.3.1
 * du: add exclude file to skip filesystem usage checks
+* mail: attachment search
 
diff --git a/dashboard/public/js/client.js b/dashboard/public/js/client.js
index 401190aaf..20ba3335c 100644
--- a/dashboard/public/js/client.js
+++ b/dashboard/public/js/client.js
@@ -3106,18 +3106,18 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.getSolrConfig = function (callback) {
+    Client.prototype.getFtsConfig = function (callback) {
         var config = {};
 
-        get('/api/v1/mailserver/solr_config', config, function (error, data, status) {
+        get('/api/v1/mailserver/fts_config', config, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
             callback(null, data);
         });
     };
 
-    Client.prototype.setSolrConfig = function (enabled, callback) {
-        post('/api/v1/mailserver/solr_config', { enabled: enabled }, null, function (error, data, status) {
+    Client.prototype.setFtsConfig = function (enabled, callback) {
+        post('/api/v1/mailserver/fts_config', { enabled: enabled }, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
 
diff --git a/dashboard/public/views/emails.html b/dashboard/public/views/emails.html
index 41ce9318d..e268a380e 100644
--- a/dashboard/public/views/emails.html
+++ b/dashboard/public/views/emails.html
@@ -43,7 +43,7 @@
 </div>
 
 <!-- Modal solr config -->
-<div class="modal fade" id="solrConfigModal" tabindex="-1" role="dialog">
+<div class="modal fade" id="ftsConfigModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -52,12 +52,12 @@
       <div class="modal-body">
         <p ng-bind-html=" 'emails.solrConfig.description' | tr "></p>
         <!-- only show this when user is trying to enable -->
-        <p class="has-error" ng-show="!solrConfig.currentConfig.enabled && !solrConfig.enoughMemory">{{ 'emails.solrConfig.notEnoughMemory' | tr }}</p>
+        <p class="has-error" ng-show="!ftsConfig.currentConfig.enabled && !ftsConfig.enoughMemory">{{ 'emails.solrConfig.notEnoughMemory' | tr }}</p>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-hide="solrConfig.currentConfig.enabled" ng-click="solrConfig.submit(true)" ng-disabled="(!solrConfig.currentConfig.enabled && !solrConfig.enoughMemory) || solrConfig.busy"><i class="fa fa-circle-notch fa-spin" ng-show="solrConfig.busy"></i> {{ 'main.enableAction' | tr }}</button>
-        <button type="button" class="btn btn-danger" ng-show="solrConfig.currentConfig.enabled" ng-click="solrConfig.submit(false)" ng-disabled="solrConfig.busy"><i class="fa fa-circle-notch fa-spin" ng-show="solrConfig.busy"></i> {{ 'main.disableAction' | tr }}</button>
+        <button type="button" class="btn btn-success" ng-hide="ftsConfig.currentConfig.enabled" ng-click="ftsConfig.submit(true)" ng-disabled="(!ftsConfig.currentConfig.enabled && !ftsConfig.enoughMemory) || ftsConfig.busy"><i class="fa fa-circle-notch fa-spin" ng-show="ftsConfig.busy"></i> {{ 'main.enableAction' | tr }}</button>
+        <button type="button" class="btn btn-danger" ng-show="ftsConfig.currentConfig.enabled" ng-click="ftsConfig.submit(false)" ng-disabled="ftsConfig.busy"><i class="fa fa-circle-notch fa-spin" ng-show="ftsConfig.busy"></i> {{ 'main.disableAction' | tr }}</button>
       </div>
     </div>
   </div>
@@ -336,17 +336,17 @@
       <div class="col-xs-6">
         <span class="text-muted">{{ 'emails.settings.solrFts' | tr }}</span>
       </div>
-      <div class="col-xs-6 text-right" ng-hide="solrConfig.currentConfig">
+      <div class="col-xs-6 text-right" ng-hide="ftsConfig.currentConfig">
         <i class="fa fa-circle-notch fa-spin"></i>
       </div>
-      <div class="col-xs-6 text-right" ng-show="solrConfig.currentConfig">
-        <span ng-show="solrConfig.currentConfig.enabled">
+      <div class="col-xs-6 text-right" ng-show="ftsConfig.currentConfig">
+        <span ng-show="ftsConfig.currentConfig.enabled">
           {{ 'emails.settings.solrEnabled' | tr }}
-          <span ng-show="solrConfig.running">/ {{ 'emails.settings.solrRunning' | tr }}</span>
-          <span ng-hide="solrConfig.running">/ {{ 'emails.settings.solrNotRunning' | tr }}</span>
+          <span ng-show="ftsConfig.running">/ {{ 'emails.settings.solrRunning' | tr }}</span>
+          <span ng-hide="ftsConfig.running">/ {{ 'emails.settings.solrNotRunning' | tr }}</span>
         </span>
-        <span ng-hide="solrConfig.currentConfig.enabled">{{ 'emails.settings.solrDisabled' | tr }}</span>
-        <a href="" ng-click="solrConfig.show()"><i class="fa fa-edit text-small"></i></a>
+        <span ng-hide="ftsConfig.currentConfig.enabled">{{ 'emails.settings.solrDisabled' | tr }}</span>
+        <a href="" ng-click="ftsConfig.show()"><i class="fa fa-edit text-small"></i></a>
       </div>
     </div>
   </div>
diff --git a/dashboard/public/views/emails.js b/dashboard/public/views/emails.js
index 9b5c56fb0..5ac9f01b8 100644
--- a/dashboard/public/views/emails.js
+++ b/dashboard/public/views/emails.js
@@ -196,7 +196,7 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
         }
     };
 
-    $scope.solrConfig = {
+    $scope.ftsConfig = {
         busy: false,
         error: {},
         currentConfig: null, // null means not loaded yet
@@ -208,40 +208,40 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
             Client.getService('mail', function (error, result) {
                 if (error) return console.log('Error getting status of mail conatiner', error);
 
-                $scope.solrConfig.enoughMemory = result.config.memoryLimit > (1024*1024*1024*2);
-                $scope.solrConfig.running = result.healthcheck && result.healthcheck.solr.status;
+                $scope.ftsConfig.enoughMemory = result.config.memoryLimit > (1024*1024*1024*2);
+                $scope.ftsConfig.running = result.healthcheck && result.healthcheck.solr.status && result.healthcheck.tika.status;
 
-                Client.getSolrConfig(function (error, config) {
+                Client.getFtsConfig(function (error, config) {
                     if (error) return console.error('Failed to get solr config', error);
 
-                    $scope.solrConfig.currentConfig = config;
+                    $scope.ftsConfig.currentConfig = config;
                 });
             });
         },
 
         show: function() {
-            $scope.solrConfig.busy = false;
-            $scope.solrConfig.error = null;
-            $scope.solrConfig.enabled = $scope.solrConfig.currentConfig.enabled;
+            $scope.ftsConfig.busy = false;
+            $scope.ftsConfig.error = null;
+            $scope.ftsConfig.enabled = $scope.ftsConfig.currentConfig.enabled;
 
-            $('#solrConfigModal').modal('show');
+            $('#ftsConfigModal').modal('show');
         },
 
         submit: function (newState) {
-            $scope.solrConfig.busy = true;
+            $scope.ftsConfig.busy = true;
 
-            Client.setSolrConfig(newState, function (error) {
+            Client.setFtsConfig(newState, function (error) {
                 if (error) return console.error(error);
 
                 $timeout(function () {
-                    $scope.solrConfig.busy = false;
+                    $scope.ftsConfig.busy = false;
                     // FIXME: these values are fake. but cannot get current status from mail server since it might be restarting
-                    $scope.solrConfig.currentConfig.enabled = newState;
-                    $scope.solrConfig.running = newState;
+                    $scope.ftsConfig.currentConfig.enabled = newState;
+                    $scope.ftsConfig.running = newState;
 
-                    $timeout(function () { $scope.solrConfig.refresh(); }, 20000); // get real values after 20 seconds
+                    $timeout(function () { $scope.ftsConfig.refresh(); }, 20000); // get real values after 20 seconds
 
-                    $('#solrConfigModal').modal('hide');
+                    $('#ftsConfigModal').modal('hide');
                 }, 5000);
             });
         }
@@ -502,7 +502,7 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
                 $scope.virtualAllMail.refresh();
                 $scope.mailboxSharing.refresh();
                 $scope.spamConfig.refresh();
-                $scope.solrConfig.refresh();
+                $scope.ftsConfig.refresh();
                 $scope.acl.refresh();
             }
 
diff --git a/src/infra_version.js b/src/infra_version.js
index 953677b89..df9025d61 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -13,7 +13,7 @@ exports = module.exports = {
     'images': {
         'base': 'registry.docker.com/cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4',
         'graphite': 'registry.docker.com/cloudron/graphite:3.4.3@sha256:75df420ece34b31a7ce8d45b932246b7f524c123e1854f5e8f115a9e94e33f20',
-        'mail': 'registry.docker.com/cloudron/mail:3.14.0@sha256:3840ec4269a77fd9fdb7f7945d6065775cb99110d6aad88a8d81dd69267e39ba',
+        'mail': 'registry.docker.com/cloudron/mail:3.14.0@sha256:06bb0f3e225b0a1f07cfdfdbc75840d6e662556e2cf919c9190531998c04be26',
         'mongodb': 'registry.docker.com/cloudron/mongodb:6.0.0@sha256:1108319805acfb66115aa96a8fdbf2cded28d46da0e04d171a87ec734b453d1e',
         'mysql': 'registry.docker.com/cloudron/mysql:3.4.3@sha256:8934c5ddcd69f24740d9a38f0de2937e47240238f3b8f5c482862eeccc5a21d2',
         'postgresql': 'registry.docker.com/cloudron/postgresql:5.3.0@sha256:894b05d98b964936a26f1a05912b8ed1522254619b862e4d66cfd72183fa4677',
diff --git a/src/server.js b/src/server.js
index 5539dd194..120f15849 100644
--- a/src/server.js
+++ b/src/server.js
@@ -348,8 +348,8 @@ async function initializeExpressSync() {
     router.post('/api/v1/mailserver/spam_custom_config',      token, authorizeAdmin, routes.mailserver.proxy);
     router.get ('/api/v1/mailserver/dnsbl_config',            token, authorizeAdmin, routes.mailserver.proxy);
     router.post('/api/v1/mailserver/dnsbl_config',            token, authorizeAdmin, routes.mailserver.proxy);
-    router.get ('/api/v1/mailserver/solr_config',             token, authorizeAdmin, routes.mailserver.proxy);
-    router.post('/api/v1/mailserver/solr_config',             token, authorizeAdmin, routes.mailserver.proxyAndRestart);
+    router.get ('/api/v1/mailserver/fts_config',              token, authorizeAdmin, routes.mailserver.proxy);
+    router.post('/api/v1/mailserver/fts_config',              token, authorizeAdmin, routes.mailserver.proxyAndRestart);
     router.get ('/api/v1/mailserver/mailbox_sharing',         token, authorizeAdmin, routes.mailserver.proxy);
     router.post('/api/v1/mailserver/mailbox_sharing',         token, authorizeAdmin, routes.mailserver.proxyAndRestart);
     router.get ('/api/v1/mailserver/virtual_all_mail',        token, authorizeAdmin, routes.mailserver.proxy);