From 24f2cda5d07bcb361906ff6350ed867c4471ba2f Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 19 Sep 2003 19:49:17 +0000
Subject: [PATCH] Bug 219239 Junk Mail Controls is not modal and does not
 remember placement p=borggraefe@despammed.com r=me sr=bienvenu

git-svn-id: svn://10.0.0.236/trunk@147069 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/base/resources/content/junkMail.xul      | 8 +++++---
 .../mailnews/base/resources/content/mailWindowOverlay.js  | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/junkMail.xul b/mozilla/mailnews/base/resources/content/junkMail.xul
index 51d9211a857..fa7a5e0ee56 100644
--- a/mozilla/mailnews/base/resources/content/junkMail.xul
+++ b/mozilla/mailnews/base/resources/content/junkMail.xul
@@ -44,15 +44,17 @@
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/junkMail.dtd">
 
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<dialog id="junkMailDialog"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         windowtype="mailnews:junk"
         title="&window.title;"
         onload="onJunkMailLoad();"
         buttons="accept,cancel,help"
-	ondialogaccept="return onAccept();"
-	ondialoghelp="return doHelpButton();">
+        ondialogaccept="return onAccept();"
+        ondialoghelp="return doHelpButton();"
+        persist="screenX screenY">
 
   <script type="application/x-javascript" src="chrome://messenger/content/junkMail.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
index 27d1a9e3230..2faab79178f 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
@@ -2154,7 +2154,8 @@ function MsgJunkMail()
     preselectedFolder = GetFirstSelectedMsgFolder();
 
   var args = { folder: preselectedFolder };
-  OpenOrFocusWindow(args, "mailnews:junk", "chrome://messenger/content/junkMail.xul");
+  window.openDialog("chrome://messenger/content/junkMail.xul", "",
+                    "chrome,resizable=no,modal,dialog", args);
 }
 
 function MsgJunkMailInfo(aCheckFirstUse)