Bug 1095629 - Don't force plaintext sendformat for MAPI compositions. r=jorgk a=jorgk
authorThomas Düllmann <bugzilla2007@duellmann24.net>
Thu, 22 Oct 2015 15:06:00 +0200
changeset 27687 635203afc5f1a8cbbbc33091bb7111adac17615e
parent 27686 5326625b6a77968821193e78552f5251666b77b1
child 27688 b970baae33f89fd32eb9a6cd807fd9a7c2d1c9cf
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk, jorgk
bugs1095629
Bug 1095629 - Don't force plaintext sendformat for MAPI compositions. r=jorgk a=jorgk
mailnews/mapi/mapihook/src/msgMapiHook.cpp
--- a/mailnews/mapi/mapihook/src/msgMapiHook.cpp
+++ b/mailnews/mapi/mapihook/src/msgMapiHook.cpp
@@ -431,19 +431,16 @@ nsresult nsMapiHook::PopulateCompFields(
   // set body
   if (aMessage->lpszNoteText)
   {
       nsString Body;
       CopyASCIItoUTF16(aMessage->lpszNoteText, Body);
       if (Body.Last() != '\n')
         Body.AppendLiteral(CRLF);
 
-      if (Body.Find("<html>") == kNotFound)
-        aCompFields->SetForcePlainText(true);
-
       rv = aCompFields->SetBody(Body) ;
   }
   return rv ;
 }
 
 nsresult nsMapiHook::HandleAttachments (nsIMsgCompFields * aCompFields, int32_t aFileCount,
                                         lpnsMapiFileDesc aFiles, BOOL aIsUnicode)
 {
@@ -636,19 +633,16 @@ nsresult nsMapiHook::PopulateCompFieldsW
     nsAutoString Body ;
     if (platformCharSet.IsEmpty())
       platformCharSet.Assign(nsMsgI18NFileSystemCharset());
     rv = ConvertToUnicode(platformCharSet.get(), (char *) aMessage->lpszNoteText, Body);
     if (NS_FAILED(rv)) return rv ;
     if (Body.Last() != '\n')
       Body.AppendLiteral(CRLF);
 
-    if (Body.Find("<html>") == kNotFound)
-      aCompFields->SetForcePlainText(true);
-
     rv = aCompFields->SetBody(Body) ;
   }
 
 #ifdef RAJIV_DEBUG
   // testing what all was set in CompFields
   printf ("To : %S \n", To.get()) ;
   printf ("CC : %S \n", Cc.get() ) ;
   printf ("BCC : %S \n", Bcc.get() ) ;