diff --git a/mailnews/addrbook/resources/content/abNewCardDialog.xul b/mailnews/addrbook/resources/content/abNewCardDialog.xul
index 68da0bc783d5..2eef6fa487c3 100644
--- a/mailnews/addrbook/resources/content/abNewCardDialog.xul
+++ b/mailnews/addrbook/resources/content/abNewCardDialog.xul
@@ -27,8 +27,7 @@ Rights Reserved.
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abNewCardDialog.dtd">
 
 
-<window xmlns:html="http://www.w3.org/TR/REC-html40"
-		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 		xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 		title="&editcardWindow.title;"
 		onload="OnLoadNewCard()"
@@ -38,18 +37,6 @@ Rights Reserved.
 	<keyset id="keyset"/>
 
 	<box orient="horizontal" autostretch="never" valign="center">
-		<!--html:label for="abPopup">&chooseAddressBook.label;</html:label>
-		<html:div>
-			<html:select id="abPopup" ref="abdirectory://" datasources="rdf:addressdirectory"> 
-				<template> 
-					<html:option uri="..." value="rdf:http://home.netscape.com/NC-rdf#DirUri">
-						<text value="rdf:http://home.netscape.com/NC-rdf#DirName"/>
-					</html:option>
-				</template> 
-			</html:select> 
-		</html:div-->
-
-
 
 		<text for="abPopup" value="&chooseAddressBook.label;"/>
 		<menulist id="abPopup">
diff --git a/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul b/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
index a0f7b887bca2..9fe78bf8adee 100644
--- a/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
+++ b/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
@@ -34,7 +34,6 @@ Rights Reserved.
         title="&selectAddressWindow.title;"
         class="dialog"
         width="680" height="480"
-        style="padding:0px"
         onload="OnLoadSelectAddress()"
         align="vertical">
 
@@ -54,9 +53,9 @@ Rights Reserved.
 		
 		<spring style="width: 1em;"/>
 		
-		<titledbutton id="stop" value="&stopButton.label;" class="dialog push" disabled="true" onclick="SelectAddressStopButton()"/>	
+		<button id="stop" value="&stopButton.label;" class="dialog" disabled="true" oncommand="SelectAddressStopButton()"/>	
 		<spring style="width:5px"/>
-		<titledbutton id="search" value="&searchButton.label;" class="dialog push" disabled="true" onclick="SelectAddressSearchButton()"/>	
+		<button id="search" value="&searchButton.label;" class="dialog" disabled="true" oncommand="SelectAddressSearchButton()"/>	
 	</box>
 
 	<!-- Main box, 3 pane and majority of buttons -->
@@ -84,11 +83,11 @@ Rights Reserved.
 					<!-- Box that holds (to,cc,bcc buttons) -->
 					<box align="horizontal" style="padding:0.3em; border-bottom:solid black 1px; min-width:10px">
 						<spring flex="50%"/>
-						<titledbutton id="toButton" value="&toButton.label;" class="dialog push" onclick="SelectAddressToButton()"/>	
+						<button id="toButton" value="&toButton.label;" class="dialog" oncommand="SelectAddressToButton()"/>	
 						<spring style="width:10px"/>
-						<titledbutton id="ccButton" value="&ccButton.label;" class="dialog push" onclick="SelectAddressCcButton()"/>	
+						<button id="ccButton" value="&ccButton.label;" class="dialog" oncommand="SelectAddressCcButton()"/>	
 						<spring style="width:10px"/>
-						<titledbutton id="bccButton" value="&bccButton.label;" class="dialog push" onclick="SelectAddressBccButton()"/>	
+						<button id="bccButton" value="&bccButton.label;" class="dialog" oncommand="SelectAddressBccButton()"/>	
 						<spring flex="50%"/>
 					</box>
 				</box>
@@ -110,14 +109,14 @@ Rights Reserved.
 		<box align="vertical" style="padding: .5em; padding-right: 0px">
 			<box align="vertical" flex="50%">
 				<spring style="height:10px"/>
