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 23efa8810..ff8c7e76c 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
@@ -10,4 +10,4 @@ deleteheader
 		<option data-bind="visible root.capa.extlists">:list</option>
 	</select>
 	<input type="text" data-bind="textInput: field_name">
-	<input type="text" data-bind="textInput: source" pattern='".+"|\[".+"(,".+")*\]'>
+	<input type="text" data-bind="textInput: value_patterns" pattern='".+"|\[".+"(,".+")*\]'>
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 1d1fa6cd8..410f00e86 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" data-bind="textInput: _subject">
-	<input type="text" data-bind="textInput: source" pattern='".+"|\[".+"(,".+")*\]'>
+	<input type="text" data-bind="textInput: headers" pattern='".+"|\[".+"(,".+")*\]'>
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 d16b93ea7..16e089182 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
-	<input type="text" data-bind="textInput: source" pattern='".+"|\[".+"(,".+")*\]'>
+	<input type="text" data-bind="textInput: value" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/GrammarBracketComment.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/GrammarBracketComment.html
new file mode 100644
index 000000000..69901eba1
--- /dev/null
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/GrammarBracketComment.html
@@ -0,0 +1,3 @@
+/*
+<textarea style="display:block" data-bind="textInput: value"></textarea>
+*/
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/GrammarHashComment.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/GrammarHashComment.html
new file mode 100644
index 000000000..e4f82dfab
--- /dev/null
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/GrammarHashComment.html
@@ -0,0 +1 @@
+# <input type="text" data-bind="textInput: value">
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 c545501a2..09c33a705 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
@@ -2,6 +2,6 @@
 notify
 	<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="number" data-bind="textInput: _importance">
+	<input type="text" data-bind="textInput: options" pattern='".+"|\[".+"(,".+")*\]'>
 	<input type="text" data-bind="textInput: _message">
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 6b8c25e56..2a8be9618 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">
-	<input type="number">
+	<input type="number" data-bind="textInput: _days">
+	<input type="number" data-bind="textInput: _seconds">
 	<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: addresses" pattern='".+"|\[".+"(,".+")*\]'>
+	<label><input type="checkbox" data-bind="checked: mime"> mime</label>
 	<input type="text" data-bind="textInput: _handle">
 	<input type="text" data-bind="textInput: _reason"> // QuotedString / MultiLine