From c51769757cc54e160c50684a86200e3a00e7e2a7 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Tue, 24 Jan 2006 20:47:01 +0000
Subject: [PATCH] Bug #315625 --> When forwarding a message inline, Thunderbird
 strips inline-images when it shouldn't.

sr=bienvenu
---
 mailnews/compose/src/nsMsgCompose.cpp | 8 +++-----
 mailnews/compose/src/nsMsgCompose.h   | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/mailnews/compose/src/nsMsgCompose.cpp b/mailnews/compose/src/nsMsgCompose.cpp
index c56b509ebc3..21f9dd6d5b6 100644
--- a/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mailnews/compose/src/nsMsgCompose.cpp
@@ -405,10 +405,10 @@ nsresult nsMsgCompose::TagEmbeddedObjects(nsIEditorMailSupport *aEditor)
 
   // first, convert the rdf original msg uri into a url that represents the message...
   nsCOMPtr <nsIMsgMessageService> msgService;
-  rv = GetMessageServiceFromURI(mQuoteURI.get(), getter_AddRefs(msgService));
+  rv = GetMessageServiceFromURI(mOriginalMsgURI.get(), getter_AddRefs(msgService));
   if (NS_SUCCEEDED(rv))
   {
-    rv = msgService->GetUrlForUri(mQuoteURI.get(), getter_AddRefs(originalUrl), nsnull);
+    rv = msgService->GetUrlForUri(mOriginalMsgURI.get(), getter_AddRefs(originalUrl), nsnull);
     if (NS_SUCCEEDED(rv) && originalUrl)
     {
       originalUrl->GetScheme(originalScheme);
@@ -1856,8 +1856,6 @@ nsresult nsMsgCompose::CreateMessage(const char * originalMsgURI,
 
             // Setup quoting callbacks for later...
             mWhatHolder = 1;
-            mQuoteURI = originalMsgURI;
-
             break;
           }
         case nsIMsgCompType::ForwardAsAttachment:
@@ -3540,7 +3538,7 @@ nsMsgCompose::BuildQuotedMessageAndSignature(void)
 
   // We will fire off the quote operation and wait for it to
   // finish before we actually do anything with Ender...
-  return QuoteOriginalMessage(mQuoteURI.get(), mWhatHolder);
+  return QuoteOriginalMessage(mOriginalMsgURI.get(), mWhatHolder);
 }
 
 //
diff --git a/mailnews/compose/src/nsMsgCompose.h b/mailnews/compose/src/nsMsgCompose.h
index 76f90054444..64abdaf55eb 100644
--- a/mailnews/compose/src/nsMsgCompose.h
+++ b/mailnews/compose/src/nsMsgCompose.h
@@ -92,7 +92,6 @@ private:
                                                      nsIDOMNode * object);
   nsresult                      TagEmbeddedObjects(nsIEditorMailSupport *aMailEditor);
 
-  nsCString                     mQuoteURI;
   nsCString                     mQuoteCharset;
   nsCString                     mOriginalMsgURI; // used so we can mark message disposition flags after we send the message