#159: be able to handle empty email header, empty being defined as null, "" and "<>"

Author: bbottema

Diff for: src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java

@@ -1,6 +1,7 @@
 package org.simplejavamail.converter.internal.mimemessage;
 
 import com.sun.mail.handlers.text_plain;
+import org.simplejavamail.internal.util.MiscUtil;
 import org.simplejavamail.internal.util.Preconditions;
 
 import javax.activation.ActivationDataFlavor;
@@ -160,11 +161,11 @@ private static void parseMimePartTree(@Nonnull final MimePart currentPart, @Nonn
 
 	@SuppressWarnings("StatementWithEmptyBody")
 	private static void parseHeader(final Header header, @Nonnull final ParsedMimeMessageComponents parsedComponents) {
-		if (header.getName().equals("Disposition-Notification-To")) {
+		if (isEmailHeader(header, "Disposition-Notification-To")) {
 			parsedComponents.dispositionNotificationTo = createAddress(header, "Disposition-Notification-To");
-		} else if (header.getName().equals("Return-Receipt-To")) {
+		} else if (isEmailHeader(header, "Return-Receipt-To")) {
 			parsedComponents.returnReceiptTo = createAddress(header, "Return-Receipt-To");
-		} else if (header.getName().equals("Return-Path")) {
+		} else if (isEmailHeader(header, "Return-Path")) {
 			parsedComponents.bounceToAddress = createAddress(header, "Return-Path");
 		} else if (!HEADERS_TO_IGNORE.contains(header.getName())) {
 			parsedComponents.headers.put(header.getName(), header.getValue());
@@ -173,6 +174,12 @@ private static void parseHeader(final Header header, @Nonnull final ParsedMimeMe
 		}
 	}
 
+	private static boolean isEmailHeader(Header header, String emailHeaderName) {
+		return header.getName().equals(emailHeaderName) &&
+				!MiscUtil.valueNullOrEmpty(header.getValue()) &&
+				!header.getValue().equals("<>");
+	}
+	
 	@SuppressWarnings("WeakerAccess")
 	public static String parseFileName(@Nonnull final Part currentPart) {
 		try {

Diff for: src/test/java/org/simplejavamail/mailer/MailerLiveTest.java

@@ -130,7 +130,7 @@ private Email assertSendingEmail(final EmailPopulatingBuilder originalEmailPopul
 
 	@Test
 	public void createMailSession_ReplyToMessage()
-			throws IOException, MessagingException {
+			throws MessagingException {
 		// send initial mail
 		mailer.sendMail(readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg").buildEmail());
 		MimeMessage receivedMimeMessage = smtpServerRule.getOnlyMessage();
@@ -162,7 +162,7 @@ public void createMailSession_ReplyToMessage()
 
 	@Test
 	public void createMailSession_ReplyToMessage_NotAll_AndCustomReferences()
-			throws IOException, MessagingException {
+			throws MessagingException {
 		// send initial mail
 		mailer.sendMail(readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg").buildEmail());
 		MimeMessage receivedMimeMessage = smtpServerRule.getOnlyMessage();