diff --git a/ui/ChangeLog b/ui/ChangeLog
index de67f9955e..b014d85afa 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-27  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* evolution-mail-global.xml: Removed the "Mail Settings" stuff.
+
 2002-03-20  Ettore Perazzoli  <ettore@ximian.com>
 
 	* evolution.xml: Move the ComponentActionsPlaceholder into the
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 36f8471354..89233ef703 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -19,10 +19,6 @@
     <cmd name="ToolsFilters"
      _tip="Create or edit rules for filtering new mail"/>
 
-    <cmd name="ToolsSettings"
-     _tip="Create or edit mail accounts and other preferences"
-     pixtype="pixbuf"/>
-
     <cmd name="ToolsSubscriptions"
      _tip="Subscribe or unsubscribe to folders on remote servers"/>
 
@@ -88,8 +84,6 @@
 
       <placeholder name="ComponentPlaceholder">
 
-        <menuitem name="ToolsSettings" verb="" _label="_Mail Settings..."/>
-
 	<separator f="" name="emailglobal1"/>
 
         <placeholder name="MailFilterTools">
diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml
index 01107ae74c..71301bbe97 100644
--- a/ui/evolution-mail-messagedisplay.xml
+++ b/ui/evolution-mail-messagedisplay.xml
@@ -43,8 +43,12 @@
 
   </menu>
 
-  <dockitem name="Toolbar" relief="none" behavior="exclusive"
-	    _tip="Main toolbar" hlook="text" vlook="icon">
+  <dockitem name="Toolbar" 
+            relief="none" 
+            behavior="exclusive"
+	    _tip="Main toolbar" 
+            hlook="text" 
+            vlook="icon">
     <placeholder name="MailMessageToolbar"/>
     <separator f="" name="emailmessage"/>
     <placeholder name="MailNextButtons"/>