diff --git a/common/src/customizeToolbar.js b/common/src/customizeToolbar.js
index afcc919c5a..da2fb42978 100644
--- a/common/src/customizeToolbar.js
+++ b/common/src/customizeToolbar.js
@@ -81,6 +81,16 @@ function initDialog() {
   if (mode == "text")
     smallIconsCheckbox.disabled = true;
 
+  if (AppConstants.MOZ_APP_NAME == "thunderbird") {
+    let titlebarCheckbox = document.getElementById("showTitlebar");
+    if (window.opener &&
+       (window.opener.document.documentElement.getAttribute("windowtype") ==
+        "mail:3pane")) {
+      titlebarCheckbox.hidden = false;
+      titlebarCheckbox.checked = !Services.prefs.getBoolPref("mail.tabs.drawInTitlebar");
+    }
+  }
+
   // Build up the palette of other items.
   buildPalette();
 
@@ -532,6 +542,15 @@ function updateIconSize(aSize) {
   return updateToolboxProperty("iconsize", aSize, "large");
 }
 
+function updateTitlebar() {
+  let titlebarCheckbox = document.getElementById("showTitlebar");
+  Services.prefs.setBoolPref("mail.tabs.drawInTitlebar", !titlebarCheckbox.checked);
+
+  // Bring the customizeToolbar window to front (on linux it's behind the main
+  // window). Otherwise the customization window gets left in the background.
+  setTimeout(function() { window.focus() }, 100);
+}
+
 function updateToolbarMode(aModeValue) {
   var mode = updateToolboxProperty("mode", aModeValue, "icons");
 
diff --git a/common/src/customizeToolbar.xul b/common/src/customizeToolbar.xul
index fece3d72e2..e3028a3958 100644
--- a/common/src/customizeToolbar.xul
+++ b/common/src/customizeToolbar.xul
@@ -92,6 +92,9 @@
 
     <button id="newtoolbar" label="&addNewToolbar.label;" oncommand="addNewToolbar();" icon="add"/>
     <button id="restoreDefault" label="&restoreDefaultSet.label;" oncommand="restoreDefaultSet();" icon="revert"/>
+#ifndef MOZ_SUITE
+    <checkbox id="showTitlebar" oncommand="updateTitlebar();" label="&showTitltbar.label;" hidden="true"/>
+#endif
   </box>
 
   <separator class="groove"/>
diff --git a/mail/locales/en-US/chrome/messenger/customizeToolbar.dtd b/mail/locales/en-US/chrome/messenger/customizeToolbar.dtd
index 074981ce20..656ddec70e 100644
--- a/mail/locales/en-US/chrome/messenger/customizeToolbar.dtd
+++ b/mail/locales/en-US/chrome/messenger/customizeToolbar.dtd
@@ -13,5 +13,6 @@
 <!ENTITY useSmallIcons.label      "Use Small Icons">
 <!ENTITY restoreDefaultSet.label  "Restore Default Set">
 <!ENTITY addNewToolbar.label      "Add New Toolbar">
+<!ENTITY showTitltbar.label       "Show Title Bar">
 <!ENTITY saveChanges.label        "Done">
 <!ENTITY undoChanges.label        "Undo Changes">