diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
index f2b176c92..a857767c0 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
@@ -778,10 +778,9 @@ trait Messages
 			$oSmtpClient = new \MailSo\Smtp\SmtpClient();
 			$oSmtpClient->SetLogger($this->Logger());
 
-			$bUsePhpMail = false;
-			$oAccount->SmtpConnectAndLogin($this->Plugins(), $oSmtpClient, $this->Config(), $bUsePhpMail);
+			$oAccount->SmtpConnectAndLogin($this->Plugins(), $oSmtpClient);
 
-			if ($bUsePhpMail) {
+			if ($oSmtpClient->Settings->usePhpMail) {
 				if (\MailSo\Base\Utils::FunctionCallable('mail')) {
 					$aToCollection = $oMessage->GetTo();
 					if ($aToCollection && $oFrom) {