diff --git a/dev/Sieve/Extensions/rfc5232.js b/dev/Sieve/Extensions/rfc5232.js
index 002ad0b7a..0577cde1d 100644
--- a/dev/Sieve/Extensions/rfc5232.js
+++ b/dev/Sieve/Extensions/rfc5232.js
@@ -43,11 +43,12 @@ class FlagCommand extends ActionCommand
 			if (args[0] instanceof GrammarQuotedString) {
 				this._variablename = args[0];
 			}
-			if (args[1] instanceof GrammarString) {
-				this.list_of_flags = args[1];
-			}
-		} else if (args[0] instanceof GrammarString) {
+			args[0] = args[1];
+		}
+		if (args[0] instanceof GrammarStringList) {
 			this.list_of_flags = args[0];
+		} else if (args[0]) {
+			this.list_of_flags.push(args[0]);
 		}
 	}
 }
diff --git a/dev/Sieve/Grammar.js b/dev/Sieve/Grammar.js
index e570966ba..5fb21c71e 100644
--- a/dev/Sieve/Grammar.js
+++ b/dev/Sieve/Grammar.js
@@ -18,7 +18,7 @@ export class GrammarString /*extends String*/
 {
 	constructor(value = '')
 	{
-		this._value = value;
+		this._value = value.toString ? value.toString() : value;
 	}
 
 	toString()
@@ -227,6 +227,7 @@ export class GrammarStringList extends Array
 {
 	toString()
 	{
+		// if there is only a single string, the brackets are optional
 		if (1 < this.length) {
 			return '[' + this.join(',') + ']';
 		}
@@ -235,7 +236,7 @@ export class GrammarStringList extends Array
 
 	push(value)
 	{
-		if (!(value instanceof GrammarString)) {
+		if (!(value instanceof GrammarQuotedString)) {
 			value = new GrammarQuotedString(value);
 		}
 		super.push(value);
diff --git a/dev/Sieve/View/Script.js b/dev/Sieve/View/Script.js
index c7c3dcfcf..02ebbb9ef 100644
--- a/dev/Sieve/View/Script.js
+++ b/dev/Sieve/View/Script.js
@@ -134,7 +134,7 @@ export class SieveScriptPopupView extends rl.pluginPopupView {
 
 	templateName(obj) {
 		const id = 'Sieve' + obj.constructor.name;
-		return document.getElementById(id) ? id : null;
+		return document.getElementById(id) ? id : 'SieveCommand';
 	}
 
 	beforeShow(oScript) {
diff --git a/dev/Styles/User/SettingsFilters.less b/dev/Styles/User/SettingsFilters.less
index ef70221b8..ea8073585 100644
--- a/dev/Styles/User/SettingsFilters.less
+++ b/dev/Styles/User/SettingsFilters.less
@@ -34,3 +34,16 @@
 	height: 300px;
 	font-family: var(--fontMono);
 }
+
+.sieve-block {
+	border: 1px solid var(--border-color, #ddd);
+	margin: 1em 0;
+	padding: 0.5em;
+}
+
+.sieve-block > div {
+	padding-left:2em;
+}
+.sieve-block > details > div {
+	padding-left:1em;
+}
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/AddFlagCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/AddFlagCommand.html
index 58bcabdf4..01cd7af92 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/AddFlagCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/AddFlagCommand.html
@@ -1,4 +1,4 @@
 <!-- rfc5232 -->
 addflag
-	<input type="text" name="_variablename" data-bind="textInput: _variablename">
-	<textarea name="source">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: variablename">
+	<input type="text" data-bind="textInput: list_of_flags" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/AddHeaderCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/AddHeaderCommand.html
index d77e6acfc..0afbd1934 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/AddHeaderCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/AddHeaderCommand.html
@@ -1,5 +1,5 @@
 <!-- rfc5293 -->
 addheader
-	<label><input type="checkbox" name="last"> last</label>
-	<input type="text" name="field_name" data-bind="textInput: field_name">
-	<input type="text" name="value" data-bind="textInput: value">
+	<label><input type="checkbox"> last</label>
+	<input type="text" data-bind="textInput: field_name">
+	<input type="text" data-bind="textInput: value">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/AddressTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/AddressTest.html
index 370d806dc..977eb785c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/AddressTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/AddressTest.html
@@ -1,13 +1,13 @@
 <!-- rfc5228 -->
 address
-	<select name="address_part">
+	<select>
 		<option>:localpart</option>
 		<option>:domain</option>
 		<option>:all</option>
 	</select>
-	<textarea name="header_list">GrammarStringList</textarea>
-	<textarea name="key_list">GrammarStringList</textarea>
-	<input type="number" name="index">
-	<input type="checkbox" name="last">
+	<input type="text" data-bind="textInput: header_list" pattern='".+"|\[".+"(,".+")*\]'>
+	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
+	<input type="number">
+	<input type="checkbox">
 //	mime
 //	anychild
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/BodyTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/BodyTest.html
index acd28811d..63dd94c3d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/BodyTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/BodyTest.html
@@ -1,4 +1,4 @@
 <!-- rfc5173 -->
 body
 	body_transform = ''; // :raw, :content <string-list>, :text
-	<textarea name="key_list">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/CurrentDateTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/CurrentDateTest.html
index 34c643000..6188f53c9 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/CurrentDateTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/CurrentDateTest.html
@@ -1,5 +1,5 @@
 <!-- rfc5260 -->
 currentdate
-	<input type="text" name="zone" data-bind="textInput: zone">
-	<input type="text" name="date_part" data-bind="textInput: date_part">
-	<textarea name="key_list">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: zone">
+	<input type="text" data-bind="textInput: date_part">
+	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/DateTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/DateTest.html
index 9f623fc12..1a7e1acc8 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/DateTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/DateTest.html
@@ -1,9 +1,9 @@
 <!-- rfc5260 -->
 date
-	<input type="text" name="zone" data-bind="textInput: zone">
-	<label><input type="checkbox" name="originalzone"> originalzone</label>
-	<input type="text" name="header_name" data-bind="textInput: header_name">
-	<input type="text" name="date_part" data-bind="textInput: date_part">
-	<textarea name="key_list">GrammarStringList</textarea>
-	<input type="number" name="index">
-	<label><input type="checkbox" name="last"> last</label>
+	<input type="text" data-bind="textInput: zone">
+	<label><input type="checkbox"> originalzone</label>
+	<input type="text" data-bind="textInput: header_name">
+	<input type="text" data-bind="textInput: date_part">
+	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
+	<input type="number">
+	<label><input type="checkbox"> last</label>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/DeleteHeaderCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/DeleteHeaderCommand.html
index 2e76caa2a..23efa8810 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/DeleteHeaderCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/DeleteHeaderCommand.html
@@ -1,13 +1,13 @@
 <!-- rfc5293 -->
 deleteheader
-	<input type="number" name="index">
-	<label><input type="checkbox" name="last"> last</label>
+	<input type="number">
+	<label><input type="checkbox"> last</label>
 	comparator     = '',
-	<select name="match_type">
+	<select>
 		<option>:is</option>
 		<option>:contains</option>
 		<option>:matches</option>
 		<option data-bind="visible root.capa.extlists">:list</option>
 	</select>
-	<input type="text" name="field_name" data-bind="textInput: field_name">
-	<textarea name="source">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: field_name">
+	<input type="text" data-bind="textInput: source" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ElsIfCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ElsIfCommand.html
index eb19c8138..bae8070b8 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ElsIfCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ElsIfCommand.html
@@ -1,8 +1,12 @@
 <!-- rfc5228 -->
-elsif
-<div data-bind="template: {name: $root.templateName(test), data: test}"></div>
-{
-	<div style="padding-left:4em" data-bind="foreach: commands">
-		<div data-bind="template: {name: $root.templateName($data)}"></div>
-	</div>
-}
+<div class="sieve-block">
+	<details>
+		<summary data-bind="text: 'elsif ' + test"></summary>
+		<div data-bind="template: {name: $root.templateName(test), data: test}"></div>
+	</details>
+	{
+		<div data-bind="foreach: commands">
+			<div data-bind="template: {name: $root.templateName($data)}"></div>
+		</div>
+	}
+</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ElseCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ElseCommand.html
index 8aa233fc8..19b9534ad 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ElseCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ElseCommand.html
@@ -1,7 +1,9 @@
 <!-- rfc5228 -->
-else
-{
-	<div style="padding-left:4em" data-bind="foreach: commands">
-		<div data-bind="template: {name: $root.templateName($data)}"></div>
-	</div>
-}
+<div class="sieve-block">
+	<span>else</span>
+	{
+		<div data-bind="foreach: commands">
+			<div data-bind="template: {name: $root.templateName($data)}"></div>
+		</div>
+	}
+</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/EncloseCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/EncloseCommand.html
index 80972d28d..1d1fa6cd8 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/EncloseCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/EncloseCommand.html
@@ -1,4 +1,4 @@
 <!-- rfc5703 -->
 enclose
-	<input type="text" name="_subject" data-bind="textInput: _subject">
-	<textarea name="source">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: _subject">
+	<input type="text" data-bind="textInput: source" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/EnvelopeTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/EnvelopeTest.html
index a3f9906df..887a0321d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/EnvelopeTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/EnvelopeTest.html
@@ -1,9 +1,9 @@
 <!-- rfc5228 -->
 envelope
-	<select name="address_part">
+	<select>
 		<option>:localpart</option>
 		<option>:domain</option>
 		<option>:all</option>
 	</select>
-	<textarea name="envelope_part">GrammarStringList</textarea>
-	<textarea name="key_list">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: envelope_part" pattern='".+"|\[".+"(,".+")*\]'>
+	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/EnvironmentTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/EnvironmentTest.html
index 09d51c996..9b2ab6085 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/EnvironmentTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/EnvironmentTest.html
@@ -1,4 +1,4 @@
 <!-- rfc5183 -->
 environment
-	<input type="text" name="name" data-bind="textInput: name">
-	<textarea name="key_list">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: name">
+	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ErejectCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ErejectCommand.html
index db76e8980..028b313b2 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ErejectCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ErejectCommand.html
@@ -1,3 +1,3 @@
 <!-- rfc5429 -->
 ereject
-	<input type="text" name="_reason" data-bind="textInput: _reason">
+	<input type="text" data-bind="textInput: _reason">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ErrorCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ErrorCommand.html
index fccab2766..6e800ac81 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ErrorCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ErrorCommand.html
@@ -1,3 +1,3 @@
 <!-- rfc5463 -->
 error
-	<input type="text" name="message" data-bind="textInput: message">
+	<input type="text" data-bind="textInput: message">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ExistsTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ExistsTest.html
index f34c4674c..5a13c22a9 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ExistsTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ExistsTest.html
@@ -1,5 +1,5 @@
 <!-- rfc5228 -->
 exists
-	<textarea name="header_names">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: header_names" pattern='".+"|\[".+"(,".+")*\]'>
 //	mime
 //	anychild
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ExtractTextCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ExtractTextCommand.html
index e0d3f12d4..0487bb259 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ExtractTextCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ExtractTextCommand.html
@@ -1,5 +1,5 @@
 <!-- rfc5703 -->
 extracttext
 	modifiers = [];
-	<input type="number" name="_first">
-	<input type="text" name="varname" data-bind="textInput: varname">
+	<input type="number">
+	<input type="text" data-bind="textInput: varname">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/FileIntoCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/FileIntoCommand.html
index 9c2799152..458c48004 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/FileIntoCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/FileIntoCommand.html
@@ -1,5 +1,5 @@
 <!-- rfc5228 -->
 fileinto
+	<input type="text" data-bind="textInput: mailbox">
 	<label data-bind="root.capa.copy"><input type="checkbox" data-bind="checked: copy"> copy</label><!-- rfc3894 -->
 	<label data-bind="root.capa.mailbox"><input type="checkbox" data-bind="checked: create"> create</label><!-- rfc5490 -->
-	<input type="text" data-bind="textInput: mailbox">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ForEveryPartCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ForEveryPartCommand.html
index f184bda87..619d76751 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ForEveryPartCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ForEveryPartCommand.html
@@ -1,4 +1,4 @@
 <!-- rfc5703 -->
 foreverypart
-	<input type="text" name="_name" data-bind="textInput: _name">
+	<input type="text" data-bind="textInput: _name">
 	<div data-bind="template: { name: 'SieveCommand', foreach: commands, as: 'command' }"></div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/GlobalCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/GlobalCommand.html
index 62012817c..d16b93ea7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/GlobalCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/GlobalCommand.html
@@ -1,3 +1,3 @@
 <!-- rfc6609 -->
 global
-	<textarea name="source">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: source" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/HasFlagTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/HasFlagTest.html
index 6a98cade4..1d3791960 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/HasFlagTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/HasFlagTest.html
@@ -1,4 +1,4 @@
 <!-- rfc5232 -->
 hasflag
-	<textarea name="variable_list">GrammarStringList</textarea>
-	<textarea name="list_of_flags">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: variable_list" pattern='".+"|\[".+"(,".+")*\]'>
+	<input type="text" data-bind="textInput: list_of_flags" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/HeaderTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/HeaderTest.html
index 6ed1c5685..0cf1dc85b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/HeaderTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/HeaderTest.html
@@ -1,25 +1,35 @@
 <!-- rfc5228 -->
-header
-	<textarea name="header_names" data-bind="textInput: header_names">GrammarStringList</textarea>
-	<select name="match_type" data-bind="value: match_type">
-		<option>:is</option>
-		<option>:contains</option>
-		<option>:matches</option>
-	</select>
-	<!--
-	<select name="address_part" data-bind="value: address_part">
-		<option>:localpart</option>
-		<option>:domain</option>
-		<option>:all</option>
-	</select>
-	-->
-	<textarea name="key_list" data-bind="textInput: key_list">GrammarStringList</textarea>
-	<input type="number" name="index" data-bind="textInput: index">
-	<label><input type="checkbox" name="last"> last</label>
-	<label><input type="checkbox" name="mime"> mime</label>
-	<label><input type="checkbox" name="anychild"> anychild</label>
-	<!-- when ":mime" is used: -->
-	<label><input type="checkbox" name="type"> type</label>
-	<label><input type="checkbox" name="subtype"> subtype</label>
-	<label><input type="checkbox" name="contenttype"> contenttype</label>
-	<textarea name="param" data-bind="textInput: param">GrammarStringList</textarea>
+<input type="text" data-bind="textInput: header_names" pattern='".+"|\[".+"(,".+")*\]'>
+<br/>
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
+<br/>
+<!--
+<select data-bind="value: address_part">
+	<option>:localpart</option>
+	<option>:domain</option>
+	<option>:all</option>
+</select>
+-->
+<br/>
+<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
+<br/>
+<input type="number" data-bind="textInput: index">
+<br/>
+<label><input type="checkbox"> last</label>
+<br/>
+<label><input type="checkbox"> mime</label>
+<br/>
+<label><input type="checkbox"> anychild</label>
+<br/>
+<!-- when ":mime" is used: -->
+<label><input type="checkbox"> type</label>
+<br/>
+<label><input type="checkbox"> subtype</label>
+<br/>
+<label><input type="checkbox"> contenttype</label>
+<br/>
+<input type="text" data-bind="textInput: param" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/IHaveTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/IHaveTest.html
index cec46605d..d41861371 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/IHaveTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/IHaveTest.html
@@ -1,3 +1,3 @@
 <!-- rfc5463 -->
 ihave
-	<textarea name="capabilities">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: capabilities" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/IfCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/IfCommand.html
index fa92d26f3..d49dffd5f 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/IfCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/IfCommand.html
@@ -1,8 +1,12 @@
 <!-- rfc5228 -->
-if
-<div data-bind="template: {name: $root.templateName(test), data: test}"></div>
-{
-	<div style="padding-left:4em" data-bind="foreach: commands">
-		<div data-bind="template: {name: $root.templateName($data)}"></div>
-	</div>
-}
+<div class="sieve-block">
+	<details>
+		<summary data-bind="text: 'if ' + test"></summary>
+		<div data-bind="template: {name: $root.templateName(test), data: test}"></div>
+	</details>
+	{
+		<div data-bind="foreach: commands">
+			<div data-bind="template: {name: $root.templateName($data)}"></div>
+		</div>
+	}
+</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/IncludeCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/IncludeCommand.html
index bf0575d47..f96a78d5e 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/IncludeCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/IncludeCommand.html
@@ -1,6 +1,6 @@
 <!-- rfc6609 -->
 include
-	<label><input type="checkbox" name="global"> global</label> // ':personal' / ':global';
-	<label><input type="checkbox" name="once"> once</label>
-	<label><input type="checkbox" name="optional"> optional</label>
-	<input type="text" name="value" data-bind="textInput: value">
+	<label><input type="checkbox"> global</label> // ':personal' / ':global';
+	<label><input type="checkbox"> once</label>
+	<label><input type="checkbox"> optional</label>
+	<input type="text" data-bind="textInput: value">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/MailboxExistsTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/MailboxExistsTest.html
index 396dc0e37..51a7a75c0 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/MailboxExistsTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/MailboxExistsTest.html
@@ -1,3 +1,3 @@
 <!-- rfc5490 -->
 mailboxexists
-	<textarea name="mailbox_names">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: mailbox_names" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataExistsTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataExistsTest.html
index 591514f93..bd4af2254 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataExistsTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataExistsTest.html
@@ -1,4 +1,4 @@
 <!-- rfc5490 -->
 metadataexists
-	<input type="text" name="mailbox" data-bind="textInput: mailbox">
-	<textarea name="annotation_names">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: mailbox">
+	<input type="text" data-bind="textInput: annotation_names" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataTest.html
index 175433dd5..dd7824d99 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataTest.html
@@ -1,5 +1,5 @@
 <!-- rfc5490 -->
 metadata
-	<input type="text" name="mailbox" data-bind="textInput: mailbox">
-	<input type="text" name="annotation_name" data-bind="textInput: annotation_name">
-	<textarea name="key_list">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: mailbox">
+	<input type="text" data-bind="textInput: annotation_name">
+	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyCommand.html
index b12358d63..c545501a2 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyCommand.html
@@ -1,7 +1,7 @@
 <!-- rfc5435 -->
 notify
-	<input type="text" name="_method" data-bind="textInput: _method">
-	<input type="text" name="_from" data-bind="textInput: _from">
-	<input type="number" name="_importance">
-	<textarea name="source">GrammarStringList</textarea>
-	<input type="text" name="_message" data-bind="textInput: _message">
+	<input type="text" data-bind="textInput: _method">
+	<input type="text" data-bind="textInput: _from">
+	<input type="number">
+	<input type="text" data-bind="textInput: source" pattern='".+"|\[".+"(,".+")*\]'>
+	<input type="text" data-bind="textInput: _message">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyMethodCapabilityTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyMethodCapabilityTest.html
index 1fbf7e2e3..19338a107 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyMethodCapabilityTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyMethodCapabilityTest.html
@@ -1,5 +1,5 @@
 <!-- rfc5435 -->
 notifymethodcapability
-	<input type="text" name="notification_uri" data-bind="textInput: notification_uri">
-	<input type="text" name="notification_capability" data-bind="textInput: notification_capability">
-	<textarea name="key_list">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: notification_uri">
+	<input type="text" data-bind="textInput: notification_capability">
+	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/RejectCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/RejectCommand.html
index de6c2827d..fe2c0ccba 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/RejectCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/RejectCommand.html
@@ -1,3 +1,3 @@
 <!-- rfc5429 -->
 reject
-	<input type="text" name="_reason" data-bind="textInput: _reason">
+	<input type="text" data-bind="textInput: _reason">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/RemoveFlagCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/RemoveFlagCommand.html
index 6e3ad5ad1..8d7903539 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/RemoveFlagCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/RemoveFlagCommand.html
@@ -1,4 +1,4 @@
 <!-- rfc5232 -->
 removeflag
-	<input type="text" name="_variablename" data-bind="textInput: _variablename">
-	<textarea name="source">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: variablename">
+	<input type="text" data-bind="textInput: list_of_flags" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ReplaceCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ReplaceCommand.html
index d835cd674..c38a898aa 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ReplaceCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ReplaceCommand.html
@@ -1,6 +1,6 @@
 <!-- rfc5703 -->
 replace
-	<label><input type="checkbox" name="mime"> mime</label>
-	<input type="text" name="_subject" data-bind="textInput: _subject">
-	<input type="text" name="_from" data-bind="textInput: _from">
-	<input type="text" name="replacement" data-bind="textInput: replacement">
+	<label><input type="checkbox"> mime</label>
+	<input type="text" data-bind="textInput: _subject">
+	<input type="text" data-bind="textInput: _from">
+	<input type="text" data-bind="textInput: replacement">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataExistsTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataExistsTest.html
index e7615cc9b..03e56aa7f 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataExistsTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataExistsTest.html
@@ -1,3 +1,3 @@
 <!-- rfc5490 -->
 servermetadataexists
-	<textarea name="annotation_names">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: annotation_names" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataTest.html
index dd84e9794..bb3d86a09 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataTest.html
@@ -1,4 +1,4 @@
 <!-- rfc5490 -->
 servermetadata
-	<input type="text" name="annotation_name" data-bind="textInput: annotation_name">
-	<textarea name="key_list">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: annotation_name">
+	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/SetCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/SetCommand.html
index 4d3a3cdeb..725c1afde 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/SetCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/SetCommand.html
@@ -1,5 +1,5 @@
 <!-- rfc5229 -->
 set
 	modifiers = [];
-	<input type="text" name="_name" data-bind="textInput: _name">
-	<input type="text" name="_value" data-bind="textInput: _value">
+	<input type="text" data-bind="textInput: _name">
+	<input type="text" data-bind="textInput: _value">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/SetFlagCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/SetFlagCommand.html
index b4b93cf2d..8f3cae0d7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/SetFlagCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/SetFlagCommand.html
@@ -1,4 +1,4 @@
 <!-- rfc5232 -->
 setflag
-	<input type="text" name="_variablename" data-bind="textInput: _variablename">
-	<textarea name="source">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: variablename">
+	<input type="text" data-bind="textInput: list_of_flags" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/SizeTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/SizeTest.html
index 4b71de229..e4c1a930d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/SizeTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/SizeTest.html
@@ -1,7 +1,7 @@
 <!-- rfc5228 -->
 size
-	<select name="mode">
+	<select>
 		<option>:over</option>
 		<option>:under</option>
 	</select>
-	<input type="number" name="limit">
+	<input type="number">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/SpamTestTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/SpamTestTest.html
index 4da00e13a..861e647f3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/SpamTestTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/SpamTestTest.html
@@ -1,4 +1,4 @@
 <!-- rfc5235 -->
 spamtest
-	<input type="number" name="percent">
-	<input type="text" name="value" data-bind="textInput: value">
+	<input type="number">
+	<input type="text" data-bind="textInput: value">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/StringTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/StringTest.html
index c95aa7a52..fb3d85e34 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/StringTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/StringTest.html
@@ -1,4 +1,4 @@
 <!-- rfc5229 -->
 string
-	<textarea name="source">GrammarStringList</textarea>
-	<textarea name="key_list">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: source" pattern='".+"|\[".+"(,".+")*\]'>
+	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/VacationCommand.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/VacationCommand.html
index adaa5f037..6b8c25e56 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/VacationCommand.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/VacationCommand.html
@@ -1,10 +1,10 @@
 <!-- rfc5230 -->
 vacation
-	<input type="number" name="_days">
-	<input type="number" name="_seconds">
-	<input type="text" name="_subject" data-bind="textInput: _subject">
-	<input type="text" name="_from" data-bind="textInput: _from">
-	<textarea name="source">GrammarStringList</textarea>
-	<label><input type="checkbox" name="mime"> mime</label>
-	<input type="text" name="_handle" data-bind="textInput: _handle">
-	<input type="text" name="_reason" data-bind="textInput: _reason"> // QuotedString / MultiLine
+	<input type="number">
+	<input type="number">
+	<input type="text" data-bind="textInput: _subject">
+	<input type="text" data-bind="textInput: _from">
+	<input type="text" data-bind="textInput: source" pattern='".+"|\[".+"(,".+")*\]'>
+	<label><input type="checkbox"> mime</label>
+	<input type="text" data-bind="textInput: _handle">
+	<input type="text" data-bind="textInput: _reason"> // QuotedString / MultiLine
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ValidExtListTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ValidExtListTest.html
index 6683147cd..914885fde 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ValidExtListTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ValidExtListTest.html
@@ -1,3 +1,3 @@
 <!-- rfc6134 -->
 validextlist
-	<textarea name="ext_list_names">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: ext_list_names" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ValidNotifyMethodTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ValidNotifyMethodTest.html
index 8aefe0c7f..0669c18a3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ValidNotifyMethodTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ValidNotifyMethodTest.html
@@ -1,3 +1,3 @@
 <!-- rfc5435 -->
 validnotifymethod
-	<textarea name="notification_uris">GrammarStringList</textarea>
+	<input type="text" data-bind="textInput: notification_uris" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/VirusTestTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/VirusTestTest.html
index 80fa73d5a..316964fb9 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/VirusTestTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/VirusTestTest.html
@@ -1,3 +1,3 @@
 <!-- rfc5235 -->
 virustest
-	<input type="text" name="value" data-bind="textInput: value"> // 1 - 5
+	<input type="text" data-bind="textInput: value"> // 1 - 5
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/_Command.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/_Command.html
new file mode 100644
index 000000000..dcd14f3e4
--- /dev/null
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/_Command.html
@@ -0,0 +1,2 @@
+<!-- for every command that has no template -->
+<div data-bind="text: $data"></div>