diff --git a/ui/ChangeLog b/ui/ChangeLog
index b014d85afa..0dd4dfc1f9 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-04  Ettore Perazzoli  <ettore@ximian.com>
+
+	* evolution-addressbook.xml: Added missing </submenu> tag.  Remove
+	bogus "Dump" menu item.
+
 2002-03-27  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* evolution-mail-global.xml: Removed the "Mail Settings" stuff.
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index a560f7cad0..2e91c9d66c 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -1,165 +1,161 @@
 <Root>
-	<commands>
-		<cmd name="ContactDelete"
-		 _tip="Delete selected contacts"
-		 accel="*Control*d"/>
+  <commands>
+    <cmd name="ContactDelete"
+	 _tip="Delete selected contacts"
+	 accel="*Control*d"/>
 
-		<cmd name="ContactNew"
-		 _tip="Create new contact"
-		 accel="*Control*n"/>
+    <cmd name="ContactNew"
+	 _tip="Create new contact"
+	 accel="*Control*n"/>
 
-		<cmd name="ContactNewList"
-		 _tip="Create new contact list"/>
+    <cmd name="ContactNewList"
+	 _tip="Create new contact list"/>
 
-		<cmd name="ContactsPrint"
-		 _tip="Print selected contacts"
-		 pixtype="stock" pixname="Print"
-		 accel="*Control*p"/>
+    <cmd name="ContactsPrint"
+	 _tip="Print selected contacts"
+	 pixtype="stock" pixname="Print"
+	 accel="*Control*p"/>
 
-		<cmd name="ContactsPrintPreview"
-		 _tip="Previews the contacts to be printed"
-		 pixtype="stock" pixname="Print"
-		 accel="*Control*p"/>
+    <cmd name="ContactsPrintPreview"
+	 _tip="Previews the contacts to be printed"
+	 pixtype="stock" pixname="Print"
+	 accel="*Control*p"/>
 
-		<cmd name="ContactsView"
-		 _tip="View the current contact"
-		 accel="*Control*o"/>
+    <cmd name="ContactsView"
+	 _tip="View the current contact"
+	 accel="*Control*o"/>
 
-		<cmd name="ContactStop"
-		 _tip="Stop Loading"
-		 pixtype="stock" pixname="Stop"/>
+    <cmd name="ContactStop"
+	 _tip="Stop Loading"
+	 pixtype="stock" pixname="Stop"/>
 
-		<cmd name="ContactsCut" _label="Cut" _tip="Cut the selection"
-		 accel="*Control*x"/>
+    <cmd name="ContactsCut" _label="Cut" _tip="Cut the selection"
+	 accel="*Control*x"/>
 
-                <cmd name="ContactsCopy" _label="Copy"
-		 _tip="Copy the selection"
-		 accel="*Control*c"/>
+    <cmd name="ContactsCopy" _label="Copy"
+	 _tip="Copy the selection"
+	 accel="*Control*c"/>
 
-		<cmd name="ContactsPaste" _label="Paste"
-		 _tip="Paste the clipboard"
-		 accel="*Control*v"/>
+    <cmd name="ContactsPaste" _label="Paste"
+	 _tip="Paste the clipboard"
+	 accel="*Control*v"/>
 
-		<cmd name="ContactsSelectAll" _label="Select All"
-		 _tip="Select all contacts"
-		 accel="*Control*a"/>
+    <cmd name="ContactsSelectAll" _label="Select All"
+	 _tip="Select all contacts"
+	 accel="*Control*a"/>
 
-		<cmd name="ContactsSaveAsVCard" _label="Save as VCard"
-		 _tip="Save selected contacts as a VCard."
-		 accel="*Control*v"/>
+    <cmd name="ContactsSaveAsVCard" _label="Save as VCard"
+	 _tip="Save selected contacts as a VCard."
+	 accel="*Control*v"/>
 
-		<cmd name="ContactsSendContactToOther" _label="Forward Contact"
-		 _tip="Send selected contacts to another person."/>
+    <cmd name="ContactsSendContactToOther" _label="Forward Contact"
+	 _tip="Send selected contacts to another person."/>
 