-				<titledbutton id="new" value="&newButton.label;" class="dialog push" onclick="AbNewCard()"/>	
+				<button id="new" value="&newButton.label;" class="dialog" oncommand="AbNewCard()"/>	
 				<spring style="height:10px"/>
-				<titledbutton id="edit" value="&editButton.label;" class="dialog push" onclick="AbEditCard()"/>	
+				<button id="edit" value="&editButton.label;" class="dialog" oncommand="AbEditCard()"/>	
 				<spring flex="100%"/>
 			</box>
 			<box align="vertical" flex="50%">
 				<spring flex="50%"/>
-				<titledbutton id="remove" value="&removeButton.label;" class="dialog push" onclick="RemoveSelectedFromBucket()"/>	
+				<button id="remove" value="&removeButton.label;" class="dialog" oncommand="RemoveSelectedFromBucket()"/>	
 				<spring flex="50%"/>
 			</box>
 		</box>
diff --git a/mailnews/addrbook/resources/content/addressbook.xul b/mailnews/addrbook/resources/content/addressbook.xul
index dafee66ae1fe..faa9b88a6a64 100644
--- a/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mailnews/addrbook/resources/content/addressbook.xul
@@ -234,8 +234,8 @@ Rights Reserved.
 					<spring flex="1"/--> 
 				</box>
 
-				<!--titledbutton id="button_stop" class="other28" align="top" value="&stopButton.label;" disabled="true" onclick="AbStop()"/>
-				<titledbutton id="button_search" class="other28" align="top" value="&searchButton.label;" disabled="true" onclick="AbSearch()"/-->
+				<!--button id="button_stop" class="other28" align="top" value="&stopButton.label;" disabled="true" oncommand="AbStop()"/>
+				<button id="button_search" class="other28" align="top" value="&searchButton.label;" disabled="true" oncommand="AbSearch()"/-->
 			</box>
 
       <button class="plain" id="navigator-throbber" oncommand='goClickThrobber("addressbook.throbber.url")'>
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index e2aa5ce7a078..98d5711071ad 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -29,11 +29,10 @@ Rights Reserved.
 <overlay
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:nc="http://home.netscape.com/NC-rdf#"
-  xmlns:html="http://www.w3.org/TR/REC-html40"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:script src="chrome://messenger/content/mailCommands.js"/>
-<html:script src="chrome://messenger/content/mailWindowOverlay.js"/>
+<script src="chrome://messenger/content/mailCommands.js"/>
+<script src="chrome://messenger/content/mailWindowOverlay.js"/>
 
 <broadcasterset id="broadcasterset">
 	<!-- File Menu -->
diff --git a/mailnews/base/resources/content/messageWindow.xul b/mailnews/base/resources/content/messageWindow.xul
index 64bc12822cf4..fb75458a3059 100644
--- a/mailnews/base/resources/content/messageWindow.xul
+++ b/mailnews/base/resources/content/messageWindow.xul
@@ -85,7 +85,7 @@ Rights Reserved.
 			<spring flex="100%"/>
 		</box>
 
-		<titledbutton id="statusText" class="status-bar" align="left" flex="100%" value="&statusText.label;"/>       
+		<button id="statusText" class="status-bar" align="left" flex="100%" value="&statusText.label;"/>       
 	</box>
 	<toolbar id="taskbar"/>
 
diff --git a/mailnews/base/resources/content/msgHdrViewOverlay.xul b/mailnews/base/resources/content/msgHdrViewOverlay.xul
index 694d42c5a8e7..78e921ee44c7 100644
--- a/mailnews/base/resources/content/msgHdrViewOverlay.xul
+++ b/mailnews/base/resources/content/msgHdrViewOverlay.xul
@@ -24,31 +24,30 @@ Rights Reserved.
 <?xml-stylesheet href="chrome://messenger/skin/msgHdrViewOverlay.css" type="text/css"?>
 
 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:html="http://www.w3.org/TR/REC-html40"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:script src="chrome://messenger/content/msgHdrViewAddresses.js"/>
