From 7a2eba270998e4bd7e19daec9871e49512578a5f Mon Sep 17 00:00:00 2001
From: "ducarroz%netscape.com"
 <ducarroz%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 18 Jun 2002 20:34:10 +0000
Subject: [PATCH] Fix for bug 146584. We need to convert plain text data to
 HTML before inserting it into a HTML compose window. R=varada, SR=mscott

git-svn-id: svn://10.0.0.236/trunk@123516 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/mime/src/mimedrft.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mozilla/mailnews/mime/src/mimedrft.cpp b/mozilla/mailnews/mime/src/mimedrft.cpp
index ae185a2ab73..65b60014f49 100644
--- a/mozilla/mailnews/mime/src/mimedrft.cpp
+++ b/mozilla/mailnews/mime/src/mimedrft.cpp
@@ -1465,6 +1465,15 @@ mime_parse_stream_complete (nsMIMESession *stream)
           {
             if (body && composeFormat == nsIMsgCompFormat::PlainText)
             {
+              //We need to convert the plain/text to HTML in order to escape any HTML markup
+              char *escapedBody = nsEscapeHTML(body);
+              if (escapedBody)
+              {
+                PR_Free(body);
+                body = escapedBody;
+                bodyLen = strlen(body);
+              }
+
               char* newbody = (char *)PR_MALLOC (bodyLen + 12); //+11 chars for <pre> & </pre> tags
               if (newbody)
               {