From 723ebc4055fcec065cc25c8dd7e358193425c139 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 17 May 2022 16:19:17 +0200
Subject: [PATCH] Split simple RainLoop Sieve filter from the advanced filters
 as mentioned in #80 and #257

---
 dev/sieve.js                                     |  2 +-
 .../v/0.0.0/app/localization/ar-SA/user.json     |  2 ++
 .../v/0.0.0/app/localization/bg-BG/user.json     |  2 ++
 .../v/0.0.0/app/localization/cs-CZ/user.json     |  2 ++
 .../v/0.0.0/app/localization/da-DK/user.json     |  2 ++
 .../v/0.0.0/app/localization/de-DE/user.json     |  2 ++
 .../v/0.0.0/app/localization/el-GR/user.json     |  2 ++
 snappymail/v/0.0.0/app/localization/en/user.json |  2 ++
 .../v/0.0.0/app/localization/es-ES/user.json     |  2 ++
 .../v/0.0.0/app/localization/et-EE/user.json     |  2 ++
 .../v/0.0.0/app/localization/fa-IR/user.json     |  2 ++
 .../v/0.0.0/app/localization/fi-FI/user.json     |  2 ++
 .../v/0.0.0/app/localization/fr-FR/user.json     |  2 ++
 .../v/0.0.0/app/localization/hu-HU/user.json     |  2 ++
 .../v/0.0.0/app/localization/id-ID/user.json     |  2 ++
 .../v/0.0.0/app/localization/is-IS/user.json     |  2 ++
 .../v/0.0.0/app/localization/it-IT/user.json     |  2 ++
 .../v/0.0.0/app/localization/ja-JP/user.json     |  2 ++
 .../v/0.0.0/app/localization/ko-KR/user.json     |  2 ++
 .../v/0.0.0/app/localization/lt-LT/user.json     |  2 ++
 .../v/0.0.0/app/localization/lv-LV/user.json     |  2 ++
 .../v/0.0.0/app/localization/nb-NO/user.json     |  2 ++
 .../v/0.0.0/app/localization/nl-NL/user.json     |  2 ++
 .../v/0.0.0/app/localization/pl-PL/user.json     |  2 ++
 .../v/0.0.0/app/localization/pt-BR/user.json     |  2 ++
 .../v/0.0.0/app/localization/pt-PT/user.json     |  2 ++
 .../v/0.0.0/app/localization/ro-RO/user.json     |  2 ++
 .../v/0.0.0/app/localization/ru-RU/user.json     |  2 ++
 .../v/0.0.0/app/localization/sk-SK/user.json     |  2 ++
 .../v/0.0.0/app/localization/sl-SI/user.json     |  2 ++
 .../v/0.0.0/app/localization/sv-SE/user.json     |  2 ++
 .../v/0.0.0/app/localization/tr-TR/user.json     |  2 ++
 .../v/0.0.0/app/localization/uk-UA/user.json     |  2 ++
 .../v/0.0.0/app/localization/zh-CN/user.json     |  2 ++
 .../v/0.0.0/app/localization/zh-TW/user.json     |  2 ++
 .../templates/Views/User/SettingsFilters.html    | 16 +++++++++++++++-
 36 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/dev/sieve.js b/dev/sieve.js
index 238463aa0..b64bcb094 100644
--- a/dev/sieve.js
+++ b/dev/sieve.js
@@ -46,7 +46,7 @@ window.Sieve = {
 */
 					forEachObjectValue(data.Result.Scripts, value => {
 						value = SieveScriptModel.reviveFromJson(value);
-						value && scripts.push(value)
+						value && (value.allowFilters() ? scripts.unshift(value) : scripts.push(value))
 					});
 				}
 			});
diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/user.json b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
index b5f6bd243..c92ec8a5a 100644
--- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "عوامل التصفية",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "\"%FOLDER%\" نقل الى",
 		"SUBNAME_FORWARD_TO": "\"%EMAIL%\" إعادة توجيه الى",
diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/user.json b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
index f9ec04b11..57792db81 100644
--- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Филтри",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Премести в \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Препрати към \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
index 04ce66ca9..096858e46 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtry",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Přesunout do \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Přeposlat to \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/user.json b/snappymail/v/0.0.0/app/localization/da-DK/user.json
index bf1fd96c2..39b2111df 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/user.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtre",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Flyt til \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Videresend til \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de-DE/user.json
index 32d593f22..4ed98e97a 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/user.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filter",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Skript hinzufügen",
 		"SUBNAME_MOVE_TO": "Verschieben nach \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Weiterleiten nach \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/el-GR/user.json b/snappymail/v/0.0.0/app/localization/el-GR/user.json
index f4ca380eb..647d8b413 100644
--- a/snappymail/v/0.0.0/app/localization/el-GR/user.json
+++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Φίλτρα",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Μετακίνηση στο \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Προώθηση στο \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json
index 539fbdcab..ab7152397 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filters",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es-ES/user.json
index 9a7c9a1ab..9dfd66cae 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/user.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtros",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Añadir un Script",
 		"SUBNAME_MOVE_TO": "Mover a \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Reenviar a \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/et-EE/user.json b/snappymail/v/0.0.0/app/localization/et-EE/user.json
