Changed Message Composer UI for new color picker UI. r=sfraser

mailnews/compose/resources/content/messengercompose.xul

@@ -106,6 +106,11 @@ ACTUALLY, EVERY TIME YOU TYPE ANY OF THE KEY DEFINED HERE AFTER WITHOUT ANY OF T
 
 -->
 
+<popupset>
+  <popup id="TextColorPicker"/>
+  <popup id="BackColorPicker"/>
+</popupset>
+
 <!-- box id="toolbar" align="vertical" style="width:100%;height:100%" -->
   <menubar>
 	<menu id="menu_File">
@@ -363,14 +368,7 @@ ACTUALLY, EVERY TIME YOU TYPE ANY OF THE KEY DEFINED HERE AFTER WITHOUT ANY OF T
         <html:select id="FontFaceSelect"/>
       </html:div>
 
-      <menu>
-        <titledbutton id="TextColorPopupButton"/>
-        <menupopup id="TextColorPopup"/>
-      </menu>
-      <menu>
-        <titledbutton id="BackColorPopupButton"/>
-        <menupopup id="BackColorPopup"/>
-      </menu>
+      <html:div id="ColorButtons"/>
       
       <titledbutton id="DecreaseFontSizeButton"/>
       <titledbutton id="IncreaseFontSizeButton"/>