diff --git a/mozilla/mailnews/mime/emitters/resources/skin/mailheader-all.css b/mozilla/mailnews/mime/emitters/resources/skin/mailheader-all.css
index 8314f8f156e..7f0f3e0964c 100644
--- a/mozilla/mailnews/mime/emitters/resources/skin/mailheader-all.css
+++ b/mozilla/mailnews/mime/emitters/resources/skin/mailheader-all.css
@@ -11,6 +11,9 @@ box[name=header-part1]      { background-color: #EFEFEF; border: 0px solid #EFEF
 box[name=header-part2]      { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
 box[name=header-part3]      { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
 
+menubar[name=attachment-menubar]  { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
+menu[name=attachment-menu]        { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
+
 /**************************************************
  * These are all the headers that are displayed
  * for the normal header display. This is accomplished
diff --git a/mozilla/mailnews/mime/emitters/resources/skin/mailheader-micro.css b/mozilla/mailnews/mime/emitters/resources/skin/mailheader-micro.css
index 399f313b836..16618704337 100644
--- a/mozilla/mailnews/mime/emitters/resources/skin/mailheader-micro.css
+++ b/mozilla/mailnews/mime/emitters/resources/skin/mailheader-micro.css
@@ -11,6 +11,9 @@ box[name=header-part1]      { background-color: #EFEFEF; border: 0px solid #EFEF
 box[name=header-part2]      { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
 box[name=header-part3]      { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
 
+menubar[name=attachment-menubar]  { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
+menu[name=attachment-menu]        { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
+
 /**************************************************
  * These are all the headers that are displayed
  * for the normal header display. This is accomplished
diff --git a/mozilla/mailnews/mime/emitters/resources/skin/mailheader-normal.css b/mozilla/mailnews/mime/emitters/resources/skin/mailheader-normal.css
index 747dd6fac4a..8448b6b9d07 100644
--- a/mozilla/mailnews/mime/emitters/resources/skin/mailheader-normal.css
+++ b/mozilla/mailnews/mime/emitters/resources/skin/mailheader-normal.css
@@ -11,6 +11,9 @@ box[name=header-part1]      { background-color: #EFEFEF; border: 0px solid #EFEF
 box[name=header-part2]      { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
 box[name=header-part3]      { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
 
+menubar[name=attachment-menubar]  { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
+menu[name=attachment-menu]        { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
+
 /**************************************************
  * These are all the headers that are displayed
  * for the normal header display. This is accomplished
diff --git a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp
index fe667de9732..7ac5940809e 100644
--- a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp
+++ b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp
@@ -525,22 +525,14 @@ nsMimeXULEmitter::Complete()
 nsresult
 nsMimeXULEmitter::DumpAttachmentMenu()
 {
+  nsresult rv;
+
   if ( (!mAttachArray) || (mAttachArray->Count() <= 0) )
     return NS_OK;
 
-  // RICHIE SHERRY - Hard coded string...evil...need to use string bundle when they work on
-  //                 non UI threads.
-  char  *i18nString = nsnull;
-  nsresult rv;
-
-  if (mAttachArray->Count() == 1)
-    i18nString = "Attachment";
-  else
-    i18nString = "Attachments";
-
   char *buttonXUL = PR_smprintf(
-                      "<titledbutton src=\"chrome://messenger/skin/attach.gif\" value=\"%d %s\" align=\"right\" class=\"popup\" popup=\"attachmentPopup\"/>", 
-                      mAttachArray->Count(), i18nString);
+                      "<titledbutton src=\"chrome://messenger/skin/attach.gif\" value=\"%d\" align=\"right\"/>", 
+                      mAttachArray->Count());
 
   if ( (!buttonXUL) || (!*buttonXUL) )
     return NS_OK;
@@ -554,16 +546,18 @@ nsMimeXULEmitter::DumpAttachmentMenu()
   // Now we can finally write out the attachment information...  
   if (mAttachArray->Count() > 0)
   {
-    UtilityWriteCRLF("<popup id=\"attachmentPopup\">");
-    UtilityWriteCRLF("<menu>");
     PRInt32     i;
-    
+    UtilityWriteCRLF("<menubar name=\"attachment-menubar\">");
+    UtilityWriteCRLF("<menu name=\"attachment-menu\">");
+    UtilityWriteCRLF(buttonXUL);
+    UtilityWriteCRLF("<menupopup>");    
+
     for (i=0; i<mAttachArray->Count(); i++)
     {
       attachmentInfoType *attachInfo = (attachmentInfoType *)mAttachArray->ElementAt(i);
       if (!attachInfo)
         continue;
-
+      
       UtilityWrite("<menuitem value=\"");
       UtilityWrite(attachInfo->displayName);
       UtilityWrite("\" oncommand=\"OpenAttachURL('");
@@ -577,10 +571,11 @@ nsMimeXULEmitter::DumpAttachmentMenu()
       {
         UtilityWrite(attachInfo->urlSpec);
       }
+
       UtilityWrite("','");
       UtilityWrite(attachInfo->displayName);
       UtilityWrite("','");
-
+      
       nsCOMPtr<nsIMsgMessageUrl> messageUrl = do_QueryInterface(mURL, &rv);
       if (NS_SUCCEEDED(rv))
         rv = messageUrl->GetURI(&urlString);
@@ -592,66 +587,12 @@ nsMimeXULEmitter::DumpAttachmentMenu()
       }
       UtilityWriteCRLF("' );\"  />");
     }
+    UtilityWriteCRLF("</menupopup>");
     UtilityWriteCRLF("</menu>");
-    UtilityWriteCRLF("</popup>");
+    
+    UtilityWriteCRLF("</menubar>");
   }
 
-#if 1
-
-	// **** jefft - this is a temporary implementation
-  if (mAttachArray->Count() > 0)
-  {
-	  PRInt32     i;
-
-	  UtilityWriteCRLF("<menubar>");
-
-	  UtilityWriteCRLF("<menu value=\"Save Attachment(s)\">");
-	  UtilityWriteCRLF("<menupopup>");
-
-	  for (i=0; i<mAttachArray->Count(); i++)
-	  {
-		  attachmentInfoType *attachInfo = (attachmentInfoType
-											*)mAttachArray->ElementAt(i);
-		  if (!attachInfo)
-			  continue;
-		  
-		  UtilityWrite("<menuitem value=\"");
-		  UtilityWrite(attachInfo->displayName);
-		  UtilityWrite("\" oncommand=\"OpenAttachURL('");
-          escapedUrl = nsEscape(attachInfo->urlSpec, url_Path);
-          if (escapedUrl)
-          {
-            UtilityWrite(escapedUrl);
-            nsCRT::free(escapedUrl);
-          }
-          else
-          {
-            UtilityWrite(attachInfo->urlSpec);
-          }
-          UtilityWrite("','");
-          UtilityWrite(attachInfo->displayName);
-          UtilityWrite("','");
-          
-          nsCOMPtr<nsIMsgMessageUrl> messageUrl = do_QueryInterface(mURL, &rv);
-          if (NS_SUCCEEDED(rv))
-            rv = messageUrl->GetURI(&urlString);
-          if (NS_SUCCEEDED(rv) && urlString)
-          {
-            UtilityWrite(urlString);
-            nsCRT::free(urlString);
-            urlString = nsnull;
-          }
-		  UtilityWriteCRLF("' );\"  />");
-	  }
-	  UtilityWriteCRLF("</menupopup>");
-	  UtilityWriteCRLF("</menu>");
-
-	  UtilityWriteCRLF("</menubar>");
-  }
-
-#endif
-  UtilityWriteCRLF(buttonXUL);
-
   UtilityWriteCRLF("</box>");
   PR_FREEIF(buttonXUL);
 
diff --git a/mozilla/mailnews/mime/resources/skin/less.gif b/mozilla/mailnews/mime/resources/skin/less.gif
index 950eb06c490..30854a2dd5d 100644
Binary files a/mozilla/mailnews/mime/resources/skin/less.gif and b/mozilla/mailnews/mime/resources/skin/less.gif differ
diff --git a/mozilla/mailnews/mime/resources/skin/more.gif b/mozilla/mailnews/mime/resources/skin/more.gif
index cb8d2a59892..8f1f48b0a2c 100644
Binary files a/mozilla/mailnews/mime/resources/skin/more.gif and b/mozilla/mailnews/mime/resources/skin/more.gif differ