diff --git a/dev/View/Popup/SieveScript.js b/dev/View/Popup/SieveScript.js
index 152b0fdad..9446cfecf 100644
--- a/dev/View/Popup/SieveScript.js
+++ b/dev/View/Popup/SieveScript.js
@@ -50,7 +50,10 @@ class SieveScriptPopupView extends AbstractViewNext {
 
 			self.saving = true;
 			self.saveError(false);
-//			script.body(script.filtersToRaw());
+
+			if (self.allowToggle()) {
+				script.body(script.filtersToRaw());
+			}
 
 			Remote.filtersScriptSave(
 				(result, data) => {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
index 712065a0b..8deda0a6b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
@@ -83,7 +83,7 @@ class SieveStorage implements FiltersInterface
 
 	public function Save(\RainLoop\Model\Account $oAccount, string $sScriptName, array $aFilters, string $sRaw = '') : bool
 	{
-		if (self::SIEVE_FILE_NAME === $sScriptName) {
+		if ($aFilters && !$sRaw) {
 			Sieve::$bUtf8FolderName = !!$this->oConfig->Get('labs', 'sieve_utf8_folder_name', true);
 			$sRaw = Sieve::collectionToFileString($aFilters);
 		}
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
index 37c64ee8d..298e97a84 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
@@ -47,7 +47,7 @@
 								<b class="i18n" data-i18n="POPUPS_SIEVE_SCRIPT/CAPABILITY_LABEL"></b>:
 								<span data-bind="text: $root.sieveCapabilities"></span>
 							</pre>
-							<textarea class="span8" data-bind="value: body, valueUpdate: 'afterkeydown'"></textarea>
+							<textarea class="span8" data-bind="value: body, valueUpdate: 'input'"></textarea>
 						</div>
 					</div>
 					<div data-bind="visible: !$root.rawActive()">