diff --git a/mozilla/mailnews/addrbook/resources/content/addressbook.xul b/mozilla/mailnews/addrbook/resources/content/addressbook.xul
index ef610563adf..7fb16706d59 100644
--- a/mozilla/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mozilla/mailnews/addrbook/resources/content/addressbook.xul
@@ -200,12 +200,12 @@ Rights Reserved.
 	<!-- toolbar -->
 		<toolbar class="toolbar-primary" id="abToolbar" persist="collapsed">
 			<box id="toolbar_button_box">
-				<button class="button-toolbar-2 top" orient="vertical" id="button-newcard" value="&newcardButton.label;" tooltip="aTooltip" tooltiptext="&newcardButton.tooltip;" onclick="AbNewCard()"/>
-				<button class="button-toolbar-2 top" orient="vertical" id="button-newlist" value="&newlistButton.label;" tooltip="aTooltip" tooltiptext="&newlistButton.tooltip;" onclick="AbNewList()"/>
+				<button class="button-toolbar-2 top" orient="vertical" id="button-newcard" value="&newcardButton.label;" tooltip="aTooltip" tooltiptext="&newcardButton.tooltip;" oncommand="AbNewCard();"/>
+				<button class="button-toolbar-2 top" orient="vertical" id="button-newlist" value="&newlistButton.label;" tooltip="aTooltip" tooltiptext="&newlistButton.tooltip;" oncommand="AbNewList();"/>
             	<toolbarseparator class="toolbarseparator-primary"/>
-				<button class="button-toolbar-2 top" orient="vertical" id="button-editcard" value="&editButton.label;" tooltip="aTooltip" tooltiptext="&editButton.tooltip;" onclick="AbEditCard()"/>
-				<button class="button-toolbar-2 top" orient="vertical" id="button-newmessage" value="&newmsgButton.label;" tooltip="aTooltip" tooltiptext="&newmsgButton.tooltip;" onclick="AbNewMessage()"/>
-				<button class="button-toolbar-2 top" orient="vertical" id="button-delete" disabled="true" observes="button_delete" value="&deleteButton.label;" tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" onclick="goDoCommand('button_delete')"/>
+				<button class="button-toolbar-2 top" orient="vertical" id="button-editcard" value="&editButton.label;" tooltip="aTooltip" tooltiptext="&editButton.tooltip;" oncommand="AbEditCard();"/>
+				<button class="button-toolbar-2 top" orient="vertical" id="button-newmessage" value="&newmsgButton.label;" tooltip="aTooltip" tooltiptext="&newmsgButton.tooltip;" oncommand="AbNewMessage();"/>
+				<button class="button-toolbar-2 top" orient="vertical" id="button-delete" disabled="true" observes="button_delete" value="&deleteButton.label;" tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" oncommand="goDoCommand('button_delete');"/>
 
 				<box orient="vertical" flex="100%">
 					<spring flex="1"/> 
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-done.xul b/mozilla/mailnews/base/prefs/resources/content/aw-done.xul
index 8fe80c976af..d7b3c96fdcd 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-done.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-done.xul
@@ -63,7 +63,7 @@ Rights Reserved.
     <html>&clickFinish.label;</html>
     <!--
       <box>
-        <button class="dialog push" value="&setupAnotherButton.label;" onclick="setupAnother(event);"/>
+        <button class="dialog push" value="&setupAnotherButton.label;" oncommand="setupAnother(event);"/>
       </box>
     -->
   </box>
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul b/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
index 6451fc4aab0..23a1f1280c5 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@@ -86,7 +86,7 @@
       </menulist>
       
       <text class="label" value="&color.label;" accesskey="&color.accesskey;"/>
-      <colorpicker type="button" id="citationmenu" palettename="standard" onclick="setColorWell(this)"/>
+      <colorpicker type="button" id="citationmenu" palettename="standard" oncommand="setColorWell(this);"/>
       <broadcaster id="mailCitationColor" pref="true" preftype="color" prefstring="mail.citation_color" prefattribute="value" wsm_attributes="value"/>
     </box>		
 
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 0061e12f06a..e983d032424 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -687,7 +687,7 @@ Rights Reserved.
 		</menupopup>
 	</menu>
 
