diff --git a/mailnews/mime/src/nsStreamConverter.cpp b/mailnews/mime/src/nsStreamConverter.cpp
index 56f336878b2e..89645d37e77a 100644
--- a/mailnews/mime/src/nsStreamConverter.cpp
+++ b/mailnews/mime/src/nsStreamConverter.cpp
@@ -126,6 +126,12 @@ bridge_new_new_uri(void *bridgeStream, nsIURI *aURI)
         nsAutoString charset(uniCharset);
         if (!charset.IsEmpty())
           msd->options->default_charset = charset.ToNewCString();
+
+        // check to see if we have a charset override...and if we do, set that field appropriately too...
+        nsresult rv = i18nUrl->GetCharsetOverRide(getter_Copies(uniCharset));
+        charset = uniCharset;
+        if (NS_SUCCEEDED(rv) && !charset.IsEmpty())
+          msd->options->override_charset = charset.ToNewCString();
       }
       char *urlString;
       if (NS_SUCCEEDED(aURI->GetSpec(&urlString)))