70591 - News Server + Local Folders "Properties Menu" will not accept an "OK"

76745 - Can't use cmd keys on standalone msg window until click in window.
r=naving, sr=sspitzer.

mailnews/base/resources/content/mail3PaneWindowCommands.js

@@ -221,6 +221,7 @@ var DefaultController =
 			case "cmd_print":
 			case "cmd_saveAsFile":
 			case "cmd_saveAsTemplate":
+            case "cmd_properties":
 			case "cmd_viewPageSource":
 			case "cmd_setFolderCharset":
 			case "cmd_reload":
@@ -376,6 +377,8 @@ var DefaultController =
         return IsRenameFolderEnabled();
       case "button_getNewMessages":
       case "cmd_getNewMessages":
+      case "cmd_properties":
+        return IsPropertiesEnabled();
       case "cmd_getMsgsForAuthAccounts":
         return IsGetNewMessagesEnabled();
       case "cmd_getNextNMessages":
@@ -543,6 +546,9 @@ var DefaultController =
 			case "cmd_findAgain":
 				MsgFindAgain();
 				return;
+            case "cmd_properties":
+                MsgFolderProperties();
+                return;
       case "button_mark":
 			case "cmd_markAsRead":
 				MsgMarkMsgAsRead(null);
@@ -816,6 +822,11 @@ function IsFolderCharsetEnabled()
   return IsFolderSelected();
 }
 
+function IsPropertiesEnabled()
+{
+  return IsFolderSelected();
+}
+
 function IsViewNavigationItemEnabled()
 {
 	return IsFolderSelected();
@@ -823,7 +834,7 @@ function IsViewNavigationItemEnabled()
 
 function IsFolderSelected()
 {
-	var tree = GetFolderTree();
+  	var tree = GetFolderTree();
 	var folderList = tree.selectedItems;
 
 	if(folderList.length == 1)

mailnews/base/resources/content/mailContextMenus.js

@@ -182,6 +182,7 @@ function fillFolderPaneContextMenu()
     var isNewsgroup = !isServer && serverType == 'nntp';
   var canGetMessages =  (isServer && (serverType != "nntp") && (serverType !="none")) || isNewsgroup;
 
+  EnableMenuItem("folderPaneContext-properties", !isServer);
   ShowMenuItem("folderPaneContext-getMessages", (numSelected <= 1) && canGetMessages);
   EnableMenuItem("folderPaneContext-getMessages", true);
 

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -137,6 +137,7 @@ Rights Reserved.
   <command id="cmd_selectAll"/>
   <command id="cmd_selectThread" oncommand="goDoCommand('cmd_selectThread')"/>
   <command id="cmd_selectFlagged" oncommand="goDoCommand('cmd_selectFlagged')"/>
+  <command id="cmd_properties" oncommand="goDoCommand('cmd_properties')"/>
 </commandset>
 
 <commandset id="mailEditContextMenuItems">
@@ -856,9 +857,9 @@ Rights Reserved.
       <menuitem label="&filtersCmd.label;"
                       accesskey="&filtersCmd.accesskey;"
                       oncommand="MsgFilters();"/>
-            <menuitem label="&folderPropsCmd.label;"
+            <menuitem id="menu_properties" label="&folderPropsCmd.label;"
                       accesskey="&folderPropsCmd.accesskey;"
-                      oncommand="MsgFolderProperties();"/>
+                      observes="cmd_properties"/>
       <menuseparator/>
       <menuitem label="&accountManagerCmd.label;" accesskey="&accountManagerCmd.accesskey;" oncommand="MsgAccountManager();"/>
       <menuitem id="menu_preferences" oncommand="goPreferences('messenger.xul', 'chrome://messenger/content/pref-mailnews.xul','mailnews')"/>

mailnews/base/resources/content/messageWindow.js

@@ -214,6 +214,9 @@ function OnLoadMessageWindow()
   setTimeout("var msgKey = extractMsgKeyFromURI(gCurrentMessageUri); gDBView.loadMessageByMsgKey(msgKey); gNextMessageViewIndexAfterDelete = gDBView.msgToSelectAfterDelete;", 0);
 
   SetupCommandUpdateHandlers();
+  var messagePaneFrame = top.frames['messagepane'];
+  if(messagePaneFrame)
+	messagePaneFrame.focus();
 }
 
 function extractMsgKeyFromURI()
@@ -264,6 +267,10 @@ function HideMenus()
 	if(emptryTrashMenu)
 		emptryTrashMenu.setAttribute("hidden", "true");
 
+	var menuProperties = document.getElementById('menu_properties');
+	if(menuProperties)
+		menuProperties.setAttribute("hidden", "true");
+
 	var compactFolderMenu = document.getElementById('menu_compactFolder');
 	if(compactFolderMenu)
 		compactFolderMenu.setAttribute("hidden", "true");