[Bug 161775] Reply shouldn't quote inline attachments

Patch by Jeff Beckley <beckley@qualcomm.com>, r=bienvenu, sr=mscott

mailnews/mime/src/mimei.cpp

@@ -906,7 +906,9 @@ mime_create (const char *content_type, MimeHeaders *hdrs,
   }
 
   /* If the option `Show Attachments Inline' is off, now would be the time to change our mind... */
-  if (opts && !opts->show_attachment_inline_p)
+  /* Also, if we're doing a reply (i.e. quoting the body), then treat that as no inline attachments. */
+  if (opts && (!opts->show_attachment_inline_p || opts->format_out == nsMimeOutput::nsMimeMessageQuoting ||
+                opts->format_out == nsMimeOutput::nsMimeMessageBodyQuoting))
   {
     if (mime_subclass_p(clazz, (MimeObjectClass *)&mimeInlineTextClass))
     {

mailnews/mime/src/mimetpla.cpp

@@ -51,7 +51,6 @@
 #include "nsIPrefBranch.h"
 #include "prprf.h"
 #include "nsMsgI18N.h"
-#include "nsMimeTypes.h"
 
 #define MIME_SUPERCLASS mimeInlineTextClass
 MimeDefClass(MimeInlineTextPlain, MimeInlineTextPlainClass,
@@ -270,11 +269,6 @@ MimeInlineTextPlain_parse_eof (MimeObject *obj, PRBool abort_p)
   status = ((MimeObjectClass*)&MIME_SUPERCLASS)->parse_eof(obj, abort_p);
   if (status < 0) return status;
 
-  // if this part has a name and it's not a message/rfc822, don't quote
-  if (quoting && obj->headers && MimeHeaders_get_name(obj->headers, obj->options) 
-      && PL_strcasecmp(obj->content_type, MESSAGE_RFC822))
-    return 0;
-
   if (!obj->output_p) return 0;
 
   if (obj->options &&
@@ -341,11 +335,6 @@ MimeInlineTextPlain_parse_line (const char *line, PRInt32 length, MimeObject *ob
   char *mailCharset = NULL;
   nsresult rv;
 
-  // if this part has a name and it's not a message/rfc822, don't quote
-  if (quoting && obj->headers && MimeHeaders_get_name(obj->headers, obj->options) 
-      && PL_strcasecmp(obj->content_type, MESSAGE_RFC822))
-    return 0;
-
   if (!skipConversion)
   {
     nsDependentCString inputStr(line, length);