diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js
index 1b3820f14..f4c465d97 100644
--- a/dev/View/Popup/Domain.js
+++ b/dev/View/Popup/Domain.js
@@ -39,6 +39,8 @@ const
 		imapMessage_all_headers: false,
 		imapMessage_list_limit: 10000,
 		imapSearch_filter: '',
+		imapSpam_headers: '',
+		imapVirus_headers: '',
 
 		sieveEnabled: false,
 		sieveHost: '',
@@ -80,15 +82,17 @@ const
 			},
 			disabled_capabilities:  oDomain.imapDisabled_capabilities(),
 			folder_list_limit: pInt(oDomain.imapFolder_list_limit()),
-			message_list_limit: pInt(oDomain.imapMessage_list_limit())
+			message_list_limit: pInt(oDomain.imapMessage_list_limit()),
 /*
 			expunge_all_on_delete: ,
 			fast_simple_search: ,
 			fetch_new_messages: ,
 			force_select: ,
 			message_all_headers: ,
-			search_filter:
 */
+			search_filter: oDomain.imapSearch_filter(),
+			spam_headers: oDomain.imapSpam_headers(),
+			virus_headers: oDomain.imapVirus_headers()
 		},
 		SMTP: {
 			host: oDomain.smtpHost,
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
index b634bb6af..8993a051b 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
@@ -33,7 +33,9 @@ class Settings extends \MailSo\Net\ConnectSettings
 		$message_all_headers = false;
 
 	public string
-		$search_filter = '';
+		$search_filter = '',
+		$spam_headers = 'rspamd,spamassassin,bogofilter',
+		$virus_headers = 'rspamd,clamav';
 
 	public array
 		$disabled_capabilities = [];
@@ -41,6 +43,8 @@ class Settings extends \MailSo\Net\ConnectSettings
 	public static function fromArray(array $aSettings) : self
 	{
 		$object = parent::fromArray($aSettings);
+
+		// Boolean options
 		$options = [
 			'expunge_all_on_delete',
 			'fast_simple_search',
@@ -53,6 +57,8 @@ class Settings extends \MailSo\Net\ConnectSettings
 				$object->$option = !empty($aSettings[$option]);
 			}
 		}
+
+		// Integer options
 		$options = [
 //			'body_text_limit',
 //			'folder_list_limit',
@@ -65,6 +71,18 @@ class Settings extends \MailSo\Net\ConnectSettings
 			}
 		}
 
+		// String options
+		$options = [
+			'search_filter',
+			'spam_headers',
+			'virus_headers',
+		];
+		foreach ($options as $option) {
+			if (isset($aSettings[$option])) {
+				$object->$option = (string) $aSettings[$option];
+			}
+		}
+
 		if (!empty($aSettings['disabled_capabilities']) && \is_array($aSettings['disabled_capabilities'])) {
 			$object->disabled_capabilities = $aSettings['disabled_capabilities'];
 		}
@@ -119,6 +137,8 @@ class Settings extends \MailSo\Net\ConnectSettings
 				'message_all_headers' => $this->message_all_headers,
 				'message_list_limit' => $this->message_list_limit,
 				'search_filter' => $this->search_filter,
+				'spam_headers' => $this->spam_headers,
+				'virus_headers' => $this->virus_headers,
 //				'thread_limit' => $this->thread_limit
 				'disabled_capabilities' => \array_values(\array_unique($this->disabled_capabilities))
 			]
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index d0ddda7d4..a34dfdf0d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -76,19 +76,33 @@ class MailClient
 			MimeHeader::X_DKIM_AUTHENTICATION_RESULTS,
 			MimeHeader::LIST_UNSUBSCRIBE,
 			// https://autocrypt.org/level1.html#the-autocrypt-header
-			MimeHeader::AUTOCRYPT,
-			// SPAM
-			MimeHeader::X_SPAM_STATUS,
-			MimeHeader::X_SPAM_FLAG,
-			MimeHeader::X_SPAM_INFO,
-			MimeHeader::X_SPAMD_RESULT,
-			MimeHeader::X_BOGOSITY,
-			// Virus
-			MimeHeader::X_VIRUS,
-			MimeHeader::X_VIRUS_SCANNED,
-			MimeHeader::X_VIRUS_STATUS
+			MimeHeader::AUTOCRYPT
 		);
 
