Patch to bug 121176 no longer works on trunk, trying to fix r=Mnyromyr rs=dmose

mailnews/base/resources/content/commandglue.js

@@ -784,7 +784,8 @@ function ChangeMessagePaneVisibility(now_hidden)
     // so we take it as it is
     gDBView.suppressMsgDisplay = now_hidden;
     // set the subject, uncollapsing won't automatically do this
-    gDBView.reloadMessage();
+    gDBView.loadMessageByUrl("about:blank");
+    gDBView.selectionChanged();
   }
   var event = document.createEvent('Events');
   if (now_hidden) {
@@ -796,20 +797,11 @@ function ChangeMessagePaneVisibility(now_hidden)
   document.getElementById("messengerWindow").dispatchEvent(event);
 }
 
-function OnMouseUpThreadAndMessagePaneSplitter()
+function OnClickThreadAndMessagePaneSplitter()
 {
-  // the collapsed state is the state after we released the mouse 
-  // so we take it as it is
   ChangeMessagePaneVisibility(IsMessagePaneCollapsed());
 }
 
-function OnClickThreadAndMessagePaneSplitterGrippy()
-{
-  // the collapsed state is the state when we clicked on the grippy
-  // not when afterwards, so we need to reverse this value
-  ChangeMessagePaneVisibility(!IsMessagePaneCollapsed());
-}
-
 function FolderPaneSelectionChange()
 {
     var folderTree = GetFolderTree();

mailnews/base/resources/content/mail3PaneWindowVertLayout.xul

@@ -168,8 +168,8 @@
 
     <!-- if you change this id, please change GetThreadAndMessagePaneSplitter() and MsgToggleMessagePane() -->
     <splitter id="threadpane-splitter" collapse="after" persist="state hidden"
-              onmouseup="OnMouseUpThreadAndMessagePaneSplitter()">
-      <grippy onclick="OnClickThreadAndMessagePaneSplitterGrippy()"/>
+              oncommand="OnClickThreadAndMessagePaneSplitter()">
+      <grippy/>
     </splitter>
 
     <vbox id="messagepanebox" flex="2" minheight="100" height="200" minwidth="100" width="200" persist="collapsed height width" class="window-focusborder" focusring="false">

mailnews/base/resources/content/messenger.xul

@@ -166,8 +166,8 @@
 
         <!-- if you change this id, please change GetThreadAndMessagePaneSplitter() and MsgToggleMessagePane() -->
         <splitter id="threadpane-splitter" collapse="after" persist="state hidden"
-                  onmouseup="OnMouseUpThreadAndMessagePaneSplitter()">
-          <grippy onclick="OnClickThreadAndMessagePaneSplitterGrippy()"/>
+                  oncommand="OnClickThreadAndMessagePaneSplitter()">
+          <grippy/>
         </splitter>
 
         <vbox id="messagepanebox" flex="2" minheight="100" height="200" minwidth="100" width="200" persist="collapsed height width" class="window-focusborder" focusring="false">

mailnews/base/resources/content/widgetglue.js

@@ -280,9 +280,8 @@ function FolderProperties(name, oldName, uri)
 
 function MsgToggleMessagePane()
 {
-  //OnClickThreadAndMessagePaneSplitter is based on the value before the splitter is toggled.
-  OnClickThreadAndMessagePaneSplitterGrippy();
   MsgToggleSplitter("threadpane-splitter");
+  OnClickThreadAndMessagePaneSplitter();
 }
 
 function MsgToggleSplitter(id)