From 55642e826ee5a1471474ef25ba0701a847508f0a Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 25 Mar 2024 19:34:30 +0100
Subject: [PATCH] Resolve #1517

---
 snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 b6a4208d7..4c1c173b1 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
@@ -35,6 +35,7 @@ abstract class Account implements \JsonSerializable
 
 	public function IncLogin() : string
 	{
+//		return $this->oDomain->ImapSettings()->fixUsername($this->sLogin);
 		return $this->sLogin;
 	}
 
@@ -45,7 +46,8 @@ abstract class Account implements \JsonSerializable
 
 	public function OutLogin() : string
 	{
-		return $this->sSmtpLogin ?: $this->sLogin;
+//		return $this->oDomain->SmtpSettings()->fixUsername($this->sSmtpLogin ?: $this->sEmail);
+		return $this->sSmtpLogin ?: $this->sEmail;
 	}
 
 	public function Domain() : Domain