From d059c5f6d2a0707df1b9164abf37f8266e3f80cf Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 6 Oct 2022 09:26:10 +0200
Subject: [PATCH] Revert "Fixed nested IMAP message encoding"

This reverts commit 61d078f92949da55dfe046848362e0bb80459c20.
---
 app/src/main/java/com/sun/mail/imap/IMAPBodyPart.java    | 3 +--
 app/src/main/java/com/sun/mail/imap/IMAPMessage.java     | 8 +-------
 .../main/java/com/sun/mail/imap/IMAPNestedMessage.java   | 9 +--------
 3 files changed, 3 insertions(+), 17 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 9fb5e97660..8bb567628e 100644
--- a/app/src/main/java/com/sun/mail/imap/IMAPBodyPart.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPBodyPart.java
@@ -294,8 +294,7 @@ public class IMAPBodyPart extends MimeBodyPart implements ReadableMime {
 		     );
 	    else if (bs.isNested() && message.isREV1() && bs.envelope != null)
 		dh = new DataHandler(
-			new IMAPNestedMessage(message,
-					      bs.encoding,
+			new IMAPNestedMessage(message, 
 					      bs.bodies[0],
 					      bs.envelope,
 					      sectionId),
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 5191dc058a..a511784b07 100644
--- a/app/src/main/java/com/sun/mail/imap/IMAPMessage.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPMessage.java
@@ -830,8 +830,7 @@ public class IMAPMessage extends MimeMessage implements ReadableMime {
 		 * FETCH the components of nested messages
 		 */
 		dh = new DataHandler(
-			    new IMAPNestedMessage(this,
-				bs.encoding,
+			    new IMAPNestedMessage(this, 
 				bs.bodies[0], 
 				bs.envelope,
 				sectionId == null ? "1" : sectionId + ".1"),
@@ -913,11 +912,6 @@ public class IMAPMessage extends MimeMessage implements ReadableMime {
 	    return;
 	}
 	InputStream is = getMimeStream();
-	if (this instanceof IMAPNestedMessage) {
-		String encoding = getEncoding();
-		if (encoding != null)
-			is = MimeUtility.decode(is, encoding);
-	}
 	try {
 	    // write out the bytes
 	    byte[] bytes = new byte[16*1024];
diff --git a/app/src/main/java/com/sun/mail/imap/IMAPNestedMessage.java b/app/src/main/java/com/sun/mail/imap/IMAPNestedMessage.java
index b9e97975ab..12cd4e453a 100644
--- a/app/src/main/java/com/sun/mail/imap/IMAPNestedMessage.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPNestedMessage.java
@@ -29,7 +29,6 @@ import com.sun.mail.iap.ProtocolException;
 
 public class IMAPNestedMessage extends IMAPMessage {
     private IMAPMessage msg; // the enclosure of this nested message
-    private String encoding;
 
     /**
      * Package private constructor. <p>
@@ -37,10 +36,9 @@ public class IMAPNestedMessage extends IMAPMessage {
      * Note that nested messages have no containing folder, nor 
      * a message number.
      */
-    IMAPNestedMessage(IMAPMessage m, String enc, BODYSTRUCTURE b, ENVELOPE e, String sid) {
+    IMAPNestedMessage(IMAPMessage m, BODYSTRUCTURE b, ENVELOPE e, String sid) {
 	super(m._getSession());
 	msg = m;
-	encoding = enc;
 	bs = b;
 	envelope = e;
 	sectionId = sid;
@@ -126,11 +124,6 @@ public class IMAPNestedMessage extends IMAPMessage {
 	return bs.size;
     }
 
-    @Override
-    public String getEncoding() {
-        return encoding;
-    }
-
     /*
      * Disallow setting flags on nested messages
      */