diff --git a/mozilla/mailnews/mime/src/mimemoz2.cpp b/mozilla/mailnews/mime/src/mimemoz2.cpp
index 1d98e5b9531..236e9213953 100644
--- a/mozilla/mailnews/mime/src/mimemoz2.cpp
+++ b/mozilla/mailnews/mime/src/mimemoz2.cpp
@@ -1862,8 +1862,12 @@ static int DoLanguageSensitiveFont(MimeObject *obj, const char *prefixName, cons
 
 done:
   // if nothing has been written then write out just "<div>" to match with "</div>"
-  if (status == -1)
-    status = MimeObject_write(obj, "<div>\n", 6, PR_FALSE);
+  if (status == -1) {
+    if (!nsCRT::strcasecmp(obj->content_type, TEXT_HTML))
+      status = MimeObject_write(obj, "<div>", 5, PR_FALSE);
+    else
+      status = MimeObject_write(obj, "<pre>", 5, PR_FALSE);
+  }
 
   return status;
 }