From b493f66f7270bb907101556ed9539660c7aff108 Mon Sep 17 00:00:00 2001
From: "putterman%netscape.com" <putterman%netscape.com>
Date: Tue, 8 Aug 2000 04:46:42 +0000
Subject: [PATCH] Fix for 45059. r=mscott. Character encoding menus didn't work
 in the standalone message window.

---
 mailnews/base/resources/content/mailWindowOverlay.js | 9 +++++++--
 mailnews/base/resources/content/messageWindow.js     | 9 +++++++++
 mailnews/base/resources/content/messageWindow.xul    | 1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/mailnews/base/resources/content/mailWindowOverlay.js b/mailnews/base/resources/content/mailWindowOverlay.js
index 5062126d1adb..d6982719e652 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mailnews/base/resources/content/mailWindowOverlay.js
@@ -21,8 +21,13 @@
 function view_init()
 {
 	var message_menuitem=document.getElementById('menu_showMessage');
-	if (message_menuitem){
-		message_menuitem.setAttribute('checked',!IsThreadAndMessagePaneSplitterCollapsed());
+
+	if (message_menuitem)
+	{
+		var message_menuitem_hidden = message_menuitem.getAttribute("hidden");
+		if(message_menuitem_hidden != "true"){
+			message_menuitem.setAttribute('checked',!IsThreadAndMessagePaneSplitterCollapsed());
+		}
 	}
 	var threadColumn = document.getElementById('ThreadColumnHeader');
 	var thread_menuitem=document.getElementById('menu_showThreads');
diff --git a/mailnews/base/resources/content/messageWindow.js b/mailnews/base/resources/content/messageWindow.js
index ed03964d7267..543d744cf97b 100644
--- a/mailnews/base/resources/content/messageWindow.js
+++ b/mailnews/base/resources/content/messageWindow.js
@@ -32,6 +32,7 @@ var gCurrentMessageIsDeleted = false;
 
 function OnLoadMessageWindow()
 {
+	HideMenus();
 	CreateMailWindowGlobals();
 	CreateMessageWindowGlobals();
 	verifyAccounts();
@@ -68,6 +69,14 @@ function OnLoadMessageWindow()
 
 }
 
+function HideMenus()
+{
+	var message_menuitem=document.getElementById('menu_showMessage');
+	if(message_menuitem)
+		message_menuitem.setAttribute("hidden", "true");
+
+}
+
 function OnUnloadMessageWindow()
 {
 	OnMailWindowUnload();
diff --git a/mailnews/base/resources/content/messageWindow.xul b/mailnews/base/resources/content/messageWindow.xul
index 6f397d75d764..0daf531c04fb 100644
--- a/mailnews/base/resources/content/messageWindow.xul
+++ b/mailnews/base/resources/content/messageWindow.xul
@@ -46,6 +46,7 @@ Rights Reserved.
 
 
 	<script src="chrome://global/content/strres.js"/>
+  <script src="chrome://messenger/content/shareglue.js"/>
 	<script src="chrome://messenger/content/commandglue.js"/>
 	<script src="chrome://messenger/content/mailWindow.js"/>
 	<script src="chrome://messenger/content/messageWindow.js"/>