--- a/mail/app/profile/extensions/tbtestpilot@labs.mozilla.com/content/feedback-browser.xul
+++ b/mail/app/profile/extensions/tbtestpilot@labs.mozilla.com/content/feedback-browser.xul
@@ -53,29 +53,31 @@
 </panel>
 
 <menu id="pilot-menu" class="menu-iconic"
       label="&testpilot.feedbackbutton.label;"
       insertafter="addonsManager">
   <menupopup id="pilot-menu-popup"
              onpopupshowing="TestPilotMenuUtils.onPopupShowing(event);"
              onpopuphiding="TestPilotMenuUtils.onPopupHiding(event);">
+<!-- XXX Disabled until we're ready for the feedback button.
     <menuitem id="feedback-menu-happy-button"
               class="menuitem-iconic"
               image="chrome://testpilot-os/skin/feedback-smile-16x16.png"
               label="&testpilot.happy.label;"
               thunderbirdLabel="&testpilot.happy.thunderbirdLabel;"
               oncommand="TestPilotWindowUtils.openFeedbackPage('happy');"/>
     <menuitem id="feedback-menu-sad-button"
               class="menuitem-iconic"
               image="chrome://testpilot-os/skin/feedback-frown-16x16.png"
               label="&testpilot.sad.label;"
               thunderbirdLabel="&testpilot.sad.thunderbirdLabel;"
               oncommand="TestPilotWindowUtils.openFeedbackPage('sad');"/>
     <menuseparator/>
+-->
     <menuitem id="feedback-menu-show-studies"
               label="&testpilot.allYourStudies.label;"
               oncommand="TestPilotWindowUtils.openAllStudiesWindow();"/>
     <menuitem id="feedback-menu-enable-studies" 
               label="&testpilot.enable.label;"
               oncommand="TestPilotMenuUtils.togglePref('runStudies');"/>
   </menupopup>
 </menu>