diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php
index 35f0165eb..d80d6705a 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php
@@ -346,7 +346,7 @@ class Http
 			CURLOPT_FAILONERROR => true,
 			CURLOPT_SSL_VERIFYPEER => false,
 			CURLOPT_RETURNTRANSFER => true,
-			CURLOPT_FOLLOWLOCATION => !!$bFollowLocation,
+			CURLOPT_FOLLOWLOCATION => $bFollowLocation,
 			CURLOPT_MAXREDIRS => 7,
 			CURLOPT_FILE => $rFile,
 			CURLOPT_TIMEOUT => (int) $iTimeout
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Driver.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Driver.php
index cc5485522..725071790 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Driver.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Driver.php
@@ -140,13 +140,13 @@ abstract class Driver
 
 	public function WriteOnErrorOnly(bool $bValue) : self
 	{
-		$this->bWriteOnErrorOnly = !!$bValue;
+		$this->bWriteOnErrorOnly = $bValue;
 		return $this;
 	}
 
 	public function WriteOnPhpErrorOnly(bool $bValue) : self
 	{
-		$this->bWriteOnPhpErrorOnly = !!$bValue;
+		$this->bWriteOnPhpErrorOnly = $bValue;
 		return $this;
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
index e7805d5a6..5b25e8925 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
@@ -167,14 +167,12 @@ abstract class NetClient
 		$this->writeLog('Start connection to "'.$this->sConnectedHost.':'.$this->iConnectedPort.'"',
 			\MailSo\Log\Enumerations\Type::NOTE);
 
-		$bVerifySsl = !!$bVerifySsl;
-		$bAllowSelfSigned = $bVerifySsl ? !!$bAllowSelfSigned : true;
 		$aStreamContextSettings = array(
 			'ssl' => array(
 				'verify_host' => $bVerifySsl,
 				'verify_peer' => $bVerifySsl,
 				'verify_peer_name' => $bVerifySsl,
-				'allow_self_signed' => $bAllowSelfSigned
+				'allow_self_signed' => $bVerifySsl ? $bAllowSelfSigned : true
 			)
 		);
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index b26f22376..948ffc43c 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -141,7 +141,7 @@ class Actions
 		}
 
 		$this->oLogger = \MailSo\Log\Logger::SingletonInstance();
-		if (!!$this->oConfig->Get('logs', 'enable', false)) {
+		if ($this->oConfig->Get('logs', 'enable', false)) {
 			$sSessionFilter = (string)$this->oConfig->Get('logs', 'session_filter', '');
 			if (!empty($sSessionFilter)) {
 				$aSessionParts = \explode(':', $sSessionFilter, 2);
@@ -633,7 +633,7 @@ class Actions
 		if (null === $this->oLoggerAuth) {
 			$this->oLoggerAuth = new \MailSo\Log\Logger(false);
 
-			if (!!$this->oConfig->Get('logs', 'auth_logging', false)) {
+			if ($this->oConfig->Get('logs', 'auth_logging', false)) {
 				$sAuthLogFileFullPath = \APP_PRIVATE_DATA . 'logs/' . $this->compileLogFileName(
 						$this->oConfig->Get('logs', 'auth_logging_filename', ''));
 
@@ -963,7 +963,7 @@ class Actions
 			$aResult['PluginsLink'] = './?/Plugins/0/' . ($bAdmin ? 'Admin' : 'User') . '/' . $sStaticCache . '/';
 		}
 
-		$bAppJsDebug = !!$this->oConfig->Get('labs', 'use_app_debug_js', false);
+		$bAppJsDebug = $this->oConfig->Get('labs', 'use_app_debug_js', false);
 
 		$aResult['StaticLibJsLink'] = $this->StaticPath('js/' . ($bAppJsDebug ? '' : 'min/') .
 			'libs' . ($bAppJsDebug ? '' : '.min') . '.js');
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
index f03519bb3..b11f71199 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
@@ -171,7 +171,7 @@ trait Response
 
 			$oAccount = $this->getAccountFromToken();
 
-			if (!$mResult['DateTimeStampInUTC'] || !!$this->Config()->Get('labs', 'date_from_headers', false)) {
+			if (!$mResult['DateTimeStampInUTC'] || $this->Config()->Get('labs', 'date_from_headers', false)) {
 				$iDateTimeStampInUTC = $mResponse->HeaderTimeStampInUTC();
 				if ($iDateTimeStampInUTC) {
 					$mResult['DateTimeStampInUTC'] = $iDateTimeStampInUTC;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
index 32dcd108d..aa7c9ad3f 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
@@ -35,7 +35,7 @@ trait UserAuth
 		if (false === \strpos($sEmail, '@')) {
 			$this->Logger()->Write('The email address "' . $sEmail . '" is not complete', \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
 
-			if (false === \strpos($sEmail, '@') && !!$this->Config()->Get('login', 'determine_user_domain', false)) {
+			if (false === \strpos($sEmail, '@') && $this->Config()->Get('login', 'determine_user_domain', false)) {
 				$sUserHost = \trim($this->Http()->GetHost(false, true, true));
 				$this->Logger()->Write('Determined user domain: ' . $sUserHost, \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
index 7901763e3..037d41fc5 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
@@ -140,7 +140,7 @@ class Identity implements \JsonSerializable
 			$this->sBcc = !empty($aData['Bcc']) ? $aData['Bcc'] : '';
 			$this->sSignature = !empty($aData['Signature']) ? $aData['Signature'] : '';
 			$this->bSignatureInsertBefore = isset($aData['SignatureInsertBefore']) ?
-				($bJson ? '1' === $aData['SignatureInsertBefore'] : !!$aData['SignatureInsertBefore']) : true;
+				!empty($aData['SignatureInsertBefore']) : true;
 
 			return true;
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
index ef8a63bf9..9f679de2d 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
@@ -217,7 +217,7 @@ class Manager
 	{
 		if ($this->bIsEnabled && isset($aAppData['Plugins']) && \is_array($aAppData['Plugins']))
 		{
-			$bAuth = isset($aAppData['Auth']) && !!$aAppData['Auth'];
+			$bAuth = !empty($aAppData['Auth']);
 			foreach ($this->aPlugins as $oPlugin)
 			{
 				if ($oPlugin)
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php
index 0af4c3746..dac5e8267 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php
@@ -95,7 +95,7 @@ class Property
 
 	public function SetAllowedInJs(bool $bValue = true) : self
 	{
-		$this->bAllowedInJs = !!$bValue;
+		$this->bAllowedInJs = $bValue;
 
 		return $this;
 	}