+		// SPAM
+		$spam_headers = \explode(',', $this->oImapClient->Settings->spam_headers);
+		if (\in_array('rspamd', $spam_headers)) {
+			$aHeaders[] = MimeHeader::X_SPAMD_RESULT;
+		}
+		if (\in_array('spamassassin', $spam_headers)) {
+			$aHeaders[] = MimeHeader::X_SPAM_STATUS;
+			$aHeaders[] = MimeHeader::X_SPAM_FLAG;
+			$aHeaders[] = MimeHeader::X_SPAM_INFO;
+		}
+		if (\in_array('bogofilter', $spam_headers)) {
+			$aHeaders[] = MimeHeader::X_BOGOSITY;
+		}
+
+		// Virus
+		$virus_headers = \explode(',', $this->oImapClient->Settings->virus_headers);
+		if (\in_array('rspamd', $virus_headers)) {
+			$aHeaders[] = MimeHeader::X_VIRUS;
+		}
+		if (\in_array('clamav', $virus_headers)) {
+			$aHeaders[] = MimeHeader::X_VIRUS_SCANNED;
+			$aHeaders[] = MimeHeader::X_VIRUS_STATUS;
+		}
+
 		\RainLoop\Api::Actions()->Plugins()->RunHook('imap.message-headers', array(&$aHeaders));
 
 		return FetchType::BuildBodyCustomHeaderRequest($aHeaders, true);
diff --git a/snappymail/v/0.0.0/app/localization/be/admin.json b/snappymail/v/0.0.0/app/localization/be/admin.json
index a24fea3e2..8fe050a3b 100644
--- a/snappymail/v/0.0.0/app/localization/be/admin.json
+++ b/snappymail/v/0.0.0/app/localization/be/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Назад",
 		"BUTTON_UPDATE": "Абнавіць",
 		"NEW_DOMAIN_DESC": "Гэтая канфігурацыя дазволіць вам працаваць з <strong>%NAME%<\/strong> адрасамі.",
-		"WHITE_LIST_ALERT": "Спіс карыстальнікаў дамена да якіх дазволены доступ.\nВыкарыстоўвайце прабел у якасці раздзяляльніка.\n"
+		"WHITE_LIST_ALERT": "Спіс карыстальнікаў дамена да якіх дазволены доступ.\nВыкарыстоўвайце прабел у якасці раздзяляльніка.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Убудова",
diff --git a/snappymail/v/0.0.0/app/localization/cs/admin.json b/snappymail/v/0.0.0/app/localization/cs/admin.json
index e6463e4ba..1886c8f48 100644
--- a/snappymail/v/0.0.0/app/localization/cs/admin.json
+++ b/snappymail/v/0.0.0/app/localization/cs/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Zpět",
 		"BUTTON_UPDATE": "Aktualizovat",
 		"NEW_DOMAIN_DESC": "Konfigurace této domény umožní používat <strong>%NAME%<\/strong> adresy.",
-		"WHITE_LIST_ALERT": "Seznam domén s povoleným uživatelským přístupem\nPoužijte mezeru pro jejich oddělení.\n"
+		"WHITE_LIST_ALERT": "Seznam domén s povoleným uživatelským přístupem\nPoužijte mezeru pro jejich oddělení.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Plugin",
diff --git a/snappymail/v/0.0.0/app/localization/da/admin.json b/snappymail/v/0.0.0/app/localization/da/admin.json
index 456b68c83..e4c02d4bb 100644
--- a/snappymail/v/0.0.0/app/localization/da/admin.json
+++ b/snappymail/v/0.0.0/app/localization/da/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Tilbage",
 		"BUTTON_UPDATE": "Opdater",
 		"NEW_DOMAIN_DESC": "Denne domæne konfiguration tillader <strong>%NAME%<\/strong> e-mail adresser.",
