From 6666712bc9f9208bb31b96aff8573ef9eb2c150f Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Sat, 28 Jan 2023 08:28:40 +0100
Subject: [PATCH] Cleanup #884

---
 .../v/0.0.0/app/libraries/RainLoop/Model/Account.php     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
index d3c45285d..0f02be7aa 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
@@ -228,6 +228,8 @@ abstract class Account implements \JsonSerializable
 //		$oSettings->body_text_limit = \min($oSettings->body_text_limit, (int) $oConfig->Get('imap', 'body_text_limit', 50));
 //		$oSettings->thread_limit = \min($oSettings->thread_limit, (int) $oConfig->Get('imap', 'large_thread_limit', 50));
 
+		$oImapClient->Settings = $oSettings;
+
 		$oPlugins->RunHook('imap.before-connect', array($this, $oImapClient, $oSettings));
 		$oImapClient->Connect($oSettings);
 		$oPlugins->RunHook('imap.after-connect', array($this, $oImapClient, $oSettings));
@@ -242,9 +244,11 @@ abstract class Account implements \JsonSerializable
 		$oSettings->Login = $this->OutLogin();
 		$oSettings->Ehlo = \MailSo\Smtp\SmtpClient::EhloHelper();
 
+		$oSmtpClient->Settings = $oSettings;
+
 		$oPlugins->RunHook('smtp.before-connect', array($this, $oSmtpClient, $oSettings));
 		if ($oSettings->usePhpMail) {
-			$oSmtpClient->Settings = $oSettings;
+			$oSettings->useAuth = false;
 			return true;
 		}
 		$oSmtpClient->Connect($oSettings, $oSettings->Ehlo);
@@ -254,7 +258,6 @@ abstract class Account implements \JsonSerializable
 			throw new RequireCredentialsException
 		}
 */
-		$oSettings->useAuth = $oSettings->useAuth && !$oSettings->usePhpMail;
 		$oSettings->Password = $this->sSmtpPassword ?: $this->sPassword;
 		return $this->netClientLogin($oSmtpClient, $oPlugins, $oSettings);
 	}
@@ -264,6 +267,8 @@ abstract class Account implements \JsonSerializable
 		$oSettings = $this->Domain()->SieveSettings();
 		$oSettings->Login = $this->IncLogin();
 
+		$oSieveClient->Settings = $oSettings;
+
 		$oPlugins->RunHook('sieve.before-connect', array($this, $oSieveClient, $oSettings));
 		$oSieveClient->Connect($oSettings);
 		$oPlugins->RunHook('sieve.after-connect', array($this, $oSieveClient, $oSettings));