From e45959949cbbfcfdbd2f9160608fdfe61ce86aae Mon Sep 17 00:00:00 2001
From: the-djmaze <3752035+the-djmaze@users.noreply.github.com>
Date: Sat, 28 Jan 2023 00:44:10 +0100
Subject: [PATCH] changes for #884

---
 snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php | 5 ++---
 1 file changed, 2 insertions(+), 3 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 3004a450c..d3c45285d 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
@@ -236,16 +236,15 @@ abstract class Account implements \JsonSerializable
 		return $this->netClientLogin($oImapClient, $oPlugins, $oSettings);
 	}
 
-	public function SmtpConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient, \RainLoop\Config\Application $oConfig, bool &$bUsePhpMail = false) : bool
+	public function SmtpConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient) : bool
 	{
 		$oSettings = $this->Domain()->SmtpSettings();
 		$oSettings->Login = $this->OutLogin();
-		$oSettings->usePhpMail = $bUsePhpMail;
 		$oSettings->Ehlo = \MailSo\Smtp\SmtpClient::EhloHelper();
 
 		$oPlugins->RunHook('smtp.before-connect', array($this, $oSmtpClient, $oSettings));
 		if ($oSettings->usePhpMail) {
-			$bUsePhpMail = true;
+			$oSmtpClient->Settings = $oSettings;
 			return true;
 		}
 		$oSmtpClient->Connect($oSettings, $oSettings->Ehlo);