synch with trunk

mail/base/content/messageWindow.js

@@ -179,6 +179,11 @@ nsMsgDBViewCommandUpdater.prototype =
     goUpdateCommand("button_junk");
   },
 
+  updateNextMessageAfterDelete : function()
+  {
+    SetNextMessageAfterDelete();
+  },
+
   QueryInterface : function(iid)
   {
     if (iid.equals(Components.interfaces.nsIMsgDBViewCommandUpdater) ||

mail/base/content/messageWindow.xul

@@ -138,7 +138,7 @@ Rights Reserved.
     <!-- message view -->
     <browser id="messagepane" context="messagePaneContext" 
       style="height: 0px; min-height: 1px" flex="1" name="messagepane" 
-      disablesecurity="true" disableHistory="true" type="content-primary" 
+      disablesecurity="true" disablehistory="true" type="content-primary" 
       src="about:blank" onclick="contentAreaClick(event);" autofind="false"/>
   </vbox>  
 </vbox>