index dd92f3e3a..c18202e76 100644
--- a/snappymail/v/0.0.0/app/localization/et-EE/user.json
+++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtrid",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Liiguta kausta \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Edasta aadressile \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/user.json b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
index 3c270cb44..e5f73677c 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "فیلترها",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "انتقال به \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "ارسال به \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/user.json b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
index 8f6120294..b8aa698e1 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Suodattimet",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Siirrä kansioon \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Välitä osoitteeseen \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
index a0f3779c7..28ab9e5c0 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtres",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Ajouter un Script",
 		"SUBNAME_MOVE_TO": "Déplacer vers \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Faire suivre à \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
index d3b8a4ee5..0d7935c2c 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Szűrők",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Áthelyezés ide \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Továbbítás ide: \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/user.json b/snappymail/v/0.0.0/app/localization/id-ID/user.json
index d647f69e8..d1120d588 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/user.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filter",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Pindahkan ke \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Teruskan ke \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/is-IS/user.json b/snappymail/v/0.0.0/app/localization/is-IS/user.json
index 77f2e5c0a..d9d8a643d 100644
--- a/snappymail/v/0.0.0/app/localization/is-IS/user.json
+++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Síur",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Færa í \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Áframsenda til \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/user.json b/snappymail/v/0.0.0/app/localization/it-IT/user.json
index 5f984b3d2..5db38625d 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/user.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtri",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Aggiungi uno script",
 		"SUBNAME_MOVE_TO": "Sposta in \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Inoltra a \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/user.json b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
index fc0f44ad8..837893dbb 100644
--- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "フィルター",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "\"%FOLDER%\" へ移動",
 		"SUBNAME_FORWARD_TO": "\"%EMAIL%\" へ転送",
diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/user.json b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
index 60e2abfe2..ee1b2b502 100644
--- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "필터",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "\"%FOLDER%\"(으)로 이동",
 		"SUBNAME_FORWARD_TO": "\"%EMAIL%\"(으)로 전달",
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/user.json b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
index f889d2be4..0f0165c24 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtrai",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Perkelti į \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "persiūsti \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/user.json b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
index 7509de54b..007e48962 100644
--- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filters",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/user.json b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
index 40daf6bbe..a99e4d313 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtre",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Flytt til «%FOLDER%»",
 		"SUBNAME_FORWARD_TO": "Videresend til «%EMAIL%»",
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
index 90874cc41..f5d0866b9 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filters",
+		"SIMPLE": "Simpel",
+		"ADVANCED": "Geavanceerd",
 		"BUTTON_ADD_SCRIPT": "Script toevoegen",
 		"SUBNAME_MOVE_TO": "Verplaats naar map \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Doorsturen naar \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/user.json b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
index eab50610d..588de003d 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtry",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Przenieś do \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Przekaż do \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/user.json b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
index 10b649319..2d1c3bb07 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtros",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Mover para \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Encaminhar para \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/user.json b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
index 5323b4a2c..afb02344e 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtros",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Mover para \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Encaminhar para \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/user.json b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
index e7c84a8fd..4c191a41a 100644
--- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filters",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/user.json b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
index 7ca1547b7..2e69c293f 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Фильтры",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Переместить в \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Переслать на \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/user.json b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
index 925d315e8..f26490109 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtre",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/user.json b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
index e1e58ce0f..87e349520 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filtri",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Premakni v \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Posreduj na \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
index 35b84232b..ee50d7ec0 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filter",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Flytta till \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Vidarebefordra till \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/user.json b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
index c61010b06..df3b489c0 100644
--- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filters",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/user.json b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
index 5be2bdf29..9d7bc5518 100644
--- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filters",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
index 6d0c8ffbc..07989d01a 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "筛选器",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "移动到 \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "转发到 \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/user.json b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
index 6efd2595c..b1d2adfa3 100644
--- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
@@ -354,6 +354,8 @@
 	},
 	"SETTINGS_FILTERS": {
 		"LEGEND_FILTERS": "Filters",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
index c434133ec..5c3fa90cd 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
@@ -14,9 +14,22 @@
 		<col style="width: 1em">
 	</colgroup>
 	<tbody data-bind="foreach: scripts, i18nUpdate: scripts">
+		<!-- ko if: allowFilters() -->
+		<tr><th colspan="4" data-i18n="SETTINGS_FILTERS/SIMPLE"></th></tr>
 		<tr class="script-item">
 			<td>
-				<span class="disabled-script fontastic" data-bind="click: function (oScript) { $root.toggleScript(oScript); }, text: active() ? '☑' : '☐'"></span>
+				<span class="fontastic" data-bind="click: function (oScript) { $root.toggleScript(oScript); }, text: active() ? '☑' : '☐'"></span>
+			</td>
+			<td class="e-action" class="script-name" data-bind="text: name()"></td>
+			<td></td>
+			<td></td>
+		</tr>
+		<tr><th colspan="4" data-i18n="SETTINGS_FILTERS/ADVANCED"></th></tr>
+		<!-- /ko -->
+		<!-- ko if: !allowFilters() -->
+		<tr class="script-item">
+			<td>
+				<span class="fontastic" data-bind="click: function (oScript) { $root.toggleScript(oScript); }, text: active() ? '☑' : '☐'"></span>
 			</td>
 			<td class="e-action" class="script-name" data-bind="text: name()"></td>
 			<td>
@@ -27,6 +40,7 @@
 				<span class="delete-script fontastic" data-bind="visible: !askDelete() && canBeDeleted(), click: function (oScript) { $root.scriptForDeletion(oScript); }">🗑</span>
 			</td>
 		</tr>
+		<!-- /ko -->
 	</tbody>
 </table>
 <a class="btn" data-bind="click: addScript" data-icon="✚" data-i18n="SETTINGS_FILTERS/BUTTON_ADD_SCRIPT"></a>