From aef7175dd0a4719f4a1614ce3e0e7c7f5da26568 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 13 Aug 2022 08:38:51 +0200
Subject: [PATCH] Load headers with unicode indicator

---
 app/src/main/java/com/sun/mail/imap/IMAPBodyPart.java  | 2 +-
 app/src/main/java/com/sun/mail/imap/IMAPMessage.java   | 6 +++---
 app/src/main/java/javax/mail/internet/MimeMessage.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/sun/mail/imap/IMAPBodyPart.java b/app/src/main/java/com/sun/mail/imap/IMAPBodyPart.java
index 20436b59eb..9fb5e97660 100644
--- a/app/src/main/java/com/sun/mail/imap/IMAPBodyPart.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPBodyPart.java
@@ -420,7 +420,7 @@ public class IMAPBodyPart extends MimeBodyPart implements ReadableMime {
 		    if (bis == null)
 			throw new MessagingException("Failed to fetch headers");
 
-		    headers.load(bis);
+		    headers.load(bis, message.allowutf8);
 
 		} else {
 
diff --git a/app/src/main/java/com/sun/mail/imap/IMAPMessage.java b/app/src/main/java/com/sun/mail/imap/IMAPMessage.java
index ca64da9ddd..5191dc058a 100644
--- a/app/src/main/java/com/sun/mail/imap/IMAPMessage.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPMessage.java
@@ -978,7 +978,7 @@ public class IMAPMessage extends MimeMessage implements ReadableMime {
 
 	if (headers == null)
 	    headers = new InternetHeaders();
-	headers.load(is); // load this header into the Headers object.
+	headers.load(is, allowutf8); // load this header into the Headers object.
 	setHeaderLoaded(name); // Mark this header as loaded
 
 	return headers.getHeader(name);
@@ -1365,7 +1365,7 @@ public class IMAPMessage extends MimeMessage implements ReadableMime {
 		// instead of a string just containing a CR/LF
 		// when the header list is empty.
 		if (headerStream != null)
-		    h.load(headerStream);
+		    h.load(headerStream, allowutf8);
 		if (headers == null || allHeaders)
 		    headers = h;
 		else {
@@ -1634,7 +1634,7 @@ public class IMAPMessage extends MimeMessage implements ReadableMime {
 
 	if (is == null)
 	    throw new MessagingException("Cannot load header");
-	headers = new InternetHeaders(is);
+	headers = new InternetHeaders(is, allowutf8);
 	headersLoaded = true;
     }
 
diff --git a/app/src/main/java/javax/mail/internet/MimeMessage.java b/app/src/main/java/javax/mail/internet/MimeMessage.java
index 262a0fc763..9f68495728 100644
--- a/app/src/main/java/javax/mail/internet/MimeMessage.java
+++ b/app/src/main/java/javax/mail/internet/MimeMessage.java
@@ -160,7 +160,7 @@ public class MimeMessage extends Message implements MimePart {
     // Should addresses in headers be parsed in "strict" mode?
     private boolean strict = true;
     // Is UTF-8 allowed in headers?
-    private boolean allowutf8 = false;
+    public boolean allowutf8 = false;
 
     /**
      * Default constructor. An empty message object is created.