-		"WHITE_LIST_ALERT": "Liste med godkendte domæne for webmail opsætning.\nBrug mellemrum til at separere domæner.\n"
+		"WHITE_LIST_ALERT": "Liste med godkendte domæne for webmail opsætning.\nBrug mellemrum til at separere domæner.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Tilføjelse",
diff --git a/snappymail/v/0.0.0/app/localization/de/admin.json b/snappymail/v/0.0.0/app/localization/de/admin.json
index 2eb764006..fc819cc2f 100644
--- a/snappymail/v/0.0.0/app/localization/de/admin.json
+++ b/snappymail/v/0.0.0/app/localization/de/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Zurück",
 		"BUTTON_UPDATE": "Aktualisieren",
 		"NEW_DOMAIN_DESC": "Diese Domain Konfiguration wird es dir möglich machen mit <strong>%NAME%<\/strong> Mailadressen zu arbeiten.",
-		"WHITE_LIST_ALERT": "Liste der User, die Webmail abrufen darf.\nVerwenden Sie Leerzeichen als Trennsymbol."
+		"WHITE_LIST_ALERT": "Liste der User, die Webmail abrufen darf.\nVerwenden Sie Leerzeichen als Trennsymbol.",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Erweiterung",
diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json
index a4f93ed8c..51b161a0a 100644
--- a/snappymail/v/0.0.0/app/localization/en/admin.json
+++ b/snappymail/v/0.0.0/app/localization/en/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Back",
 		"BUTTON_UPDATE": "Update",
 		"NEW_DOMAIN_DESC": "This domain configuration will allow you to work with <strong>%NAME%<\/strong> email addresses.",
-		"WHITE_LIST_ALERT": "List of domain users webmail is allowed to access.\nUse a space as delimiter.\n"
+		"WHITE_LIST_ALERT": "List of domain users webmail is allowed to access.\nUse a space as delimiter.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Extension",
diff --git a/snappymail/v/0.0.0/app/localization/es/admin.json b/snappymail/v/0.0.0/app/localization/es/admin.json
index ea0968ef4..8da630466 100644
--- a/snappymail/v/0.0.0/app/localization/es/admin.json
+++ b/snappymail/v/0.0.0/app/localization/es/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Volver",
 		"BUTTON_UPDATE": "Actualizar",
 		"NEW_DOMAIN_DESC": "Esta configuración de Dominio le permitirá trabajar con direcciones de correo tipo @<strong>%NAME%<\/strong>.",
-		"WHITE_LIST_ALERT": "Lista de dominios con que los usuarios pueden ingresar.\nUse un espacio como delimitador.\n"
+		"WHITE_LIST_ALERT": "Lista de dominios con que los usuarios pueden ingresar.\nUse un espacio como delimitador.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Extensión",
diff --git a/snappymail/v/0.0.0/app/localization/eu/admin.json b/snappymail/v/0.0.0/app/localization/eu/admin.json
index b73136303..6fdeb5d18 100644
--- a/snappymail/v/0.0.0/app/localization/eu/admin.json
+++ b/snappymail/v/0.0.0/app/localization/eu/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Atzera",
 		"BUTTON_UPDATE": "Eguneratu",
 		"NEW_DOMAIN_DESC": "Domeinu honen konfigurazioak <strong>%NAME%<\/strong> email kontuarekin lan egitea ahalbideratuko dizu.",
-		"WHITE_LIST_ALERT": "Webmailak sartzeko baimena duen domeinuko erabiltzaileen zerrenda.\nErabili hutsunea banatzaile bezala.\n"
+		"WHITE_LIST_ALERT": "Webmailak sartzeko baimena duen domeinuko erabiltzaileen zerrenda.\nErabili hutsunea banatzaile bezala.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Gehigarria",
diff --git a/snappymail/v/0.0.0/app/localization/fa/admin.json b/snappymail/v/0.0.0/app/localization/fa/admin.json
index 8446324f7..1e34a9793 100644
--- a/snappymail/v/0.0.0/app/localization/fa/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fa/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "برگشت",
 		"BUTTON_UPDATE": "بروزرسانی",
 		"NEW_DOMAIN_DESC": "این تنظیمات دامنه به شما اجازه کار کردن با پست الکترونیک <strong>%NAME%<\/strong> را می‌دهد.",