-	<menu id="menu_Edit" onclick="CommandUpdate_UndoRedo();">
+	<menu id="menu_Edit" oncommand="CommandUpdate_UndoRedo();">
 		<menupopup>
 			<menuitem id="menu_undo" value="&undoDefaultCmd.label;" accesskey="&undoDefaultCmd.accesskey;" key="key_undo" oncommand="Undo()"/>
 			<menuitem id="menu_redo" value="&redoDefaultCmd.label;" accesskey="&redoDefaultCmd.accesskey;" key="key_redo" oncommand="Redo()"/>
@@ -998,11 +998,11 @@ Rights Reserved.
 	<toolbar class="toolbar-primary chromeclass-toolbar" id="msgToolbar" persist="collapsed">
 		<box id="toolbar_button_box">
 			<button class="button-toolbar-2 top" id="button-getmsg" value="&getMsgButton.label;" tooltip="aTooltip" tooltiptext="&getMsgButton.tooltip;" observes="cmd_getNewMessages"/>
-			<button class="button-toolbar-2 top" id="button-newmsg" value="&newMsgButton.label;" tooltip="aTooltip" tooltiptext="&newMsgButton.tooltip;" onclick="MsgNewMessage(event)"/>
+			<button class="button-toolbar-2 top" id="button-newmsg" value="&newMsgButton.label;" tooltip="aTooltip" tooltiptext="&newMsgButton.tooltip;" oncommand="MsgNewMessage(event)"/>
 			<toolbarseparator class="toolbarseparator-primary"/>
-			<button class="button-toolbar-2 top" id="button-reply" value="&replyButton.label;" tooltip="aTooltip" tooltiptext="&replyButton.tooltip;" observes="button_reply" onclick="MsgReplyMessage(event)"/>
-			<button class="button-toolbar-2 top" id="button-replyall" value="&replyAllButton.label;" tooltip="aTooltip" tooltiptext="&replyAllButton.tooltip;" observes="button_replyall" onclick="MsgReplyToAllMessage(event)"/>
-			<button class="button-toolbar-2 top" id="button-forward" value="&forwardButton.label;" tooltip="aTooltip"  tooltiptext="&forwardButton.tooltip;" observes="button_forward" onclick="MsgForwardMessage(event)"/>
+			<button class="button-toolbar-2 top" id="button-reply" value="&replyButton.label;" tooltip="aTooltip" tooltiptext="&replyButton.tooltip;" observes="button_reply" oncommand="MsgReplyMessage(event)"/>
+			<button class="button-toolbar-2 top" id="button-replyall" value="&replyAllButton.label;" tooltip="aTooltip" tooltiptext="&replyAllButton.tooltip;" observes="button_replyall" oncommand="MsgReplyToAllMessage(event)"/>
+			<button class="button-toolbar-2 top" id="button-forward" value="&forwardButton.label;" tooltip="aTooltip"  tooltiptext="&forwardButton.tooltip;" observes="button_forward" oncommand="MsgForwardMessage(event)"/>
 			<toolbarseparator class="toolbarseparator-primary"/>
 			<menu id="FileButtonMenu" observes="cmd_file" datasources="rdf:null" ignore="http://home.netscape.com/NC-rdf#MessageChild">
 				<button class="button-toolbar-2 top" observes="cmd_file" id="button-file" value="&fileButton.label;"  tooltip="aTooltip" tooltiptext="&fileButton.tooltip;"/>
@@ -1069,14 +1069,14 @@ Rights Reserved.
 				<menupopup/>
 			</menu>
 			<button class="button-toolbar-2 top" id="button-next" value="&nextButton.label;"  tooltip="aTooltip" tooltiptext="&nextButton.tooltip;" observes="cmd_nextUnreadMsg"/>
-			<button class="button-toolbar-2 top" id="button-delete" value="&deleteButton.label;"  tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" observes="button_delete" onclick="goDoCommand('button_delete')"/>
+			<button class="button-toolbar-2 top" id="button-delete" value="&deleteButton.label;"  tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" observes="button_delete" oncommand="goDoCommand('button_delete')"/>
       <menubutton class="menubutton-dual toolbar top" id="button-print" value="&printButton.label;" 
                   crop="right" observes="cmd_print" tooltip="aTooltip" buttontooltiptext="&printButton.tooltip;">  
      	  <menupopup id="printMenu">
     			<menuitem value="&printCmd.label;" accesskey="&printCmd.accesskey;" default="true"/>
         </menupopup>
   	  </menubutton>
