From efe1c204e8df2f845d92f28ce2794a324310c156 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Thu, 15 May 2003 02:33:49 +0000
Subject: [PATCH] synch with trunk

---
 mail/base/content/messageWindow.js  | 5 +++++
 mail/base/content/messageWindow.xul | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mail/base/content/messageWindow.js b/mail/base/content/messageWindow.js
index 859694ba0cb..90d0ab4fd1b 100644
--- a/mail/base/content/messageWindow.js
+++ b/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) ||
diff --git a/mail/base/content/messageWindow.xul b/mail/base/content/messageWindow.xul
index 0150d2dae45..8c1db835a95 100644
--- a/mail/base/content/messageWindow.xul
+++ b/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>