-		"WHITE_LIST_ALERT": "لیستی از دامنه‌ها که کاربران وب‌میل می‌توانند به آنها دسترسی داشته باشند.\nاز فاصله جهت جدا کردن استفاده کنید.\n"
+		"WHITE_LIST_ALERT": "لیستی از دامنه‌ها که کاربران وب‌میل می‌توانند به آنها دسترسی داشته باشند.\nاز فاصله جهت جدا کردن استفاده کنید.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "افزونه",
diff --git a/snappymail/v/0.0.0/app/localization/fi/admin.json b/snappymail/v/0.0.0/app/localization/fi/admin.json
index a3f488b01..0995d048b 100644
--- a/snappymail/v/0.0.0/app/localization/fi/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fi/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Takaisin",
 		"BUTTON_UPDATE": "Päivitä",
 		"NEW_DOMAIN_DESC": "Tämän verkkotunnuksen asetukset sallivat käyttää  <strong>%NAME%<strong> säkhöpostiosoitteita.",
-		"WHITE_LIST_ALERT": "Lista domain käyttäjistä joihin webmaililla on oikeus.\nErottele välilyönnillä.\n"
+		"WHITE_LIST_ALERT": "Lista domain käyttäjistä joihin webmaililla on oikeus.\nErottele välilyönnillä.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Lisäosa",
diff --git a/snappymail/v/0.0.0/app/localization/fr/admin.json b/snappymail/v/0.0.0/app/localization/fr/admin.json
index cc39ae1e2..3994d37ad 100644
--- a/snappymail/v/0.0.0/app/localization/fr/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fr/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Retour",
 		"BUTTON_UPDATE": "Modifier",
 		"NEW_DOMAIN_DESC": "Cette configuration de domaine vous permettra de travailler  avec <strong>%NAME%<\/strong> dans les adresses électroniques.",
-		"WHITE_LIST_ALERT": "Liste des utilisateurs du domaine auxquels le webmail est autorisé à accéder.\nUtilisez un espace comme séparateur."
+		"WHITE_LIST_ALERT": "Liste des utilisateurs du domaine auxquels le webmail est autorisé à accéder.\nUtilisez un espace comme séparateur.",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Extension",
diff --git a/snappymail/v/0.0.0/app/localization/hu/admin.json b/snappymail/v/0.0.0/app/localization/hu/admin.json
index aa8a81618..37b4c9bd6 100644
--- a/snappymail/v/0.0.0/app/localization/hu/admin.json
+++ b/snappymail/v/0.0.0/app/localization/hu/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Vissza",
 		"BUTTON_UPDATE": "Frissítés",
 		"NEW_DOMAIN_DESC": "Ez a domain konfiguráció lehetővé teszi a <strong>%NAME%<\/strong> email címek használatát.",
-		"WHITE_LIST_ALERT": "Hozzáféréshez engedélyezett domainek listája.\nElválasztáshoz használd a szóközt.\n"
+		"WHITE_LIST_ALERT": "Hozzáféréshez engedélyezett domainek listája.\nElválasztáshoz használd a szóközt.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Bővítményt",
diff --git a/snappymail/v/0.0.0/app/localization/id/admin.json b/snappymail/v/0.0.0/app/localization/id/admin.json
index 190be9131..37b891a5a 100644
--- a/snappymail/v/0.0.0/app/localization/id/admin.json
+++ b/snappymail/v/0.0.0/app/localization/id/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Kembali",
 		"BUTTON_UPDATE": "Perbarui",
 		"NEW_DOMAIN_DESC": "Domain ini mengizinkan anda bekerja dengan alamat email juga<strong>%NAME%<\/strong> ",
-		"WHITE_LIST_ALERT": "Daftar domain webmail user yang diizinkan diakses.\nGunakan spasi untuk pemisahnya\n"
+		"WHITE_LIST_ALERT": "Daftar domain webmail user yang diizinkan diakses.\nGunakan spasi untuk pemisahnya\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Plugin",
diff --git a/snappymail/v/0.0.0/app/localization/it/admin.json b/snappymail/v/0.0.0/app/localization/it/admin.json
index 6b6ff25f0..1bd42f095 100644
--- a/snappymail/v/0.0.0/app/localization/it/admin.json
+++ b/snappymail/v/0.0.0/app/localization/it/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Indietro",
 		"BUTTON_UPDATE": "Aggiorna",
 		"NEW_DOMAIN_DESC": "This domain configuration will allow you to work with <strong>%NAME%<\/strong> email addresses.",
