Bug 436869 - non-standard MIME types, application/x-pkcs7-mime and application/x-pkcs7-signature - don't need the x- prefix; additional patch for mime/emitters; r+sr=bienvenu

mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp

@@ -530,7 +530,9 @@ nsMimeHtmlDisplayEmitter::StartAttachmentInBody(const nsACString &name,
 
   if ( (contentType) &&
        ((!strcmp(contentType, APPLICATION_XPKCS7_MIME)) ||
+        (!strcmp(contentType, APPLICATION_PKCS7_MIME)) ||
         (!strcmp(contentType, APPLICATION_XPKCS7_SIGNATURE)) ||
+        (!strcmp(contentType, APPLICATION_PKCS7_SIGNATURE)) ||
         (!strcmp(contentType, TEXT_VCARD)))
      ) {
      mSkipAttachment = PR_TRUE;