From 6cd36e075206ae06fba4fe4aa8b2f9c6ff5f0a38 Mon Sep 17 00:00:00 2001
From: the-djmaze <3752035+the-djmaze@users.noreply.github.com>
Date: Mon, 2 Nov 2026 03:58:26 +0100
Subject: [PATCH] Added Email::GetEmailUtf8()

---
 .../v/0.0.0/app/libraries/MailSo/Mime/Email.php     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
index 002820bf0..18895a85e 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
@@ -155,7 +155,7 @@ class Email implements \JsonSerializable
 
 	public function GetEmail(bool $bUtf8 = false): string
 	{
-		return $bUtf8 ? \SnappyMail\IDN::emailToUtf8($this->sEmail) : $this->sEmail;
+		return $this->sEmail;
 	}
 
 	public function GetEmailUtf8(): string
@@ -173,9 +173,14 @@ class Email implements \JsonSerializable
 		return Utils::getEmailAddressLocalPart($this->sEmail);
 	}
 
-	public function GetDomain(bool $bIdn = false): string
+	public function GetDomain(): string
 	{
-		return Utils::getEmailAddressDomain($this->GetEmail($bIdn));
+		return Utils::getEmailAddressDomain($this->GetEmail());
+	}
+
+	public function GetDomainUtf8(): string
+	{
+		return Utils::getEmailAddressDomain($this->GetEmailUtf8());
 	}
 
 	public function SetDkimStatus(string $sDkimStatus): void
@@ -187,7 +192,7 @@ class Email implements \JsonSerializable
 	{
 		$sReturn = '';
 		if (\strlen($this->sEmail)) {
-			$sReturn = $this->GetEmail($bUtf8);
+			$sReturn = $bUtf8 ? $this->GetEmailUtf8() : $this->GetEmail();
 			$sDisplayName = $this->sDisplayName;
 			if (\strlen($sDisplayName)) {
 				$sDisplayName = \str_replace('"', '\"', $sDisplayName);