-		"WHITE_LIST_ALERT": "Lista degli utenti del dominio ai quali webmail può accedere.\nUsa uno spazio come delimitatore."
+		"WHITE_LIST_ALERT": "Lista degli utenti del dominio ai quali webmail può accedere.\nUsa uno spazio come delimitatore.",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Estensione",
diff --git a/snappymail/v/0.0.0/app/localization/ja/admin.json b/snappymail/v/0.0.0/app/localization/ja/admin.json
index b92362c40..1d674826f 100644
--- a/snappymail/v/0.0.0/app/localization/ja/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ja/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "戻る",
 		"BUTTON_UPDATE": "更新",
 		"NEW_DOMAIN_DESC": "このドメイン設定を使用すると、<strong>%NAME%<\/strong>メールアドレスで動作するようになります。",
-		"WHITE_LIST_ALERT": "ドメインの一覧は、Webメールのアクセスを許可されています。\n区切り文字としてスペースを使用してください。\n"
+		"WHITE_LIST_ALERT": "ドメインの一覧は、Webメールのアクセスを許可されています。\n区切り文字としてスペースを使用してください。\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "プラグイン",
diff --git a/snappymail/v/0.0.0/app/localization/lt/admin.json b/snappymail/v/0.0.0/app/localization/lt/admin.json
index 50061c3d4..9d62d244f 100644
--- a/snappymail/v/0.0.0/app/localization/lt/admin.json
+++ b/snappymail/v/0.0.0/app/localization/lt/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Atgal",
 		"BUTTON_UPDATE": "Atnaujinti",
 		"NEW_DOMAIN_DESC": "Šie nustatymai leis jums dirbti  su <strong>%NAME%<\/strong> domeno pašto adresais.",
-		"WHITE_LIST_ALERT": "Domeno vartotojų sąrašas, kuriems leista naudotis web paštu.\nNaudokite tarpo simbolį kaip skyriklį.\n"
+		"WHITE_LIST_ALERT": "Domeno vartotojų sąrašas, kuriems leista naudotis web paštu.\nNaudokite tarpo simbolį kaip skyriklį.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Įskiepis",
diff --git a/snappymail/v/0.0.0/app/localization/nb/admin.json b/snappymail/v/0.0.0/app/localization/nb/admin.json
index 24ec4044f..961703992 100644
--- a/snappymail/v/0.0.0/app/localization/nb/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nb/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Tilbake",
 		"BUTTON_UPDATE": "Oppdater",
 		"NEW_DOMAIN_DESC": "Dette domeneoppsettet lar deg jobbe  med e-postadresser ved <strong>%NAME%<\/strong>.",
-		"WHITE_LIST_ALERT": "Liste over domenebrukere som programmet skal ha tilgang til.\nHold verdier adskilt med mellomrom."
+		"WHITE_LIST_ALERT": "Liste over domenebrukere som programmet skal ha tilgang til.\nHold verdier adskilt med mellomrom.",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Tillegg",
diff --git a/snappymail/v/0.0.0/app/localization/nl/admin.json b/snappymail/v/0.0.0/app/localization/nl/admin.json
index 7dcd82b40..e91f16c70 100644
--- a/snappymail/v/0.0.0/app/localization/nl/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nl/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Terug",
 		"BUTTON_UPDATE": "Update",
 		"NEW_DOMAIN_DESC": "Dit domein stelt u in staat om met <strong>%NAME%<\/strong> e-mail adressen te werken.",
-		"WHITE_LIST_ALERT": "Lijst van gebruikers die dit domein mogen gebruiken.\nGebruik een spatie als scheidingsteken."
+		"WHITE_LIST_ALERT": "Lijst van gebruikers die dit domein mogen gebruiken.\nGebruik een spatie als scheidingsteken.",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Extensie",
diff --git a/snappymail/v/0.0.0/app/localization/pl/admin.json b/snappymail/v/0.0.0/app/localization/pl/admin.json
index 3c2716a67..de228ce36 100644
--- a/snappymail/v/0.0.0/app/localization/pl/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pl/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Wstecz",
 		"BUTTON_UPDATE": "Zaktualizuj",
 		"NEW_DOMAIN_DESC": "Konfiguracja tej domeny pozwala na pracę z adresami e-mail: <strong>%NAME%<\/strong>",
