diff --git a/mail/base/content/msgSelectOffline.xul b/mail/base/content/msgSelectOffline.xul
new file mode 100644
index 00000000000..07ba2023058
--- /dev/null
+++ b/mail/base/content/msgSelectOffline.xul
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1998-2001 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributors:
+#     dianesun@netscape.com
+#     HÃ¥kan Waara <hwaara@chello.se>
+
+<?xml-stylesheet href="chrome://messenger/skin/msgSelectOffline.css" type="text/css"?>
+
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/msgSynchronize.dtd" >
+
+<dialog	xmlns:nc="http://home.netscape.com/NC-rdf#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="select-offline" 
+        title="&MsgSelect.label;"
+        width="450" height="400"
+        persist="width height"
+        onload="selectOnLoad();"
+        ondialogaccept="return selectOkButton();"
+        ondialogcancel="return selectCancelButton();">
+
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+		
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/msgSynchronize.js"/>
+	
+  <description class="desc">&MsgSelectDesc.label;</description>
+
+  <tree id="synchronizeTree" flex="1" hidecolumnpicker="true"
+        datasources="rdf:msgaccountmanager rdf:mailnewsfolders" ref="msgaccounts:/" flags="dont-build-content"
+        onclick="onSynchronizeClick(event);">
+    <template>
+      <rule>
+        <conditions>
+          <content uri="?container"/>
+          <member container="?container" child="?member"/>
+          <triple subject="?member" predicate="http://home.netscape.com/NC-rdf#SupportsOffline" object="true"/>
+        </conditions>
+
+        <bindings>
+          <binding subject="?member"
+                   predicate="http://home.netscape.com/NC-rdf#FolderTreeName"
+                   object="?folderTreeName"/>
+          <binding subject="?member"
+                   predicate="http://home.netscape.com/NC-rdf#FolderTreeName?sort=true"
+                   object="?folderTreeNameSort"/>
+          <binding subject="?member"
+                   predicate="http://home.netscape.com/NC-rdf#SpecialFolder"
+                   object="?specialFolder"/>
+          <binding subject="?member"
+                   predicate="http://home.netscape.com/NC-rdf#IsServer"
+                   object="?isServer"/>
+          <binding subject="?member"
+                   predicate="http://home.netscape.com/NC-rdf#IsSecure"
+                   object="?isSecure"/>
+          <binding subject="?member"
+                   predicate="http://home.netscape.com/NC-rdf#ServerType"
+                   object="?serverType"/>
+          <binding subject="?member"
+                   predicate="http://home.netscape.com/NC-rdf#Synchronize"
+                   object="?synchronize"/>
+        </bindings>
+             
+        <action>
+          <treechildren>
+            <treeitem uri="?member">
+              <treerow>
+                <treecell label="?folderTreeName"
+                          properties="specialFolder-?specialFolder isServer-?isServer isSecure-?isSecure serverType-?serverType"/>
+                <treecell properties="synchronize-?synchronize isServer-?isServer"/>
+              </treerow>
+            </treeitem>
+          </treechildren>
+        </action>
+      </rule>
+    </template>
+    <treecols>
+      <treecol id="folderNameCol" flex="5" persist="hidden width" label="&MsgSelectItems.label;" primary="true"/>
+      <splitter class="tree-splitter"/>		  
+      <treecol id="syncCol" flex="1" persist="hidden width" label="&MsgSelectInd.label;" cycler="true"/>
+    </treecols>
+  </tree>
+
+</dialog>
diff --git a/mail/base/jar.mn b/mail/base/jar.mn
index 35be9b444e1..b9ae19a94a0 100644
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -25,6 +25,7 @@ messenger.jar:
 *+  content/messenger/aboutDialog.xul               (content/aboutDialog.xul)
 *+  content/messenger/junkMail.xul                  (content/junkMail.xul)
 *+  content/messenger/junkMail.js                   (content/junkMail.js)
+*+  content/messenger/msgSelectOffline.xul          (content/msgSelectOffline.xul)
 +   content/messenger-views/contents.rdf            (content/messenger-views.rdf)
     content/messenger/about-thunderbird.png         (content/about-thunderbird.png)
     
@@ -41,7 +42,8 @@ classic.jar:
 +   skin/classic/messenger/junkMail.css             (skin/junkMail.css)
 +   skin/classic/messenger/folderMenus.css          (skin/folderMenus.css)
 +   skin/classic/messenger/subscribe.css            (skin/subscribe.css)
-+   skin/classic/messenger/searchDialog.css         (skin/searchDialog.css)
++   skin/classic/messenger/searchDialog.css         (skin/searchDialog.css)
++   skin/classic/messenger/msgSelectOffline.css     (skin/msgSelectOffline.css)
 +   skin/classic/messenger/icons/new-mail-alert.png (skin/icons/new-mail-alert.png)
     skin/classic/messenger/icons/mail-toolbar.png   (skin/icons/mail-toolbar.png)
     skin/classic/messenger/icons/mail-toolbar-small.png  (skin/icons/mail-toolbar-small.png)
diff --git a/mail/base/skin/msgSelectOffline.css b/mail/base/skin/msgSelectOffline.css
new file mode 100755
index 00000000000..989e1633039
--- /dev/null
+++ b/mail/base/skin/msgSelectOffline.css
@@ -0,0 +1,175 @@
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Joe Hewitt (hewitt@netscape.com)
+ *   Håkan Waara (hwaara@chello.se)
+ *   Jan Varga (varga@nixcorp.com)
+ */
+
+/* ===== msgSelectOffline.css =================================================
+  == Styles for the Offline Use dialog.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Mail Folders ::::: */
+
+treechildren::-moz-tree-image(folderNameCol) {
+  margin-right: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-new-closed.png");
+}
+
+/* ..... Inbox ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.png");
+}
+
+/* ..... Sent ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
+}
+
+/* ..... Unsent ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Unsent Messages) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
+}
+
+/* ..... Drafts ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
+}
+
+/* ..... Templates ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
+}
+
+/* ..... Junk ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+}
+
+/* ..... Trash ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
+}
+
+/* ..... Servers ..... */
+
+treechildren::-moz-tree-image(folderNameCol, isServer-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail-new.png");
+}
+
+treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
+treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-share.png");
+}
+
+
+/* ..... Server Folders ..... */
+
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
+  list-style-image: url("chrome://messenger/skin/icons/server-local.png");
+}
+
+/* ..... News Folders ..... */
+
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+}
+
+/* ::::: All Servers ::::: */
+
+treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
+treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
+  color: gray;
+  font-style: italic;
+}
+
+/* ::::: Download Icons ::::: */
+
+treechildren::-moz-tree-image(syncCol) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.gif");
+}
+
+treechildren::-moz-tree-image(syncCol, synchronize-true) {
+  list-style-image: url("chrome://messenger/skin/icons/check.gif");
+}
+
+treechildren::-moz-tree-image(syncCol, isServer-true) {
+  list-style-image: none;
+}
+
+#folderNameCol [sortDirection="ascending"] {
+  list-style-image: none;
+}
+
+#folderNameCol [sortDirection="descending"] {
+  list-style-image: none;
+}