diff --git a/xpfe/components/jar.mn b/xpfe/components/jar.mn
index dedff971182b..940e045a8974 100644
--- a/xpfe/components/jar.mn
+++ b/xpfe/components/jar.mn
@@ -22,6 +22,7 @@ comm.jar:
     content/communicator/pref/pref-cache.xul                    (prefwindow/resources/content/pref-cache.xul)
     content/communicator/pref/pref-colors.js                    (prefwindow/resources/content/pref-colors.js)
     content/communicator/pref/pref-colors.xul                   (prefwindow/resources/content/pref-colors.xul)
+    content/communicator/pref/pref-download.xul                 (prefwindow/resources/content/pref-download.xul)
     content/communicator/pref/pref-help.js                      (prefwindow/resources/content/pref-help.js)
     content/communicator/pref/pref-themes.xul                   (prefwindow/resources/content/pref-themes.xul)
     content/communicator/pref/pref-themes.js                    (prefwindow/resources/content/pref-themes.js)
@@ -119,6 +120,7 @@ en-US.jar:
     locale/en-US/communicator/pref/pref-debug.dtd               (prefwindow/resources/locale/en-US/pref-debug.dtd)
     locale/en-US/communicator/pref/pref-debug1.dtd              (prefwindow/resources/locale/en-US/pref-debug1.dtd)
     locale/en-US/communicator/pref/pref-debug2.dtd              (prefwindow/resources/locale/en-US/pref-debug2.dtd)
+    locale/en-US/communicator/pref/pref-download.dtd            (prefwindow/resources/locale/en-US/pref-download.dtd)
     locale/en-US/communicator/pref/pref-fonts.dtd               (prefwindow/resources/locale/en-US/pref-fonts.dtd)
     locale/en-US/communicator/pref/pref-history.dtd             (prefwindow/resources/locale/en-US/pref-history.dtd)
     locale/en-US/communicator/pref/pref-http.dtd                (prefwindow/resources/locale/en-US/pref-http.dtd)
diff --git a/xpfe/components/prefwindow/resources/content/pref-download.xul b/xpfe/components/prefwindow/resources/content/pref-download.xul
index 608d201525be..e31bb3c2b697 100644
--- a/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-download.xul
@@ -21,121 +21,30 @@
    Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://pref/locale/pref-download.dtd" >
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-download.dtd" >
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      orient="vertical"
-      headertitle="&lHeader;"
-      onload="if( parent.handle ) parent.handle.onpageload( 'pref-download' ); else parent.queuedTag = 'pref-download';">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-download.xul');"
+      headertitle="&lHeader;">
 
   <script type="application/x-javascript">
-  // startup function called by the prefs architecture.
-  function Startup()
-  {
-    DoEnabling();
-  }
-
-  function DoEnabling()
-  {
-    var increments = document.getElementById("offlineNewsDownloadIncrements");
-    var textbox = document.getElementById("offlineNewsDownloadDays");
-    var radio0 = document.getElementById("offlineNewsDownloadUseDays0");
-    var radio1 = document.getElementById("offlineNewsDownloadUseDays1");
-    var downloadByDate = document.getElementById("offlineNewsDownloadByDate");
-    if( !downloadByDate.checked ) {
-      increments.setAttribute( "disabled", "true" );
-      textbox.setAttribute( "disabled", "true" );
-      radio0.setAttribute( "disabled", "true" );
-      radio1.setAttribute( "disabled", "true" );
-    }
-    else {
-      radio0.removeAttribute("disabled");
-      radio1.removeAttribute("disabled");
-      if( radio0.checked ) {
-        increments.removeAttribute( "disabled" );
-        textbox.setAttribute( "disabled", "true" );
-      } 
-      else if( radio1.checked ) {
-        textbox.removeAttribute( "disabled" );
-        increments.setAttribute( "disabled", "true" );
-      }
-    }
-  }
-  </script>
+  <![CDATA[
+    var _elementIDs = ["downloadBehavior"];
+  ]]>
+  </script>browser.downloadmanager.behavior
   