-<html:script src="chrome://messenger/content/msgHdrViewOverlay.js"/>
-<html:script src="chrome://messenger/content/mime.js"/>
+<script src="chrome://messenger/content/msgHdrViewAddresses.js"/>
+<script src="chrome://messenger/content/msgHdrViewOverlay.js"/>
+<script src="chrome://messenger/content/mime.js"/>
 
 	<toolbox id="msgHeaderView">
 		<toolbar id="headerPart1" hide="true">
 			<box class="header-splitter" align="horizontal" flex="1">
 				<box class="header-part1" align="vertical" flex="1">
 					<box id="SubjectBox" class="headerBox" align="horizontal" hide="true">
-              <text class="headerdisplayname" value="&subjectField.label;"/>
-              <html:div class="headerValue subjectvalue" id="SubjectValue" flex="1">*</html:div>
+						<text class="headerdisplayname" value="&subjectField.label;"/>
+						<html class="headerValue subjectvalue" id="SubjectValue" flex="1">*</html>
 					</box>
 		      
 					<box id="FromBox" class="headerBox" align="horizontal" hide="true">
-              <text class="headerdisplayname" value="&fromField.label;"/>
-              <html:div class="headerValue" id="FromValue" flex="1">
-            </html:div>
+						<text class="headerdisplayname" value="&fromField.label;"/>
+						<html class="headerValue" id="FromValue" flex="1">
+						</html>
 					</box>
 
 					<box id = "DateBox" class="headerBox" align="horizontal" hide="true">
-               <text class="headerdisplayname" value="&dateField.label;"/>
-							<html:div class="headerValue" id="DateValue" flex="1">*</html:div>
+						<text class="headerdisplayname" value="&dateField.label;"/>
+						<html class="headerValue" id="DateValue" flex="1">*</html>
 					</box>
 				</box>
 
@@ -56,8 +55,7 @@ Rights Reserved.
           <spring class="buttonSpacer"/>
             <box align="vertical">
              <spring class="buttonTopSpacer"/>
-             <titledbutton id="addToAddressBookButton" class="push"
-                onclick="AddSenderToAddressBook();"/>
+             <button id="addToAddressBookButton" oncommand="AddSenderToAddressBook();"/>
              <spring flex="1"/>
             </box>
           <spring class="buttonSpacer"/>
@@ -68,7 +66,7 @@ Rights Reserved.
             <box align="vertical">
                <spring class="buttonTopSpacer"/>
                <menu id="attachmentMenu" class="attachment-menu">
-                  <titledbutton id="attachmentButton" class="push" value="1" align="right"/>
+                  <button id="attachmentButton" value="1" align="right"/>
                   <menupopup id="attachmentPopup" popupanchor="bottomright" popupalign="topright">
                   </menupopup>
                </menu>
@@ -83,35 +81,35 @@ Rights Reserved.
 			<box class="header-part2" align="vertical" flex="1">
 				<box id="ToBox" class="headerBox" align="horizontal" hide="true">
             
-            <text class="headerdisplayname" value="&toField.label;"/>
-            <box class="headervalue" id="ToValueShort" flex="1">
-            <titledbutton class="showMoreAddressesButton" id="ToValueToggleIcon" 
-                onclick="ToggleLongShortAddresses('ToValueShort', 'ToValueLong');"/>
-            </box>
+		            <text class="headerdisplayname" value="&toField.label;"/>
+		            <box class="headervalue" id="ToValueShort" flex="1">
+						<button class="showMoreAddressesButton" id="ToValueToggleIcon" 
+						        oncommand="ToggleLongShortAddresses('ToValueShort', 'ToValueLong');"/>
+		            </box>
 
-            <box class="headervalue" id="ToValueLong" hide="true" flex="1">
-            <titledbutton class="showFewerAddressesButton"  
-               onclick="ToggleLongShortAddresses('ToValueShort', 'ToValueLong');"/>
-            </box>
+		            <box class="headervalue" id="ToValueLong" hide="true" flex="1">
+		            	<button class="showFewerAddressesButton"  
+						        oncommand="ToggleLongShortAddresses('ToValueShort', 'ToValueLong');"/>
+		            </box>
 				</box>
 
 			    <box id="CcBox" class="headerBox" align="horizontal" hide="true">
