diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 98bd65de8..594a730cc 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -349,7 +349,6 @@ Enables caching in the system'),
 				'smtp_show_server_errors' => array(false),
 				'smtp_use_auth_plain' => array(true),
 				'smtp_use_auth_cram_md5' => array(false),
-				'sieve_utf8_folder_name' => array(true),
 				'sieve_auth_plain_initial' => array(true),
 				'sieve_allow_fileinto_inbox' => array(false),
 				'imap_timeout' => array(300),
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Sieve.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Sieve.php
index 69f3172ad..56aeae3e9 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Sieve.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Sieve.php
@@ -6,8 +6,6 @@ class Sieve
 {
 	const NEW_LINE = "\r\n";
 
-	public static $bUtf8FolderName = true;
-
 	public static function collectionToFileString(array $aFilters) : string
 	{
 		$sNL = static::NEW_LINE;
@@ -353,17 +351,9 @@ class Sieve
 				}
 				break;
 			case Enumerations\ActionType::MOVE_TO:
-				$sValue = $oFilter->ActionValue();
-				if (\strlen($sValue))
+				$sFolderName = $oFilter->ActionValue();
+				if (\strlen($sFolderName))
 				{
-					$sFolderName = $sValue; // utf7-imap
-					if (static::$bUtf8FolderName) // to utf-8
-					{
-						$sFolderName = \MailSo\Base\Utils::ConvertEncoding($sFolderName,
-							\MailSo\Base\Enumerations\Charset::UTF_7_IMAP,
-							\MailSo\Base\Enumerations\Charset::UTF_8);
-					}
-
 					$aCapa['fileinto'] = true;
 					$aResult[] = $sTab.'fileinto "'.static::quote($sFolderName).'";';
 					if ($oFilter->Stop())
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 819f75c98..915e89b9b 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
@@ -84,7 +84,6 @@ class SieveStorage implements FiltersInterface
 	public function Save(\RainLoop\Model\Account $oAccount, string $sScriptName, array $aFilters, string $sRaw = '') : bool
 	{
 		if ($aFilters && !$sRaw) {
-			Sieve::$bUtf8FolderName = !!$this->oConfig->Get('labs', 'sieve_utf8_folder_name', true);
 			$sRaw = Sieve::collectionToFileString($aFilters);
 		}
 		$oSieveClient = $this->getConnection($oAccount);