-  <html:fieldset>
-    <html:legend align="left">&newmes;</html:legend>
-    <html:div class="hspace-both">
-      <html:input type="checkbox" id="offlineNewsDownloadUnreadOnly"
-                  pref="true" preftype="bool" prefstring="offline.news.download.unread_only"/>
-      <html:label for="offlineNewsDownloadUnreadOnly" accesskey="offlineNewsDownloadUnreadOnly.accesskey" tabindex="0">
-        &downOnlyCheck;     
-      </html:label>
-    </html:div>
-    <html:div class="hspace-both">
-      <html:input type="checkbox" id="offlineNewsDownloadByDate"
-                  onclick="DoEnabling();"
-                  pref="true" preftype="bool" prefstring="offline.news.download.by_date"/>
-      <html:label for="offlineNewsDownloadByDate" accesskey="offlineNewsDownloadByDate.accesskey" tabindex="0">     
-        &downDateCheck;
-      </html:label>
-    </html:div>
-    <html:div class="hspace-both" style="padding-left: 35px;">
-      <html:table cellpadding="0" cellspacing="0">
-        <html:tr>
-          <html:td valign="middle">
-            <html:input type="radio" name="offline" id="offlineNewsDownloadUseDays0"
-                        onclick="DoEnabling()" style="margin-bottom: 5px;"
-                        pref="true" preftype="int" prefindex="0" prefstring="offline.news.download.use_days"/>
-            <html:label for="offlineNewsDownloadUseDays0" accesskey="offlineNewsDownloadUseDays0.accesskey" tabindex="0">     
-              &fromRadio.label;
-            </html:label> 
-          </html:td>
-          <html:td valign="middle">
-            <html:select id="offlineNewsDownloadIncrements"
-                         pref="true" preftype="int" prefstring="offline.news.download.increments">
-              <html:option value="0">&yesterday.select;</html:option>
-              <html:option value="1">&oneW.select;</html:option>
-              <html:option value="2">&twoW.select;</html:option>
-              <html:option value="3">&oneM.select;</html:option>
-              <html:option value="4">&sixM.select;</html:option>
-              <html:option value="5">&oneY.select;</html:option>
-            </html:select> 
-          </html:td>
-        </html:tr>
-        <html:tr>
-          <html:td valign="middle">
-            <html:input type="radio" name="offline" id="offlineNewsDownloadUseDays1"
-                        onclick="DoEnabling()" style="margin-bottom: 5px;"
-                        pref="true" preftype="int" prefindex="1" prefstring="offline.news.download.use_days"/>
-            <html:label for="offlineNewsDownloadUseDays1" accesskey="offlineNewsDownloadUseDays1.accesskey" tabindex="0">     
-              &sinceRadio.label;
-            </html:label>
-          </html:td>
-          <html:td valign="middle">
-            <html:input type="text" size="5" id="offlineNewsDownloadDays"
-                        style="margin-right: 5px; margin-left: 0px;"
-                        pref="true" preftype="int" prefstring="offline.news.download.days"/>
-            <html:label>&daysAgo;</html:label>
-          </html:td>
-        </html:tr>
-      </html:table>
-    </html:div>  
-  </html:fieldset>
+  <groupbox>
+    <caption label="&downloadBehavior.label;"/>
+    <radiogroup id="downloadBehavior" prefstring="browser.downloadmanager.behavior">
+      <radio value="0" label="&openDM.label;" accesskey="&openDM.accesskey;"/>
+      <radio value="1" label="&openProgressDialog.label;" accesskey="&openProgressDialog.accesskey;"/>
+      <radio value="2" label="&doNothing.label;" accesskey="&doNothing.accesskey;"/>
+    </radiogroup>
 
-  <html:fieldset>
-    <html:legend align="left">&Allmsg;</html:legend>
-    <vbox flex="100%" style="width: 100%; height: 100%">
-      <html:div class="hspace-both">&offlineMsgs;</html:div>
-      <html:div class="hspace-both vspace">
-        <button class="dialog push" label="&select;" align="left"/>
-      </html:div>
-    </vbox>
-    <spacer style="height: 30px;"/>
-  </html:fieldset>
+  </groupbox>
 
 </page>
 
diff --git a/xpfe/components/prefwindow/resources/content/preftree.xul b/xpfe/components/prefwindow/resources/content/preftree.xul
index f7324a70f769..ad8031b9fb20 100644
--- a/xpfe/components/prefwindow/resources/content/preftree.xul
+++ b/xpfe/components/prefwindow/resources/content/preftree.xul
@@ -100,6 +100,11 @@
             <treecell url="chrome://communicator/content/pref/pref-tabs.xul" label="&tabWindows.label;"/>
           </treerow>
         </treeitem>
+        <treeitem>
+          <treerow>
+            <treecell url="chrome://communicator/content/pref/pref-download.xul" label="&download.label;"/>
+          </treerow>
+        </treeitem>
         <!-- Taking out Policies panel b/c bug 44121
         <treeitem>
           <treerow>
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-download.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-download.dtd
new file mode 100644
index 000000000000..106f1f1466b7
--- /dev/null
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-download.dtd
@@ -0,0 +1,8 @@
+<!ENTITY lHeader "Downloads">
+<!ENTITY downloadBehavior.label "When starting a download">
+<!ENTITY openDM.label "Open the download manager">
+<!ENTITY openDM.accesskey "m">
+<!ENTITY openProgressDialog.label "Open a progress dialog">
+<!ENTITY openProgressDialog.accesskey "p">
+<!ENTITY doNothing.label "Don't open anything">
+<!ENTITY doNothing.accesskey "D">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd b/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd
index dd12d35e4d8b..cf4bb08e55a0 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd
@@ -30,6 +30,7 @@
 <!ENTITY debug.label  "Debug">
 <!ENTITY debug1.label "Events">
 <!ENTITY debug2.label "Networking">
+<!ENTITY download.label "Downloads">
 <!ENTITY search.label "Internet Search">
 <!ENTITY policies.label "Security Policies">
 <!ENTITY mousewheel.label "Mouse Wheel">