-            <text class="headerdisplayname" value="&ccField.label;"/>
-              <box class="headervalue" id="CcValueShort" flex="1">
-              <titledbutton class="showMoreAddressesButton" id="CcValueToggleIcon" 
-                onclick="ToggleLongShortAddresses('CcValueShort', 'CcValueLong');"/>
-              </box>
+					<text class="headerdisplayname" value="&ccField.label;"/>
+					<box class="headervalue" id="CcValueShort" flex="1">
+					<button class="showMoreAddressesButton" id="CcValueToggleIcon" 
+        			        oncommand="ToggleLongShortAddresses('CcValueShort', 'CcValueLong');"/>
+					</box>
 
-              <box class="headervalue" id="CcValueLong" hide="true" flex="1">
-              <titledbutton class="showFewerAddressesButton"  
-                onclick="ToggleLongShortAddresses('CcValueShort', 'CcValueLong');"/>
-              </box>
-				  </box>
+					<box class="headervalue" id="CcValueLong" hide="true" flex="1">
+						<button class="showFewerAddressesButton"  
+						        oncommand="ToggleLongShortAddresses('CcValueShort', 'CcValueLong');"/>
+					</box>
+				</box>
 
-        	<box id="NewsgroupBox" class="headerBox" align="horizontal" hide="true">
-            <text class="headerdisplayname" value="&newsgroupsField.label;"/>
-            <html:div class="headervalue" id="NewsgroupValue" flex="1">*</html:div>
-				  </box>
+				<box id="NewsgroupBox" class="headerBox" align="horizontal" hide="true">
+					<text class="headerdisplayname" value="&newsgroupsField.label;"/>
+					<html class="headervalue" id="NewsgroupValue" flex="1">*</html>
+				</box>
 
 			</box>
 		</toolbar>
@@ -120,7 +118,7 @@ Rights Reserved.
       <box class="header-part3" align="vertical" flex="1">
         <box id="UserAgentBox" class="headerBox" align="horizontal" hide="true">
           <text class="headerdisplayname" value="&userAgentField.label;"/>
-          <html:div class="headervalue" id="UserAgentValue" flex="1">*</html:div>
+          <html class="headervalue" id="UserAgentValue" flex="1">*</html>
         </box>
       </box>
     </toolbar>
diff --git a/mailnews/base/resources/content/threadPane.xul b/mailnews/base/resources/content/threadPane.xul
index 3905fe1243fb..8a280e7c984b 100644
--- a/mailnews/base/resources/content/threadPane.xul
+++ b/mailnews/base/resources/content/threadPane.xul
@@ -26,11 +26,10 @@ Rights Reserved.
 
 <overlay
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:html="http://www.w3.org/TR/REC-html40"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 >
 
-<html:script src="chrome://global/content/treePopups.js"/>
+<script src="chrome://global/content/treePopups.js"/>
 
 
 
@@ -122,7 +121,7 @@ Rights Reserved.
 		<treecell class="treecell-header treecell-inset-header" value="&orderReceivedColumn.label;" onclick="return top.MsgSortByOrderReceived();"/>
 		<treecell class="treecell-header treecell-inset-header" allowevents="true" id="popupCell">
 		  <menu>
-		    <titledbutton src="chrome://global/skin/opentwisty.gif"/>
+		    <button src="chrome://global/skin/opentwisty.gif"/>
 			<menupopup popupanchor="bottomright" 
 			           popupalign="topright"
 					   oncreate="BuildTreePopup(document.getElementById('theThreadColumns'), document.getElementById('headRow'), this,
diff --git a/mailnews/compose/resources/content/MsgAttachPage.xul b/mailnews/compose/resources/content/MsgAttachPage.xul
index 3238061326ab..2566f3981cbe 100644
--- a/mailnews/compose/resources/content/MsgAttachPage.xul
+++ b/mailnews/compose/resources/content/MsgAttachPage.xul
@@ -7,21 +7,20 @@
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/MsgAttachPage.dtd">
 
 <window title="&windowTitle.label;"
-    xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
     align="vertical"
     class="dialog"> 
 
