#407: process Outlook message headers, just like with MimeMessages

Author: bbottema

modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageHelper.java

@@ -249,9 +249,7 @@ private static BodyPart getBodyPartFromDatasource(final AttachmentResource attac
 		pl.set("name", fileName);
 		attachmentPart.setHeader("Content-Type", contentType + pl);
 		attachmentPart.setHeader("Content-ID", format("<%s>", resourceName));
-//		if (!valueNullOrEmpty(attachmentResource.getDescription())) { // FIXME clean up?
-			attachmentPart.setHeader("Content-Description", attachmentResource.getDescription());
-//		}
+		attachmentPart.setHeader("Content-Description", attachmentResource.getDescription());
 		if (!valueNullOrEmpty(attachmentResource.getContentTransferEncoding())) {
 			attachmentPart.setHeader("Content-Transfer-Encoding", attachmentResource.getContentTransferEncoding().getEncoder());
 		}

modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java

@@ -210,7 +210,6 @@ private static void parseHeader(final Header header, @NotNull final ParsedMimeMe
 			if (!parsedComponents.headers.containsKey(header.getName())) {
 				parsedComponents.headers.put(header.getName(), new ArrayList<>());
 			}
-			// FIXME see if we can do without this unfold
 			parsedComponents.headers.get(header.getName()).add(MimeUtility.unfold(header.getValue()));
 		} else {
 			// header recognized, but not relevant (see #HEADERS_TO_IGNORE)

modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerLiveTest.java

@@ -2,7 +2,6 @@
 
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
-import jakarta.mail.internet.MimeUtility;
 import lombok.val;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
@@ -468,12 +467,8 @@ public void createMailSession_ReplyToMessage_NotAll_AndCustomReferences()
 		EmailAssert.assertThat(receivedReplyToReply).hasOnlyRecipients(new Recipient("Moo Shmoo", "[email protected]", TO));
 		assertThat(receivedReplyToReply.getHeaders()).contains(entry("In-Reply-To", singletonList(receivedEmailReplyPopulatingBuilder.getId())));
 
-		// FIXME revert this to folded check?
-		assertThat(receivedReplyToReply.getHeaders()).contains(entry("References",
-				singletonList(format("%s %s",
-						receivedEmailPopulatingBuilder.getId(),
-						receivedEmailReplyPopulatingBuilder.getId()))
-		));
+		val references = format("%s %s", receivedEmailPopulatingBuilder.getId(), receivedEmailReplyPopulatingBuilder.getId());
+		assertThat(receivedReplyToReply.getHeaders()).contains(entry("References", singletonList(references)));
 	}
 
 	private void assertAttachmentMetadata(AttachmentResource embeddedImg, String mimeType, String filename) {