diff --git a/mailnews/addrbook/resources/skin/addressbook.css b/mailnews/addrbook/resources/skin/addressbook.css
index 4fdca792a35d..09e6787804dc 100644
--- a/mailnews/addrbook/resources/skin/addressbook.css
+++ b/mailnews/addrbook/resources/skin/addressbook.css
@@ -45,6 +45,7 @@ box#CardViewBox {
 	padding-left: 8px;
 	padding-right: 8px;
 	background-color: #EEEEEE;
+	user-focus: ignore;
 }
 
 box.cardviewgroup {
diff --git a/mailnews/base/resources/content/messenger.xul b/mailnews/base/resources/content/messenger.xul
index 1f6a7fcbca48..2328f0c32043 100644
--- a/mailnews/base/resources/content/messenger.xul
+++ b/mailnews/base/resources/content/messenger.xul
@@ -500,10 +500,7 @@ Rights Reserved.
             <titledbutton id="button_forward" class="button28" align="top" value="&forwardButton.label;" onclick="MsgForwardMessage(event)"/>
             <toolbarseparator/>
             <titledbutton id="button_next" class="other28" align="top" value="&nextButton.label;" onclick="MsgNextUnreadMessage()"/>
-			<!-- XXX need to change back to after focus starts working again.  Workaround for Bug 18088
-			 <titledbutton id="button_delete" class="other28" disabled="true" align="top" value="&deleteButton.label;" onclick="goDoCommand('button_delete')"/>
-			 -->
-            <titledbutton id="button_delete" class="other28" disabled="true" align="top" value="&deleteButton.label;" onclick="MsgDeleteMessage(true)"/>
+			<titledbutton id="button_delete" class="other28" disabled="true" align="top" value="&deleteButton.label;" onclick="goDoCommand('button_delete')"/>
             <titledbutton id="button_print" class="other28" align="top" value="&printButton.label;" onclick="Print()"/>
             <titledbutton id="button_stop" class="other28" align="top" value="&stopButton.label;" onclick="MsgStop();"/>
             <spring flex="100%"/>
diff --git a/xpfe/browser/resources/skin/navigator.css b/xpfe/browser/resources/skin/navigator.css
index ec8c2c509117..5b364eef0f6c 100644
--- a/xpfe/browser/resources/skin/navigator.css
+++ b/xpfe/browser/resources/skin/navigator.css
@@ -37,7 +37,6 @@ titledbutton#reload-button {
 	margin: 0px; 
 	font: inherit;
 	border: none;
-	user-focus: normal;
 } 
 
 box#url-bar-box {
diff --git a/xpfe/global/resources/skin/global.css b/xpfe/global/resources/skin/global.css
index 66f69e380281..c4a75f825740 100644
--- a/xpfe/global/resources/skin/global.css
+++ b/xpfe/global/resources/skin/global.css
@@ -380,6 +380,7 @@ titledbutton.toolbar[disabled="true"]:active {
 box#status-bar {
 	min-width: 1em;
 	background-color: #CCCCCC;
+	user-focus: ignore;
 }
 
 titledbutton.status-bar {
@@ -430,6 +431,7 @@ grippy{
 	padding: 0px;
 	background-color: #6699CC;
 	list-style-image: none;
+	cursor: pointer;
 }
 
 grippy:hover{
@@ -521,6 +523,10 @@ progressmeter {
 
 /********* XP Menus ***********/
 
+menubar {
+	background-color: #EEEEEE;
+}
+
 menu {
 	color: black;
 }
@@ -539,7 +545,7 @@ menuitem[disabled="true"] {
 
 /* XXX menupopups have to have a color explicitly specified. this is a bug */
 menupopup, popup {
-  background-color: white;
+  background-color: #EEEEEE;
   border: 1px white outset;
 }
 
@@ -720,6 +726,10 @@ menu > .menu-right {
   list-style-image: url("chrome://global/skin/menu-arrow.gif");
 }
 
+menu[disabled="true"] > .menu-right {
+  list-style-image: url("chrome://global/skin/menu-arrow-disabled.gif");
+}
+
 menu[menuactive="true"] > .menu-right {
   list-style-image: url("chrome://global/skin/menu-arrow-hover.gif");
 }
@@ -1337,6 +1347,7 @@ window html|input[type=password] {
 window html|input {
   background-color: transparent;
   color: black;
+  user-focus: normal;
 }
 
 window html|input[type=radio] {
diff --git a/xpfe/global/resources/skin/tasksOverlay.css b/xpfe/global/resources/skin/tasksOverlay.css
index a4186530042c..18af8e857985 100644
--- a/xpfe/global/resources/skin/tasksOverlay.css
+++ b/xpfe/global/resources/skin/tasksOverlay.css
@@ -24,6 +24,7 @@ toolbar#taskbar {
 	margin-top: 2px;
 	min-height: 1em;
 	font-size: smaller;
+	user-focus: ignore;
 }
 
 toolbar#taskbar titledbutton {
diff --git a/xpfe/global/resources/skin/xul.css b/xpfe/global/resources/skin/xul.css
index f65ac8369c2d..2c66f78c88d2 100644
--- a/xpfe/global/resources/skin/xul.css
+++ b/xpfe/global/resources/skin/xul.css
@@ -71,6 +71,7 @@ toolbox {
 
 toolbar, menubar {
   display:block;
+  user-focus: ignore;
 }
 
 toolbar[collapsed="true"] {