diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 71476e8b3..65aeeed16 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -63,8 +63,6 @@ export class MailMessageList extends AbstractViewRight {
 
 		this.newMoveToFolder = !!SettingsGet('NewMoveToFolder');
 
-		this.allowSearch = SettingsCapa('Search');
-		this.allowSearchAdv = SettingsCapa('SearchAdv');
 		this.allowDangerousActions = SettingsCapa('DangerousActions');
 
 		this.messageList = MessagelistUserStore;
@@ -776,8 +774,7 @@ export class MailMessageList extends AbstractViewRight {
 	}
 
 	advancedSearchClick() {
-		SettingsCapa('SearchAdv')
-			&& showScreenPopup(AdvancedSearchPopupView, [MessagelistUserStore.mainSearch()]);
+		showScreenPopup(AdvancedSearchPopupView, [MessagelistUserStore.mainSearch()]);
 	}
 
 	quotaTooltip() {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index c6876b460..3168906f1 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1178,8 +1178,6 @@ class Actions
 				'MessageActions'       => (bool) $oConfig->Get('capa', 'message_actions', true),
 				'OpenPGP'              => (bool) $oConfig->Get('security', 'openpgp', false),
 				'Quota'                => (bool) $oConfig->Get('capa', 'quota', true),
-				'Search'               => (bool) $oConfig->Get('capa', 'search', true),
-				'SearchAdv'            => (bool) $oConfig->Get('capa', 'search', true) && $oConfig->Get('capa', 'search_adv', true),
 				'Sieve'                => false,
 				'Themes'               => (bool) $oConfig->Get('webmail', 'allow_themes', false),
 				'UserBackground'       => (bool) $oConfig->Get('webmail', 'allow_user_background', false)
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 53d35b524..656d16f9c 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -209,8 +209,6 @@ class Application extends \RainLoop\Config\AbstractConfig
 
 			'capa' => array(
 				'quota' => array(true),
-				'search' => array(true),
-				'search_adv' => array(true),
 				'dangerous_actions' => array(true),
 				'message_actions' => array(true),
 				'attachments_actions' => array(true)
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
index 650ac4d10..c301bfda1 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
@@ -13,8 +13,6 @@ class Capa
 	const ADDITIONAL_ACCOUNTS = 'AdditionalAccounts';
 	const IDENTITIES = 'Identities';
 	const CONTACTS = 'Contacts';
-	const SEARCH = 'Search';
-	const SEARCH_ADV = 'SearchAdv';
 	const QUOTA = 'Quota';
 	const MESSAGE_ACTIONS = 'MessageActions';
 	const ATTACHMENTS_ACTIONS = 'AttachmentsActions';
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index 7a05f495e..1762c48c3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -100,13 +100,11 @@
 <div class="messageList g-ui-user-select-none" data-bind="css: {'hideMessageListCheckbox': !useCheckboxesInList() }">
 	<div class="second-toolbar thm-message-list-top-toolbar">
 		<i class="checkboxCheckAll fontastic" data-bind="text: checkAll() ? (isIncompleteChecked() ? '▣' : '☑') : '☐'"></i>
-		<!-- ko if: allowSearch -->
 		<div class="search-input-wrp">
 			<input type="search" class="inputSearch" tabindex="-1" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="textInput: inputSearch, hasfocus: focusSearch">
 			<a class="closeSearch" data-bind="click: cancelSearch, visible: messageListSearchDesc()">×</a>
 		</div>
-		<a class="btn buttonMoreSearch" data-bind="visible: allowSearchAdv, click: advancedSearchClick">▼</a>
-		<!-- /ko -->
+		<a class="btn buttonMoreSearch" data-bind="click: advancedSearchClick">▼</a>
 	</div>
 	<div class="b-content" data-bind="initDom: dragOverBodyArea">
 		<div class="listThreadUidDesc" data-bind="visible: messageList.threadUid(), click: cancelThreadUid"