diff --git a/dev/Sieve/Commands/Actions.js b/dev/Sieve/Commands/Actions.js
index 8d301ec0c..d38f5bcc3 100644
--- a/dev/Sieve/Commands/Actions.js
+++ b/dev/Sieve/Commands/Actions.js
@@ -22,9 +22,9 @@ export class FileIntoCommand extends ActionCommand
 		// QuotedString / MultiLine
 		this._mailbox = new GrammarQuotedString();
 		// https://datatracker.ietf.org/doc/html/rfc3894
-//		this.copy = false;
+		this.copy = false;
 		// https://datatracker.ietf.org/doc/html/rfc5490#section-3.2
-//		this.create = false;
+		this.create = false;
 	}
 
 	get require() { return 'fileinto'; }
@@ -67,9 +67,9 @@ export class RedirectCommand extends ActionCommand
 		// QuotedString / MultiLine
 		this._address = new GrammarQuotedString();
 		// https://datatracker.ietf.org/doc/html/rfc3894
-//		this.copy = false;
+		this.copy = false;
 		// https://datatracker.ietf.org/doc/html/rfc6134#section-2.3
-//		this.list = null;
+		this.list = null;
 	}
 
 	toString()
diff --git a/dev/Sieve/Commands/Tests.js b/dev/Sieve/Commands/Tests.js
index e5eb4a341..f566fadae 100644
--- a/dev/Sieve/Commands/Tests.js
+++ b/dev/Sieve/Commands/Tests.js
@@ -230,6 +230,7 @@ export class HeaderTest extends TestCommand
 	constructor()
 	{
 		super();
+		this.match_type = ':is';
 		this.address_part = ':all';
 		this.header_names = new GrammarStringList;
 		this.key_list     = new GrammarStringList;
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 baf361342..58bcabdf4 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">
+	<input type="text" name="_variablename" data-bind="textInput: _variablename">
 	<textarea name="source">GrammarStringList</textarea>
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 f918b92a9..d77e6acfc 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">
-	<input type="text" name="value">
+	<input type="text" name="field_name" data-bind="textInput: field_name">
+	<input type="text" name="value" data-bind="textInput: value">
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 c5826ceb9..34c643000 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">
-	<input type="text" name="date_part">
+	<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>
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 c053cf56d..9f623fc12 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">
+	<input type="text" name="zone" data-bind="textInput: zone">
 	<label><input type="checkbox" name="originalzone"> originalzone</label>
-	<input type="text" name="header_name">
-	<input type="text" name="date_part">
+	<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>
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 51d7439fb..2e76caa2a 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
@@ -9,5 +9,5 @@ deleteheader
 		<option>:matches</option>
 		<option data-bind="visible root.capa.extlists">:list</option>
 	</select>
-	<input type="text" name="field_name">
+	<input type="text" name="field_name" data-bind="textInput: field_name">
 	<textarea name="source">GrammarStringList</textarea>
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 cd9556bc0..eb19c8138 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,11 +1,8 @@
 <!-- rfc5228 -->
 elsif
-<div>
-	this.test
-</div>
+<div data-bind="template: {name: $root.templateName(test), data: test}"></div>
 {
-	<div data-bind="foreach: commands">
+	<div style="padding-left:4em" data-bind="foreach: commands">
 		<div data-bind="template: {name: $root.templateName($data)}"></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 2079c1cd0..8aa233fc8 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,7 @@
 <!-- rfc5228 -->
 else
 {
-	<div data-bind="foreach: commands">
+	<div style="padding-left:4em" data-bind="foreach: commands">
 		<div data-bind="template: {name: $root.templateName($data)}"></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 c7d63c2b4..80972d28d 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">
+	<input type="text" name="_subject" data-bind="textInput: _subject">
 	<textarea name="source">GrammarStringList</textarea>
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 e84bfd097..09d51c996 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">
+	<input type="text" name="name" data-bind="textInput: name">
 	<textarea name="key_list">GrammarStringList</textarea>
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 3fae91861..db76e8980 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">
+	<input type="text" name="_reason" 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 1dea618e9..fccab2766 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">
+	<input type="text" name="message" data-bind="textInput: message">
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 6ab650846..e0d3f12d4 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
@@ -2,4 +2,4 @@
 extracttext
 	modifiers = [];
 	<input type="number" name="_first">
-	<input type="text" name="varname">
+	<input type="text" name="varname" 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 73fd115fd..9c2799152 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
-	<label data-bind="root.capa.copy"><input type="checkbox"> copy</label><!-- rfc3894 -->
-	<label data-bind="root.capa.mailbox"><input type="checkbox"> create</label><!-- rfc5490 -->
-	<input data-bind="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 3874c08e6..f184bda87 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">
+	<input type="text" name="_name" 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/HeaderTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/HeaderTest.html
index 40fdd8278..6ed1c5685 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,18 +1,25 @@
 <!-- rfc5228 -->
 header
-	<select name="address_part">
+	<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="header_names">GrammarStringList</textarea>
-	<textarea name="key_list">GrammarStringList</textarea>
-	<input type="number" name="index">
-	<input type="checkbox" name="last">
-	<input type="checkbox" name="mime">
-	<input type="checkbox" name="anychild">
+	-->
+	<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: -->
-	<input type="checkbox" name="type">
-	<input type="checkbox" name="subtype">
-	<input type="checkbox" name="contenttype">
-	<textarea name="param">GrammarStringList</textarea>
+	<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>
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 e2856bb3e..fa92d26f3 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,10 +1,8 @@
 <!-- rfc5228 -->
 if
-<div>
-	this.test
-</div>
+<div data-bind="template: {name: $root.templateName(test), data: test}"></div>
 {
-	<div data-bind="foreach: commands">
+	<div style="padding-left:4em" data-bind="foreach: commands">
 		<div data-bind="template: {name: $root.templateName($data)}"></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 832e2f721..bf0575d47 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
@@ -3,4 +3,4 @@ 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">
+	<input type="text" name="value" data-bind="textInput: value">
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 45e028d96..591514f93 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">
+	<input type="text" name="mailbox" data-bind="textInput: mailbox">
 	<textarea name="annotation_names">GrammarStringList</textarea>
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 c43e92f55..175433dd5 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">
-	<input type="text" name="annotation_name">
+	<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>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/NotTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/NotTest.html
index 55f467e28..83d10abc9 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/NotTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/NotTest.html
@@ -1,3 +1,3 @@
 <!-- rfc5228 -->
 not
-	<div data-bind="template: {name: $root.templateName(test)}"></div>
+	<div data-bind="template: {name: $root.templateName(test), data: test}"></div>
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 0334a314b..b12358d63 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">
-	<input type="text" name="_from">
+	<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">
+	<input type="text" name="_message" 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 678185355..1fbf7e2e3 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">
-	<input type="text" name="notification_capability">
+	<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>
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 18fc1a393..de6c2827d 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">
+	<input type="text" name="_reason" 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 17494b8fd..6e3ad5ad1 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">
+	<input type="text" name="_variablename" data-bind="textInput: _variablename">
 	<textarea name="source">GrammarStringList</textarea>
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 f93444115..d835cd674 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">
-	<input type="text" name="_from">
-	<input type="text" name="replacement">
+	<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">
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 dd2132ce9..dd84e9794 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">
+	<input type="text" name="annotation_name" data-bind="textInput: annotation_name">
 	<textarea name="key_list">GrammarStringList</textarea>
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 a8526e318..4d3a3cdeb 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">
-	<input type="text" name="_value">
+	<input type="text" name="_name" data-bind="textInput: _name">
+	<input type="text" name="_value" 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 d8c765d5d..b4b93cf2d 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">
+	<input type="text" name="_variablename" data-bind="textInput: _variablename">
 	<textarea name="source">GrammarStringList</textarea>
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 04351d77c..4da00e13a 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">
+	<input type="text" name="value" data-bind="textInput: value">
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 8763e6330..adaa5f037 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
@@ -2,9 +2,9 @@
 vacation
 	<input type="number" name="_days">
 	<input type="number" name="_seconds">
-	<input type="text" name="_subject">
-	<input type="text" name="_from">
+	<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">
-	<input type="text" name="_reason"> // QuotedString / MultiLine
+	<input type="text" name="_handle" data-bind="textInput: _handle">
+	<input type="text" name="_reason" data-bind="textInput: _reason"> // QuotedString / MultiLine
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 a73e87d3e..80fa73d5a 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"> // 1 - 5
+	<input type="text" name="value" data-bind="textInput: value"> // 1 - 5