-		"WHITE_LIST_ALERT": "Lista użytkowników domeny, którzy mogą uzyskać dostęp z tego webmaila.\nUżyj spacji do rozdzielenia.\n"
+		"WHITE_LIST_ALERT": "Lista użytkowników domeny, którzy mogą uzyskać dostęp z tego webmaila.\nUżyj spacji do rozdzielenia.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Wtyczka",
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
index 6dfb5f050..41712c66e 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Voltar",
 		"BUTTON_UPDATE": "Atualizar",
 		"NEW_DOMAIN_DESC": "Esta configuração de domínio lhe permitirá trabalhar  com endereços de e-mail do <strong>%NAME%<\/strong>.",
-		"WHITE_LIST_ALERT": "Filtrar com lista dos únicos usuários do domínio que terão acesso ao webmail.\nUse um espaço como delimitador.\n"
+		"WHITE_LIST_ALERT": "Filtrar com lista dos únicos usuários do domínio que terão acesso ao webmail.\nUse um espaço como delimitador.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Plugin",
diff --git a/snappymail/v/0.0.0/app/localization/pt/admin.json b/snappymail/v/0.0.0/app/localization/pt/admin.json
index a1dd25760..9258d6372 100644
--- a/snappymail/v/0.0.0/app/localization/pt/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Voltar",
 		"BUTTON_UPDATE": "Atualizar",
 		"NEW_DOMAIN_DESC": "Esta configuração de domínio vai permitir trabalhar com endereços email <strong>%NAME%<\/strong>.",
-		"WHITE_LIST_ALERT": "Lista de utilizadores do domínio aos quais o webmail terá permissão para aceder.\nUsar espaços para delimitar.\n"
+		"WHITE_LIST_ALERT": "Lista de utilizadores do domínio aos quais o webmail terá permissão para aceder.\nUsar espaços para delimitar.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Extensão",
diff --git a/snappymail/v/0.0.0/app/localization/ru/admin.json b/snappymail/v/0.0.0/app/localization/ru/admin.json
index 850e2c734..76ede4943 100644
--- a/snappymail/v/0.0.0/app/localization/ru/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ru/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Назад",
 		"BUTTON_UPDATE": "Обновить",
 		"NEW_DOMAIN_DESC": "Эта конфигурация позволит вам работать с <strong>%NAME%<\/strong> адресами.",
-		"WHITE_LIST_ALERT": "Список пользователей домена к которым разрешен доступ.\nИспользуйте пробел в качестве разделителя.\n"
+		"WHITE_LIST_ALERT": "Список пользователей домена к которым разрешен доступ.\nИспользуйте пробел в качестве разделителя.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Плагин",
diff --git a/snappymail/v/0.0.0/app/localization/sk/admin.json b/snappymail/v/0.0.0/app/localization/sk/admin.json
index 4ca23a685..73dee7764 100644
--- a/snappymail/v/0.0.0/app/localization/sk/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sk/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Späť",
 		"BUTTON_UPDATE": "Aktualizovať",
 		"NEW_DOMAIN_DESC": "This domain configuration will allow you to work with <strong>%NAME%<\/strong> email addresses.",
-		"WHITE_LIST_ALERT": "List of domain users webmail is allowed to access.\nUse a space as delimiter.\n"
+		"WHITE_LIST_ALERT": "List of domain users webmail is allowed to access.\nUse a space as delimiter.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Doplnok",
diff --git a/snappymail/v/0.0.0/app/localization/sl/admin.json b/snappymail/v/0.0.0/app/localization/sl/admin.json
index fda8d116b..ef0c5ebe6 100644
--- a/snappymail/v/0.0.0/app/localization/sl/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sl/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Nazaj",
 		"BUTTON_UPDATE": "Posodobi",
 		"NEW_DOMAIN_DESC": "Ta konfiguiracija domene bo omogočala delo z <strong>%NAME%<\/strong> e-naslovi.",
