diff --git a/Net/src/MailMessage.cpp b/Net/src/MailMessage.cpp
index f55cabeebc..c8bb0f7aae 100644
--- a/Net/src/MailMessage.cpp
+++ b/Net/src/MailMessage.cpp
@@ -105,6 +105,12 @@ namespace
 				NameValueCollection::ConstIterator end = header.end();
 				bool added = false;
 
+				if (contentDisp.empty())
+				{
+					_pMsg->addContent(pPS, cte);
+					added = true;
+				}
+
 				static const auto lcContentDisposition = Poco::toLower(MailMessage::HEADER_CONTENT_DISPOSITION);
 
 				for (; it != end; ++it)
@@ -122,12 +128,6 @@ namespace
 					pPS->headers().set(it->first, it->second);
 				}
 
-				if (contentDisp.empty())
-				{
-					_pMsg->addContent(pPS, cte);
-					added = true;
-				}
-
 				if (!added) delete pPS;
 			}
 		}
diff --git a/Net/testsuite/src/MailMessageTest.cpp b/Net/testsuite/src/MailMessageTest.cpp
index f21846be7e..e544f1f0c2 100644
--- a/Net/testsuite/src/MailMessageTest.cpp
+++ b/Net/testsuite/src/MailMessageTest.cpp
@@ -558,6 +558,42 @@ void MailMessageTest::testReadMultiPartMixedCaseHeaders()
 }
 
 
+void MailMessageTest::testReadMultiPartInvalidContentDisposition()
+{
+        std::istringstream istr(
+                "Content-type: multipart/mixed; boundary=MIME_boundary_01234567\r\n"
+                "Date: Thu, 1 Jan 1970 00:00:00 GMT\r\n"
+                "From: poco@appinf.com\r\n"
+                "Mime-Version: 1.0\r\n"
+                "Subject: Test Message\r\n"
+                "To: John Doe <john.doe@no.where>\r\n"
+                "\r\n"
+                "\r\n"
+                "Hello World!\r\n"
+                "\r\n"
+                "--MIME_boundary_01234567\r\n"
+                "Content-Disposition: \r\n"
+                "Content-Transfer-Encoding: base64\r\n"
+                "Content-Type: application/octet-stream; name=sample\r\n"
+                "\r\n"
+                "VGhpcyBpcyBzb21lIGJpbmFyeSBkYXRhLiBSZWFsbHku\r\n"
+                "--MIME_boundary_01234567--\r\n"
+        );
+
+        MailMessage message;
+        MailInputStream mis(istr);
+        message.read(mis);
+
+        assertTrue (message.isMultipart());
+        assertTrue (message.parts().size() == 1);
+        assertTrue (message.get(MailMessage::HEADER_CONTENT_TYPE) == "multipart/mixed; boundary=MIME_boundary_01234567");
+
+        assertTrue (message.parts()[0].encoding == MailMessage::ContentTransferEncoding::ENCODING_BASE64);
+        assertTrue (message.parts()[0].disposition == MailMessage::ContentDisposition::CONTENT_INLINE);
+        assertTrue (message.parts()[0].pSource->headers().get(MailMessage::HEADER_CONTENT_TYPE) == "application/octet-stream; name=sample");
+}
+
+
 void MailMessageTest::testReadMultiPartNoFinalBoundaryFromFile()
 {
 	std::string data(
@@ -758,6 +794,7 @@ CppUnit::Test* MailMessageTest::suite()
 	CppUnit_addTest(pSuite, MailMessageTest, testReadMultiPart);
 	CppUnit_addTest(pSuite, MailMessageTest, testReadMultiPartDefaultTransferEncoding);
 	CppUnit_addTest(pSuite, MailMessageTest, testReadMultiPartMixedCaseHeaders);
+	CppUnit_addTest(pSuite, MailMessageTest, testReadMultiPartInvalidContentDisposition);
 	CppUnit_addTest(pSuite, MailMessageTest, testReadMultiPartNoFinalBoundaryFromFile);
 	CppUnit_addTest(pSuite, MailMessageTest, testReadWriteMultiPart);
 	CppUnit_addTest(pSuite, MailMessageTest, testReadWriteMultiPartStore);
diff --git a/Net/testsuite/src/MailMessageTest.h b/Net/testsuite/src/MailMessageTest.h
index 14124dd22d..dcac091347 100644
--- a/Net/testsuite/src/MailMessageTest.h
+++ b/Net/testsuite/src/MailMessageTest.h
@@ -38,6 +38,7 @@ class MailMessageTest: public CppUnit::TestCase
 	void testReadMultiPartWithAttachmentNames();
 	void testReadMultiPartDefaultTransferEncoding();
 	void testReadMultiPartMixedCaseHeaders();
+	void testReadMultiPartInvalidContentDisposition();
 	void testReadMultiPartNoFinalBoundaryFromFile();
 	void testEncodeWord();