-<html:script language="JavaScript" src="chrome://messenger/content/messengercompose/MsgAttachPage.js"/> 
+<script language="JavaScript" src="chrome://messenger/content/messengercompose/MsgAttachPage.js"/> 
 
 	<keyset id="keyset"/>
 
     <spring style="height:0.5em" />
 	<box align="horizontal">
         <spring style="width:10px" />
-		<html:div>Web Page (URL):</html:div>
-		<html:input type="text" id="attachurl" align="bottom" style="min-width:200px; padding-bottom:0px" />
+		<text value="Web Page (URL):"/>
+		<textfield id="attachurl" align="bottom" style="min-width:200px; padding-bottom:0px" />
         <spring style="width:10px" />
 	</box>
 	
diff --git a/mailnews/compose/resources/content/addressingWidgetOverlay.xul b/mailnews/compose/resources/content/addressingWidgetOverlay.xul
index ab2ada69952b..db80e4edc5c3 100644
--- a/mailnews/compose/resources/content/addressingWidgetOverlay.xul
+++ b/mailnews/compose/resources/content/addressingWidgetOverlay.xul
@@ -22,11 +22,10 @@ Rights Reserved.
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/addressingWidgetOverlay.dtd">
 
 
-<overlay xmlns:html="http://www.w3.org/TR/REC-html40"
-		 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+<overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:script language="JavaScript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
+<script language="JavaScript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
 
 	<!-- Addressing Widget -->
 	<box id="addressingWidget"
diff --git a/mailnews/compose/resources/content/askSendFormat.xul b/mailnews/compose/resources/content/askSendFormat.xul
index 8415acbb2a2d..67463263c82e 100644
--- a/mailnews/compose/resources/content/askSendFormat.xul
+++ b/mailnews/compose/resources/content/askSendFormat.xul
@@ -7,14 +7,13 @@
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/askSendFormat.dtd">
 
 <window title="&windowTitle.label;"
-    xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
     align="vertical"
     class="dialog"
     > 
 
-<html:script language="JavaScript" src="chrome://messenger/content/messengercompose/askSendFormat.js"/> 
+<script language="JavaScript" src="chrome://messenger/content/messengercompose/askSendFormat.js"/> 
 
 	<keyset id="keyset"/>
 
diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index 799e0d8f9b44..01c2ad5bf919 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -29,7 +29,7 @@ Rights Reserved.
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/messengercompose.dtd">
 
-<window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
+<window id="main-window"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
 		onunload="ComposeUnload()"
@@ -42,13 +42,13 @@ Rights Reserved.
 		persist="screenX screenY width height"
 		> 
 
-<html:script language="JavaScript" src="chrome://messenger/content/accountUtils.js"/>
-<html:script language="JavaScript" src="chrome://messenger/content/widgetglue.js"/>
-<html:script language="JavaScript" src="chrome://editor/content/EditorCommands.js"/>
-<html:script language="JavaScript" src="chrome://editor/content/ComposerCommands.js"/>
-<html:script language="JavaScript" src="chrome://editor/content/EditorCommandsDebug.js"/>
-<html:script language="JavaScript" src="chrome://global/content/strres.js"/>
-<html:script language="JavaScript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
+<script language="JavaScript" src="chrome://messenger/content/accountUtils.js"/>
+<script language="JavaScript" src="chrome://messenger/content/widgetglue.js"/>
+<script language="JavaScript" src="chrome://editor/content/EditorCommands.js"/>
+<script language="JavaScript" src="chrome://editor/content/ComposerCommands.js"/>
+<script language="JavaScript" src="chrome://editor/content/EditorCommandsDebug.js"/>
+<script language="JavaScript" src="chrome://global/content/strres.js"/>
+<script language="JavaScript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
 
 <commands id="commands">
 	<commandset id="globalEditMenuItems"/>
@@ -504,7 +504,7 @@ END of Deprecated -->
 			</progressmeter>
 			<spring flex="100%"/>
 		</box>
-		<titledbutton id="statusText" align="right" flex="100%" value="Document: Done"/>
+		<button id="statusText" align="right" flex="100%" value="Document: Done"/>
     </box>
 
 <!-- /box -->