diff --git a/mozilla/mail/base/content/about-thunderbird.png b/mozilla/mail/base/content/about-thunderbird.png
new file mode 100644
index 00000000000..24af8d200c3
Binary files /dev/null and b/mozilla/mail/base/content/about-thunderbird.png differ
diff --git a/mozilla/mail/base/content/aboutDialog.xul b/mozilla/mail/base/content/aboutDialog.xul
new file mode 100644
index 00000000000..b4bfc66952e
--- /dev/null
+++ b/mozilla/mail/base/content/aboutDialog.xul
@@ -0,0 +1,77 @@
+
+
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla 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/MPL/
+#
+# 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 Thunderbird about dialog.
+#
+# The Initial Developer of the Original Code is
+# Blake Ross (blaker@netscape.com).
+# Portions created by the Initial Developer are Copyright (C) 2002
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the LGPL or the GPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** -->
+
+
+
+
+%brandDTD;
+
+%aboutDialogDTD;
+]>
+
+
\ No newline at end of file
diff --git a/mozilla/mail/base/content/customizeToolbar.xul b/mozilla/mail/base/content/customizeToolbar.xul
index f4317bedd47..ada3bb1f535 100644
--- a/mozilla/mail/base/content/customizeToolbar.xul
+++ b/mozilla/mail/base/content/customizeToolbar.xul
@@ -32,10 +32,10 @@
-
+
-
@@ -59,7 +58,6 @@ Rights Reserved.
-
diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul
index 2a79b3043e7..17d074e5ff1 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.xul
+++ b/mozilla/mail/base/content/mailWindowOverlay.xul
@@ -962,8 +962,7 @@ Rights Reserved.
@@ -1486,10 +1485,13 @@ Rights Reserved.
-
-
+
@@ -1618,9 +1620,9 @@ Rights Reserved.
toolbarname="Mail"
fullscreentoolbar="true" mode="full"
customizable="true"
+ context="toolbar-context-menu"
defaultset="button-getmsg,button-newmsg,button-address,spacer,spacer,spacer,button-reply,button-replyall,button-forward,spacer,spacer,spacer,button-delete,button-junk,button-print,button-stop,spring,throbber-box">
-
diff --git a/mozilla/mail/base/content/messenger.xul b/mozilla/mail/base/content/messenger.xul
index e4e5473a563..35142719c3b 100644
--- a/mozilla/mail/base/content/messenger.xul
+++ b/mozilla/mail/base/content/messenger.xul
@@ -29,7 +29,6 @@ Rights Reserved.
-
@@ -59,7 +58,6 @@ Rights Reserved.
-
@@ -113,6 +111,7 @@ Rights Reserved.
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -389,7 +564,101 @@ Contributor(s):
-
+
+
+
+
+
+
+ &contact.heading;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &home.heading;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &other.heading;
+
+
+
+
+
+
+
+
+
+
+ &description.heading;
+
+
+
+ &addresses.heading;
+
+
+
+
+
+
+
+ &phone.heading;
+
+
+
+
+
+
+
+ &work.heading;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mozilla/mail/components/addrbook/jar.mn b/mozilla/mail/components/addrbook/jar.mn
index 633cbac1a53..eca5ee3bf62 100644
--- a/mozilla/mail/components/addrbook/jar.mn
+++ b/mozilla/mail/components/addrbook/jar.mn
@@ -5,7 +5,6 @@ messenger.jar:
+ content/messenger/addressbook/abCardViewOverlay.js (content/abCardViewOverlay.js)
+ content/messenger/addressbook/addressbook.js (content/addressbook.js)
+ content/messenger/addressbook/addressbook.xul (content/addressbook.xul)
-+ content/messenger/addressbook/abDirTreeOverlay.xul (content/abDirTreeOverlay.xul)
en-US.jar:
+ locale/en-US/messenger/addressbook/abMainWindow.dtd (locale/abMainWindow.dtd)
diff --git a/mozilla/mail/components/addrbook/locale/abMainWindow.dtd b/mozilla/mail/components/addrbook/locale/abMainWindow.dtd
index 1affecae9ac..ec9b39d8757 100644
--- a/mozilla/mail/components/addrbook/locale/abMainWindow.dtd
+++ b/mozilla/mail/components/addrbook/locale/abMainWindow.dtd
@@ -19,11 +19,15 @@ Rights Reserved.
-->
-
+
+
+
+
+
@@ -38,6 +42,9 @@ Rights Reserved.
+
+
+
@@ -54,8 +61,34 @@ Rights Reserved.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -67,12 +100,20 @@ Rights Reserved.
+
+
+
+
-
-
+
+
+
+
+
-
+
+
@@ -80,10 +121,34 @@ Rights Reserved.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -94,6 +159,78 @@ Rights Reserved.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -114,5 +251,3 @@ Rights Reserved.
-
-
\ No newline at end of file
diff --git a/mozilla/mail/components/addrbook/skin/addressbook.css b/mozilla/mail/components/addrbook/skin/addressbook.css
index ae0daa61a43..f5a719ef805 100644
--- a/mozilla/mail/components/addrbook/skin/addressbook.css
+++ b/mozilla/mail/components/addrbook/skin/addressbook.css
@@ -29,6 +29,12 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+/* ::::: tools menu icon ::::: */
+
+.icon-mail16 {
+ list-style-image: url("chrome://communicator/skin/taskbar/mail-16.gif");
+}
+
/* ::::: primary toolbar buttons ::::: */
.toolbarbutton-1 {
@@ -107,7 +113,7 @@
list-style-image: url("chrome://messenger/skin/addressbook/icons/im-hov.gif");
}
-button-newim:hover:active {
+#button-newim:hover:active {
list-style-image: url("chrome://messenger/skin/addressbook/icons/im-act.gif");
}
@@ -131,7 +137,46 @@ button-newim:hover:active {
-moz-image-region: rect(210px 92px 231px 69px) !important;
}
-/* CardView styles - used in the Card View Pane */
+/* ::::: directory pane icons ::::: */
+
+treechildren:-moz-tree-image(DirCol) {
+ margin-right: 2px;
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.gif");
+}
+
+treechildren:-moz-tree-image(DirCol, IsMailList-true) {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.gif");
+}
+
+treechildren:-moz-tree-image(DirCol, IsRemote-true) {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.gif");
+}
+
+treechildren:-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-remote-addrbook.gif");
+}
+
+#dirTree [sortDirection="ascending"] {
+ list-style-image: none;
+}
+
+#dirTree [sortDirection="descending"] {
+ list-style-image: none;
+}
+
+/* ::::: results pane ::::: */
+
+treechildren:-moz-tree-image(GeneratedName) {
+ margin-right: 2px;
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.gif");
+}
+
+treechildren:-moz-tree-image(GeneratedName, MailList) {
+ margin-right: 2px;
+ list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.gif");
+}
+
+/* ::::: card view pane ::::: */
#CardViewOuterBox {
border-left: 1px solid ThreeDShadow;
diff --git a/mozilla/mail/components/compose/content/compose.xul b/mozilla/mail/components/compose/content/compose.xul
index fa322b5edb1..763463e9d07 100644
--- a/mozilla/mail/components/compose/content/compose.xul
+++ b/mozilla/mail/components/compose/content/compose.xul
@@ -31,7 +31,6 @@
-
diff --git a/mozilla/mail/components/compose/content/messengercompose.xul b/mozilla/mail/components/compose/content/messengercompose.xul
index 8f754876278..0f87aa631a9 100644
--- a/mozilla/mail/components/compose/content/messengercompose.xul
+++ b/mozilla/mail/components/compose/content/messengercompose.xul
@@ -279,7 +279,7 @@