-			<button class="button-toolbar-2 top" id="button-stop" value="&stopButton.label;"  tooltip="aTooltip" tooltiptext="&stopButton.tooltip;" onclick="MsgStop();"/>
+			<button class="button-toolbar-2 top" id="button-stop" value="&stopButton.label;"  tooltip="aTooltip" tooltiptext="&stopButton.tooltip;" oncommand="MsgStop();"/>
 			<spring flex="1"/>
 		</box>
   	<button id="navigator-throbber" oncommand='goClickThrobber("messenger.throbber.url")'/>
@@ -1086,7 +1086,7 @@ Rights Reserved.
 <statusbar id="status-bar"> 
 	<box position="1" flex="1">
 		<statusbarpanel id="offline-status" class="statusbarpanel-icononly"/> 
-		<progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0" onclick="dumpProgress()"/> 
+		<progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0" oncommand="dumpProgress()"/> 
 		<statusbarpanel id="statusText" value="&statusText.label;" crop="right" flex="1"/> 
 	</box>
 	<statusbarpanel id="security-button" class="statusbarpanel-icononly"/>
diff --git a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
index 2ef4150d898..f5c7235f819 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
@@ -120,13 +120,13 @@ Rights Reserved.
           <spring flex="1"/>
         </box>
         <box orient="vertical">
-          <button id="newButton" value="&newButton.label;" onclick="onNewFilter();"/>
-          <button id="editButton" value="&editButton.label;" onclick="onEditFilter();"/>
-          <button id="deleteButton" value="&deleteButton.label;" onclick="onDeleteFilter();"/>
+          <button id="newButton" value="&newButton.label;" oncommand="onNewFilter();"/>
+          <button id="editButton" value="&editButton.label;" oncommand="onEditFilter();"/>
+          <button id="deleteButton" value="&deleteButton.label;" oncommand="onDeleteFilter();"/>
           <spring flex="1"/>
           <!-- take out for PR2
             <button value="&runFiltersNow.label;" width="0em"/>
-            <button onclick="DumpDOM(document.getElementById('filterTree'));" value="dump"/>
+            <button oncommand="DumpDOM(document.getElementById('filterTree'));" value="dump"/>
           -->
         </box>
       </row>
diff --git a/mozilla/mailnews/base/search/resources/content/SearchDialog.xul b/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
index b32f9a22a90..c7f7e7b55c6 100644
--- a/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
@@ -54,7 +54,7 @@ Rights Reserved.
       <box autostretch="never">
         <text class="label" value="&searchHeading.label;"/>
         <menulist id="searchableFolders" flex="2"
-                oncommand="onChooseFolder(event)"/>
+                oncommand="onChooseFolder(event);"/>
         <spring flex="1"/>
           <checkbox id="checkSearchSubFolders" value="&searchSubfolders.label;" checked="true"/>
       </box>
@@ -66,8 +66,8 @@ Rights Reserved.
         
         <box orient="vertical">
            <spring flex="1"/>
-           <button value="&searchButton.label;" oncommand="onSearch(event)"/>
-           <button value="&resetButton.label;" oncommand="onReset(event)"/>
+           <button value="&searchButton.label;" oncommand="onSearch(event);"/>
+           <button value="&resetButton.label;" oncommand="onReset(event);"/>
            <spring flex="1"/>
          </box>
       </box>
@@ -82,7 +82,7 @@ Rights Reserved.
     </titledbox>
     
     <box autostretch="never" align="right">
-      <button value="&closeButton.label;" onclick="window.close();"/>
+      <button value="&closeButton.label;" oncommand="window.close();"/>
     </box>
   
   </box>
diff --git a/mozilla/mailnews/base/search/resources/content/searchTermOverlay.xul b/mozilla/mailnews/base/search/resources/content/searchTermOverlay.xul
index 146bd4478b1..73c6b0cc07e 100644
--- a/mozilla/mailnews/base/search/resources/content/searchTermOverlay.xul
+++ b/mozilla/mailnews/base/search/resources/content/searchTermOverlay.xul
@@ -85,8 +85,8 @@
       </tree>
     </box>
     <box>
-      <button id="more" value="&more.label;" onclick="onMore(event);"/>
-      <button id="less" value="&less.label;" disabled="true" onclick="onLess(event);"/>
+      <button id="more" value="&more.label;" oncommand="onMore(event);"/>
+      <button id="less" value="&less.label;" disabled="true" oncommand="onLess(event);"/>
     </box>
   </box>
 