-		<cmd name="ContactsSendMessageToContact" _label="Send message to contact"
-		 _tip="Send a mess to the selected contacts."/>
+    <cmd name="ContactsSendMessageToContact" _label="Send message to contact"
+	 _tip="Send a mess to the selected contacts."/>
 
-		<cmd name="ContactsCopyToFolder" _label="Copy to Folder..."
-		 _tip="Copy Contact(s) to Another Folder..."/>
+    <cmd name="ContactsCopyToFolder" _label="Copy to Folder..."
+	 _tip="Copy Contact(s) to Another Folder..."/>
 
-		<cmd name="ContactsMoveToFolder" _label="Move to Folder..."
-		 _tip="Move Contact(s) to Another Folder..."/>
-	</commands>
+    <cmd name="ContactsMoveToFolder" _label="Move to Folder..."
+	 _tip="Move Contact(s) to Another Folder..."/>
+  </commands>
 
-	<menu>
-		<submenu name="File">
-		        <placeholder name="FileOps">
-	                        <menuitem name="ContactsView"
-                                 verb="" _label="_Open"/>
-			        <menuitem name="ContactsSaveAsVCard"
-				 verb="" _label="_Save as VCard"
-				 pixtype="pixbuf"/>
-			</placeholder>
+  <menu>
+    <submenu name="File">
+      <placeholder name="FileOps">
+	<menuitem name="ContactsView"
+		  verb="" _label="_Open"/>
+	<menuitem name="ContactsSaveAsVCard"
+		  verb="" _label="_Save as VCard"
+		  pixtype="pixbuf"/>
+      </placeholder>
 
-                        <submenu name="New">
-	                	<placeholder name="NewFirstItem">
-	                        	<menuitem name="ContactNew" verb=""
-	                        	 _label="_Contact"
-					 pixtype="pixbuf"/>
-	                        	<menuitem name="ContactNewList" verb=""
-	                        	 _label="_Contact List"
-					 pixtype="pixbuf"/>
-	                                <separator f="" name="eadbk1"/>
-	                        </placeholder>
-		                </submenu>
+      <submenu name="New">
+	<placeholder name="NewFirstItem">
+	  <menuitem name="ContactNew" verb=""
+		    _label="_Contact"
+		    pixtype="pixbuf"/>
+	  <menuitem name="ContactNewList" verb=""
+		    _label="_Contact List"
+		    pixtype="pixbuf"/>
+	  <separator f="" name="eadbk1"/>
+	</placeholder>
+      </submenu>
       
-			<placeholder name="Print">
+      <placeholder name="Print">
 
-			    <menuitem name="ContactsPrintPreview" verb=""
-			      _label="Print Preview"
-			      pixtype="pixbuf"/>
-			    <menuitem name="ContactsPrint" verb=""
-			    _label="_Print..."
-			      pixtype="pixbuf"/>
-			</placeholder>
+	<menuitem name="ContactsPrintPreview" verb=""
+		  _label="Print Preview"
+		  pixtype="pixbuf"/>
+	<menuitem name="ContactsPrint" verb=""
+		  _label="_Print..."
+		  pixtype="pixbuf"/>
+      </placeholder>
 
-		</submenu>
+    </submenu>
 
-		<placeholder name="EditPlaceholder">
+    <placeholder name="EditPlaceholder">
 
-			<submenu name="Edit" _label="_Edit">
-				<menuitem name="ContactsCut" verb="" _label="C_ut"
-				 pixtype="pixbuf"/>
-		
-				<menuitem name="ContactsCopy" verb="" _label="_Copy"
-				 pixtype="pixbuf"/>
-		
-				<menuitem name="ContactsPaste" verb="" _label="_Paste"
-				 pixtype="pixbuf"/>
+      <submenu name="Edit" _label="_Edit">
+	<menuitem name="ContactsCut" verb="" _label="C_ut"
+		  pixtype="pixbuf"/>
+	
+	<menuitem name="ContactsCopy" verb="" _label="_Copy"
+		  pixtype="pixbuf"/>
+	
+	<menuitem name="ContactsPaste" verb="" _label="_Paste"
+		  pixtype="pixbuf"/>
 
