diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js
index 9a64d7716..1b3820f14 100644
--- a/dev/View/Popup/Domain.js
+++ b/dev/View/Popup/Domain.js
@@ -45,6 +45,7 @@ const
 		sievePort: 4190,
 		sieveType: 0,
 		sieveTimeout: 10,
+		sieveAuthLiteral: true,
 
 		smtpHost: '',
 		smtpPort: 25,
@@ -108,6 +109,7 @@ const
 		},
 		Sieve: {
 			enabled: !!oDomain.sieveEnabled(),
+			authLiteral: !!oDomain.sieveAuthLiteral(),
 			host: oDomain.sieveHost,
 			port: oDomain.sievePort,
 			secure: pInt(oDomain.sieveType()),
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php
index d59cb9b1d..7bd769272 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php
@@ -21,20 +21,13 @@ class Settings extends \MailSo\Net\ConnectSettings
 
 	public bool $enabled = false;
 
-	public bool $authPlainLiteral = false;
-
-	public function __construct()
-	{
-		parent::__construct();
-		$oConfig = \RainLoop\API::Config();
-		$this->authPlainLiteral = !$oConfig->Get('labs', 'sieve_auth_plain_initial', true);
-	}
+	public bool $authLiteral = true;
 
 	public static function fromArray(array $aSettings) : self
 	{
 		$object = parent::fromArray($aSettings);
 		$object->enabled = !empty($aSettings['enabled']);
-//		$object->authPlainLiteral = !empty($aSettings['authPlainLiteral']);
+		$object->authLiteral = !isset($aSettings['authLiteral']) || !empty($aSettings['authLiteral']);
 		return $object;
 	}
 
@@ -46,7 +39,7 @@ class Settings extends \MailSo\Net\ConnectSettings
 			[
 //				'@Object' => 'Object/SmtpSettings',
 				'enabled' => $this->enabled,
-//				'authPlainLiteral' => $this->authPlainLiteral
+				'authLiteral' => $this->authLiteral
 			]
 		);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
index 35917fd24..a0a1cd595 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
@@ -134,7 +134,7 @@ class SieveClient extends \MailSo\Net\NetClient
 				$sAuth = $SASL->authenticate($sLogin, $sPassword, $sLoginAuthKey);
 				$this->logMask($sAuth);
 
-				if ($oSettings->authPlainLiteral) {
+				if ($oSettings->authLiteral) {
 					$this->sendRaw("AUTHENTICATE \"{$type}\" {".\strlen($sAuth).'+}');
 					$this->sendRaw($sAuth);
 				} else {
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 2d44ab4e8..fb3bdc394 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
@@ -420,7 +420,6 @@ Enables caching in the system'),
 				'login_fault_delay' => array(5, 'When login fails, wait N seconds before responding'),
 				'log_ajax_response_write_limit' => array(300),
 				'smtp_show_server_errors' => array(false),
-				'sieve_auth_plain_initial' => array(true),
 				'mail_func_clear_headers' => array(true, 'PHP mail() remove To and Subject headers'),
 				'mail_func_additional_parameters' => array(false, 'PHP mail() set -f emailaddress'),
 				'folders_spec_limit' => array(50),
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index b5d07b8aa..f30a5ebfd 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -272,6 +272,15 @@
 							<input name="Sieve[timeout]" type="number" min="5" step="1"  style="width:6em" data-bind="textInput: sieveTimeout">
 						</div>
 					</div>
+
+					<h4 data-i18n="LOGIN/LABEL_LOGIN"></h4>
+					<div data-bind="component: {
+						name: 'Checkbox',
+						params: {
+							value: sieveAuthLiteral,
+							label: 'Use LITERAL+'
+						}
+					}"></div>
 				</div>
 			</div>