diff --git a/calendar/lightning/content/calendar-buttons-mail-toolbar.inc.xhtml b/calendar/lightning/content/calendar-buttons-mail-toolbar.inc.xhtml
new file mode 100644
index 0000000000..23f8537158
--- /dev/null
+++ b/calendar/lightning/content/calendar-buttons-mail-toolbar.inc.xhtml
@@ -0,0 +1,35 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+<!-- CALENDAR TOOLBAR BUTTONS FOR MAIL TOOLBAR -->
+<toolbarbutton id="lightning-button-calendar"
+               class="toolbarbutton-1"
+               label="&lightning.toolbar.calendar.label;"
+               tooltiptext="&lightning.toolbar.calendar.tooltip;"
+               command="new_calendar_tab"/>
+<toolbarbutton id="lightning-button-tasks"
+               class="toolbarbutton-1"
+               label="&lightning.toolbar.task.label;"
+               tooltiptext="&lightning.toolbar.task.tooltip;"
+               command="new_task_tab"/>
+<toolbarbutton is="toolbarbutton-menu-button" id="extractEventButton"
+               type="menu-button"
+               class="toolbarbutton-1"
+               label="&calendar.extract.event.button;"
+               tooltiptext="&calendar.extract.event.button.tooltip;"
+               oncommand="calendarExtract.extractFromEmail(true);">
+  <menupopup id="extractEventLocaleList"
+             oncommand="calendarExtract.extractWithLocale(event, true);"
+             onpopupshowing="calendarExtract.onShowLocaleMenu(event.target);"/>
+</toolbarbutton>
+<toolbarbutton is="toolbarbutton-menu-button" id="extractTaskButton"
+               type="menu-button"
+               class="toolbarbutton-1"
+               label="&calendar.extract.task.button;"
+               tooltiptext="&calendar.extract.task.button.tooltip;"
+               oncommand="calendarExtract.extractFromEmail(false);">
+  <menupopup id="extractTaskLocaleList"
+             oncommand="calendarExtract.extractWithLocale(event, false);"
+             onpopupshowing="calendarExtract.onShowLocaleMenu(event.target);"/>
+</toolbarbutton>
diff --git a/calendar/lightning/content/messenger-overlay-sidebar.xhtml b/calendar/lightning/content/messenger-overlay-sidebar.xhtml
index cffa4253a3..0e112de452 100644
--- a/calendar/lightning/content/messenger-overlay-sidebar.xhtml
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xhtml
@@ -9,40 +9,6 @@
          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <!-- CALENDAR TOOLBAR BUTTONS FOR MAIL TOOLBAR -->
-  <toolbarpalette id="MailToolbarPalette">
-    <toolbarbutton id="lightning-button-calendar"
-                   class="toolbarbutton-1"
-                   label="&lightning.toolbar.calendar.label;"
-                   tooltiptext="&lightning.toolbar.calendar.tooltip;"
-                   command="new_calendar_tab"/>
-    <toolbarbutton id="lightning-button-tasks"
-                   class="toolbarbutton-1"
-                   label="&lightning.toolbar.task.label;"
-                   tooltiptext="&lightning.toolbar.task.tooltip;"
-                   command="new_task_tab"/>
-    <toolbarbutton is="toolbarbutton-menu-button" id="extractEventButton"
-                   type="menu-button"
-                   class="toolbarbutton-1"
-                   label="&calendar.extract.event.button;"
-                   tooltiptext="&calendar.extract.event.button.tooltip;"
-                   oncommand="calendarExtract.extractFromEmail(true);">
-      <menupopup id="extractEventLocaleList"
-                 oncommand="calendarExtract.extractWithLocale(event, true);"
-                 onpopupshowing="calendarExtract.onShowLocaleMenu(event.target);"/>
-    </toolbarbutton>
-    <toolbarbutton is="toolbarbutton-menu-button" id="extractTaskButton"
-                   type="menu-button"
-                   class="toolbarbutton-1"
-                   label="&calendar.extract.task.button;"
-                   tooltiptext="&calendar.extract.task.button.tooltip;"
-                   oncommand="calendarExtract.extractFromEmail(false);">
-      <menupopup id="extractTaskLocaleList"
-                 oncommand="calendarExtract.extractWithLocale(event, false);"
-                 onpopupshowing="calendarExtract.onShowLocaleMenu(event.target);"/>
-    </toolbarbutton>
-  </toolbarpalette>
-
   <!-- CALENDAR MENUS -->
   <menupopup id="menu_FilePopup">
     <menu id="menu_Open"
diff --git a/calendar/lightning/jar.mn b/calendar/lightning/jar.mn
index 023a6d6665..15c1130fb3 100644
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -13,6 +13,7 @@ lightning.jar:
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xhtml chrome://lightning/content/suite-overlay-sidebar.xhtml application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % override chrome://lightning-common/skin/accountCentral.css chrome://lightning-common/skin/suite-accountCentral.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % content lightning %content/
+    content/calendar-buttons-mail-toolbar.inc.xhtml        (content/calendar-buttons-mail-toolbar.inc.xhtml)
     content/calendar-commands.inc.xhtml                    (content/calendar-commands.inc.xhtml)
     content/calendar-context-menus-and-tooltips.inc.xhtml  (content/calendar-context-menus-and-tooltips.inc.xhtml)
     content/calendar-keys.inc.xhtml                        (content/calendar-keys.inc.xhtml)
diff --git a/mail/base/content/mainMailToolbox.inc.xhtml b/mail/base/content/mainMailToolbox.inc.xhtml
index 27155ae889..13f182623f 100644
--- a/mail/base/content/mainMailToolbox.inc.xhtml
+++ b/mail/base/content/mainMailToolbox.inc.xhtml
@@ -407,6 +407,7 @@
                    label="&addons.label;"
                    tooltiptext="&addonsButton.tooltip;"
                    oncommand="openAddonsMgr();"/>
+#include ../../../calendar/lightning/content/calendar-buttons-mail-toolbar.inc.xhtml
   </toolbarpalette>
 
   <!-- If changes are made to the default set of toolbar buttons, you may need to rev the id