diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 30ad2df3567..10ff7f45f63 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -4497,12 +4497,18 @@ nsDocShell::NewContentViewerObj(const char *aContentType,
                                                        aViewer),
                       NS_ERROR_FAILURE);
 
-    (*aViewer)->SetContainer(NS_STATIC_CAST(nsIContentViewerContainer *, this));
-
     nsCOMPtr<nsIPluginViewer> pv(do_QueryInterface(*aViewer));
-    if (pv)
-      SetTitle(nsnull);  // clear title bar for full-page plugin
+    if (pv) {
+      if (mName.EqualsIgnoreCase("messagepane")) {
+        NS_IF_RELEASE(*aViewer);
+        NS_IF_RELEASE(*aContentHandler);
+        return NS_ERROR_FAILURE; 
+      }
+      else
+        SetTitle(nsnull);  // clear title bar for full-page plugin
+    }
 
+    (*aViewer)->SetContainer(NS_STATIC_CAST(nsIContentViewerContainer *, this));
     return NS_OK;
 }
 
diff --git a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
index e2f9652369e..07e3fd1a462 100644
--- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
@@ -986,7 +986,6 @@ PluginListener::PluginListener(PluginViewerImpl* aViewer)
   NS_INIT_ISUPPORTS();
   mViewer = aViewer;
   NS_ADDREF(aViewer);
-  mNextStream = nsnull;
 }
 
 PluginListener::~PluginListener()