-			        <menuitem name="ContactDelete" verb=""
-			        _label="Delete" pixtype="pixbuf"/>
-				<separator f="" name="eadbk2"/>
+	<menuitem name="ContactDelete" verb=""
+		  _label="Delete" pixtype="pixbuf"/>
+	<separator f="" name="eadbk2"/>
 
-				<menuitem name="ContactsSelectAll" verb="" _label="_Select All"/>
-			</submenu>
+	<menuitem name="ContactsSelectAll" verb="" _label="_Select All"/>
+      </submenu>
 
-      		</placeholder>
+    </placeholder>
 
-		<submenu name="View">
-		        <menuitem name="BonoboUIDump"
-		        verb="BonoboUIDump" _label="Dump"/>
-		</submenu>
+    <submenu name="Actions" _label="_Actions">
+      <placeholder name="ComponentActionsPlaceholder">
+	<separator f="" name="eadbk4"/>
+	<menuitem name="ContactsSendContactToOther"
+		  _label="_Forward Contact..." verb=""/>
 
-		<submenu name="Actions" _label="_Actions">
-			<placeholder name="ComponentActionsPlaceholder">
-			<separator f="" name="eadbk4"/>
-			<menuitem name="ContactsSendContactToOther"
-				  _label="_Forward Contact..." verb=""/>
+	<menuitem name="ContactsSendMessageToContact"
+		  _label="_Send Message to Contact..." verb=""/>
+	<menuitem name="ContactsCopyToFolder" _label="_Copy to Folder..." verb=""/>
+	<menuitem name="ContactsMoveToFolder" _label="_Move to Folder..." verb=""/>
+      </placeholder>
+    </submenu>
 
-			<menuitem name="ContactsSendMessageToContact"
-				  _label="_Send Message to Contact..." verb=""/>
-			<menuitem name="ContactsCopyToFolder" _label="_Copy to Folder..." verb=""/>
-			<menuitem name="ContactsMoveToFolder" _label="_Move to Folder..." verb=""/>
-		</placeholder>
+    <submenu name="Tools">
+      <placeholder name="ComponentPlaceholder">
+	<menuitem name="ToolSearch"
+		  verb=""
+		  _label="_Search for Contacts"
+		  pixtype="pixbuf"/>
+	<separator f="" name="eadbk3"/>
+      </placeholder>
+    </submenu>
 
-                <submenu name="Tools">
-      			<placeholder name="ComponentPlaceholder">
-				<menuitem name="ToolSearch"
-					  verb=""
-					  _label="_Search for Contacts"
-					  pixtype="pixbuf"/>
-				<separator f="" name="eadbk3"/>
-			</placeholder>
-		</submenu>
+  </menu>
 
-	</menu>
+  <dockitem name="Toolbar">
+    <toolitem name="ContactsPrint" verb=""
+	      _label="Print" pixtype="pixbuf"/>
 
-	<dockitem name="Toolbar">
-		<toolitem name="ContactsPrint" verb=""
-		_label="Print" pixtype="pixbuf"/>
+    <toolitem name="ContactDelete" verb=""
+	      _label="Delete" pixtype="pixbuf"/>
 
-		<toolitem name="ContactDelete" verb=""
-		_label="Delete" pixtype="pixbuf"/>
+    <toolitem name="ContactStop" verb=""
+	      _label="Stop"/>
 
-		<toolitem name="ContactStop" verb=""
-		_label="Stop"/>
+  </dockitem>
 
-	</dockitem>
-
-	<keybindings>
-	        <accel name="Delete" verb="ContactDelete"/>
-	        <accel name="BackSpace" verb="ContactDelete"/>
-	</keybindings>
+  <keybindings>
+    <accel name="Delete" verb="ContactDelete"/>
+    <accel name="BackSpace" verb="ContactDelete"/>
+  </keybindings>
 
 </Root>