diff --git a/mail/base/content/msgHdrViewOverlay.js b/mail/base/content/msgHdrViewOverlay.js
index da490bae79c2..99829a0bbd53 100644
--- a/mail/base/content/msgHdrViewOverlay.js
+++ b/mail/base/content/msgHdrViewOverlay.js
@@ -391,9 +391,13 @@ var messageHeaderSink = {
       // presentation level change....don't show vcards as external attachments in the UI.
       // libmime already renders them inline.
 
+      if (contentType == "text/x-vcard")
+      {
       var inlineAttachments = pref.getBoolPref("mail.inline_attachments");
-      if (inlineAttachments && contentType == "text/x-vcard")
+        var displayHtmlAs = pref.getIntPref("mailnews.display.html_as");
+        if (inlineAttachments && !displayHtmlAs)
         return;
+      }
 
       currentAttachments.push (new createNewAttachmentInfo(contentType, url, displayName, uri, notDownloaded));
       // if we have an attachment, set the MSG_FLAG_ATTACH flag on the hdr