Do not QP-encode CRLFs when content type is text.

1 files changed, 15 insertions, 0 deletions

diff --git a/src/net/imap/IMAPMessagePartContentHandler.cpp b/src/net/imap/IMAPMessagePartContentHandler.cpp
index 277ca579..c34dc076 100644
--- a/src/net/imap/IMAPMessagePartContentHandler.cpp
+++ b/src/net/imap/IMAPMessagePartContentHandler.cpp
@@ -90,6 +90,8 @@ void IMAPMessagePartContentHandler::generate
 
 			ref <utility::encoder::encoder> theEncoder = enc.getEncoder();
 			theEncoder->getProperties()["maxlinelength"] = maxLineLength;
+			theEncoder->getProperties()["text"] = (m_contentType.getType() == mediaTypes::TEXT);
+
 			theEncoder->encode(tempIn, os);
 		}
 		// No encoding to perform
@@ -110,6 +112,7 @@ void IMAPMessagePartContentHandler::generate
 		// Encode temporary buffer to output stream
 		ref <utility::encoder::encoder> theEncoder = enc.getEncoder();
 		theEncoder->getProperties()["maxlinelength"] = maxLineLength;
+		theEncoder->getProperties()["text"] = (m_contentType.getType() == mediaTypes::TEXT);
 
 		utility::inputStreamStringAdapter is(oss.str());
 
@@ -188,6 +191,18 @@ bool IMAPMessagePartContentHandler::isBuffered() const
 }
 
 
+void IMAPMessagePartContentHandler::setContentTypeHint(const mediaType& type)
+{
+	m_contentType = type;
+}
+
+
+const mediaType IMAPMessagePartContentHandler::getContentTypeHint() const
+{
+	return m_contentType;
+}
+
+
 } // imap
 } // net
 } // vmime