-		"WHITE_LIST_ALERT": "Seznam uporabnikov domene, do katerih je omogočen dostop.\nUporabnike ločite s presledkom.\n"
+		"WHITE_LIST_ALERT": "Seznam uporabnikov domene, do katerih je omogočen dostop.\nUporabnike ločite s presledkom.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Vtičnik",
diff --git a/snappymail/v/0.0.0/app/localization/sv/admin.json b/snappymail/v/0.0.0/app/localization/sv/admin.json
index b9e362ee1..d4fcffe79 100644
--- a/snappymail/v/0.0.0/app/localization/sv/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sv/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Tillbaka",
 		"BUTTON_UPDATE": "Uppdatera",
 		"NEW_DOMAIN_DESC": "Denna domän konfiguration gör att du kan arbeta med <strong>%NAME%<\/strong> e-postadresser.",
-		"WHITE_LIST_ALERT": "Lista över domänanvändare som tillåts.\nAnvända ett utrymme som avgränsare.\n"
+		"WHITE_LIST_ALERT": "Lista över domänanvändare som tillåts.\nAnvända ett utrymme som avgränsare.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Tillägget",
diff --git a/snappymail/v/0.0.0/app/localization/vi/admin.json b/snappymail/v/0.0.0/app/localization/vi/admin.json
index a10a72a55..1d7deeec7 100644
--- a/snappymail/v/0.0.0/app/localization/vi/admin.json
+++ b/snappymail/v/0.0.0/app/localization/vi/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "Trở về",
 		"BUTTON_UPDATE": "Cập nhật",
 		"NEW_DOMAIN_DESC": "Thiết lập tên miền cho phép bạn thao tác với với địa chỉ email của <strong>%NAME%<\/strong>.",
-		"WHITE_LIST_ALERT": "Danh sách những người dùng tên miền mà webmail được quyền truy cập.\nSử dụng dấu cách làm dấu phân cách mỗi tên.\n"
+		"WHITE_LIST_ALERT": "Danh sách những người dùng tên miền mà webmail được quyền truy cập.\nSử dụng dấu cách làm dấu phân cách mỗi tên.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Tiện ích mở rộng",
diff --git a/snappymail/v/0.0.0/app/localization/zh/admin.json b/snappymail/v/0.0.0/app/localization/zh/admin.json
index c483d3dbc..62c1c02b2 100644
--- a/snappymail/v/0.0.0/app/localization/zh/admin.json
+++ b/snappymail/v/0.0.0/app/localization/zh/admin.json
@@ -146,7 +146,9 @@
 		"BUTTON_BACK": "返回",
 		"BUTTON_UPDATE": "更新",
 		"NEW_DOMAIN_DESC": "此域名配置将允许您和<strong>%NAME%<\/strong>电子邮件地址一起工作.",
-		"WHITE_LIST_ALERT": "允许访问的域用户；使用空格分隔。\n"
+		"WHITE_LIST_ALERT": "允许访问的域用户；使用空格分隔。\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "插件",
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index 58dedf652..7b6a3c1f8 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -120,8 +120,19 @@
         "fast_simple_search": true,
         "force_select": false,
         "message_all_headers": false,
-        "search_filter": null,
+				<div class="control-group">
+					<label>Search filter</label>
+					<input name="IMAP[search_filter]" type="text" class="span3" data-bind="textInput: imapSearch_filter">
+				</div>
 -->
+				<div class="control-group">
+					<label data-i18n="POPUPS_DOMAIN/VALID_SPAM_HEADERS"></label>
+					<input name="IMAP[spam_headers]" type="text" class="span3" data-bind="textInput: imapSpam_headers" title="rspamd,spamassassin,bogofilter">
+				</div>
+				<div class="control-group">
+					<label data-i18n="POPUPS_DOMAIN/VALID_VIRUS_HEADERS"></label>
+					<input name="IMAP[virus_headers]" type="text" class="span3" data-bind="textInput: imapVirus_headers" title="rspamd,clamav">
+				</div>
 			</div>
 
 			<input type="radio" name="tabs" id="tab-smtp">