From 0609c3e30bf7867e60a5960b3b2c16fcc9bae798 Mon Sep 17 00:00:00 2001
From: jmozmoz <joachim.herb@gmx.de>
Date: Fri, 16 Aug 2019 12:45:24 +0200
Subject: [PATCH] set two line header mode for test of header button icon/label

---
 .../test-compactheader-toolbar.js             | 1917 +++++++++--------
 1 file changed, 980 insertions(+), 937 deletions(-)

diff --git a/test/compactheader/test-compactheader-toolbar.js b/test/compactheader/test-compactheader-toolbar.js
index a3d46c7..472fad6 100644
--- a/test/compactheader/test-compactheader-toolbar.js
+++ b/test/compactheader/test-compactheader-toolbar.js
@@ -1,949 +1,992 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Thunderbird Mail Client.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joachim Herb <Joachim.Herb@gmx.de>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-var MODULE_NAME = 'test-compactheader-toolbar';
-
-var RELATIVE_ROOT = '../shared-modules';
-var MODULE_REQUIRES = ['folder-display-helpers', 'window-helpers',
-                       'address-book-helpers', 'mouse-event-helpers',
-                       'dom-helpers', 'compactheader-helpers'];
-
-try {
-  var elib = ChromeUtils.import('chrome://mozmill/content/modules/elementslib.jsm');
-} catch (err) {
-    try {
-      dump("xxxxxxxxxxxxxxxxxxxxxx err: " + err);
-      var elib = ChromeUtils.import('chrome://mozmill/content/modules/elementslib.js');
-    } catch(err2) {
-      dump("yyyyyyyyyyyyyyyyyyyyyyy err: " + err2);
-      var Ci = Components.interfaces;
-      var Cc = Components.classes;
-      var Cu = Components.utils;
-
-      var elib = {};
-      Cu.import('resource://mozmill/modules/elementslib.js', elib);
-    }
-}
-
-try {
-  var controller = ChromeUtils.import('chrome://mozmill/content/modules/controller.jsm');
-} catch (err) {
-    try {
-      dump("xxxxxxxxxxxxxxxxxxxxxx err: " + err);
-      var controller = ChromeUtils.import('chrome://mozmill/content/modules/controller.js');
-    } catch(err2) {
-      dump("yyyyyyyyyyyyyyyyyyyyyyy err: " + err2);
-      var Ci = Components.interfaces;
-      var Cc = Components.classes;
-      var Cu = Components.utils;
-
-      var controller = {};
-      Cu.import('resource://mozmill/modules/controller.js', controller);
-    }
-}
-
-Cu.import("resource://gre/modules/Services.jsm");
-
-// The WindowHelper module
-var WindowHelper;
-
-var folder1, folder2;
-
-function setupModule(module) {
-  let fdh = collector.getModule('folder-display-helpers');
-  fdh.installInto(module);
-  WindowHelper = collector.getModule('window-helpers');
-  WindowHelper.installInto(module);
-  let abh = collector.getModule('address-book-helpers');
-  abh.installInto(module);
-  let meh = collector.getModule('mouse-event-helpers');
-  meh.installInto(module);
-  let chh = collector.getModule('compactheader-helpers');
-  chh.installInto(module);
-  let domh = collector.getModule('dom-helpers');
-  domh.installInto(module);
-
-  // Get rid of possibly showing up lightning import wizard
-  let wizard = Services.wm.getMostRecentWindow("Calendar:MigrationWizard");
-  if (wizard) {
-    close_window(wizard);
-    mc = open3PaneWindow();
-  }
-
-  folder1 = create_folder("MessageWindowB");
-
-  // create a message that has the interesting headers that commonly
-  // show up in the message header pane for testing
-  let msg = create_message({cc: msgGen.makeNamesAndAddresses(20), // YYY
-                            subject: "This is a really, really, really, really, really, really, really, really, long subject.",
-                            clobberHeaders: {
-                              "Newsgroups": "alt.test",
-                              "Reply-To": "J. Doe <j.doe@momo.invalid>",
-                              "Content-Base": "http://example.com/",
-                              "Bcc": "Richard Roe <richard.roe@momo.invalid>"
-                            }});
-
-  add_message_to_folder(folder1, msg);
-
-  // create a message that has boring headers to be able to switch to and
-  // back from, to force the more button to collapse again.
-  msg = create_message();
-  add_message_to_folder(folder1, msg);
-
-  folder2 = create_folder("ThreadTest");
-
-  thread1 = create_thread(3);
-  add_sets_to_folders([folder2], [thread1]);
-
-  let abwc = openAddressBook();
-  close3PaneWindow();
-  mc = open3PaneWindow();
-  abwc.window.close();
-}
-
-function teardownModule() {
-  let abwc = openAddressBook();
-  close3PaneWindow();
-  mc = open3PaneWindow();
-  abwc.window.close();
-  Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
-}
-
-
-/**
- *  Test at first that default button are sets with only icons
- */
-function test_1_header_toolbar_check_default() {
-  let curMessage = select_message_in_folder(folder1, 0, mc);
-  let hdrToolbar = mc.eid("header-view-toolbar").node;
-  let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
-  expand_and_assert_header(mc);
-  set_and_assert_toolbox_position(mc, 'top');
-
-  // only icons are shown
-  subsubtest_button_style("hdrTrashButton", "-moz-box", "none", mc);
-
-  // Display message in new window and check that the default
-  // buttons are shown there.
-  let msgc = open_selected_message_in_new_window();
-  assert_selected_and_displayed(msgc, curMessage);
-  expand_and_assert_header(msgc);
-  hdrToolbar = msgc.eid("header-view-toolbar").node;
-  // only icons are shown
-  subsubtest_button_style("hdrTrashButton", "-moz-box", "none", msgc);
-
-  close_window(msgc);
-}
-
-
-/**
- *  Test header pane toolbar position
- */
+/* ***** BEGIN LICENSE BLOCK *****
+ *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Thunderbird Mail Client.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Joachim Herb <Joachim.Herb@gmx.de>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var MODULE_NAME = 'test-compactheader-toolbar';
+
+var RELATIVE_ROOT = '../shared-modules';
+var MODULE_REQUIRES = ['folder-display-helpers', 'window-helpers',
+                       'address-book-helpers', 'mouse-event-helpers',
+                       'dom-helpers', 'compactheader-helpers'];
+
+try {
+  var elib = ChromeUtils.import('chrome://mozmill/content/modules/elementslib.jsm');
+} catch (err) {
+    try {
+      dump("xxxxxxxxxxxxxxxxxxxxxx err: " + err);
+      var elib = ChromeUtils.import('chrome://mozmill/content/modules/elementslib.js');
+    } catch(err2) {
+      dump("yyyyyyyyyyyyyyyyyyyyyyy err: " + err2);
+      var Ci = Components.interfaces;
+      var Cc = Components.classes;
+      var Cu = Components.utils;
+
+      var elib = {};
+      Cu.import('resource://mozmill/modules/elementslib.js', elib);
+    }
+}
+
+try {
+  var controller = ChromeUtils.import('chrome://mozmill/content/modules/controller.jsm');
+} catch (err) {
+    try {
+      dump("xxxxxxxxxxxxxxxxxxxxxx err: " + err);
+      var controller = ChromeUtils.import('chrome://mozmill/content/modules/controller.js');
+    } catch(err2) {
+      dump("yyyyyyyyyyyyyyyyyyyyyyy err: " + err2);
+      var Ci = Components.interfaces;
+      var Cc = Components.classes;
+      var Cu = Components.utils;
+
+      var controller = {};
+      Cu.import('resource://mozmill/modules/controller.js', controller);
+    }
+}
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+// The WindowHelper module
+var WindowHelper;
+
+var folder1, folder2;
+
+function setupModule(module) {
+  let fdh = collector.getModule('folder-display-helpers');
+  fdh.installInto(module);
+  WindowHelper = collector.getModule('window-helpers');
+  WindowHelper.installInto(module);
+  let abh = collector.getModule('address-book-helpers');
+  abh.installInto(module);
+  let meh = collector.getModule('mouse-event-helpers');
+  meh.installInto(module);
+  let chh = collector.getModule('compactheader-helpers');
+  chh.installInto(module);
+  let domh = collector.getModule('dom-helpers');
+  domh.installInto(module);
+
+  // Get rid of possibly showing up lightning import wizard
+  let wizard = Services.wm.getMostRecentWindow("Calendar:MigrationWizard");
+  if (wizard) {
+    close_window(wizard);
+    mc = open3PaneWindow();
+  }
+
+  folder1 = create_folder("MessageWindowB");
+
+  // create a message that has the interesting headers that commonly
+  // show up in the message header pane for testing
+  let msg = create_message({cc: msgGen.makeNamesAndAddresses(20), // YYY
+                            subject: "This is a really, really, really, really, really, really, really, really, long subject.",
+                            clobberHeaders: {
+                              "Newsgroups": "alt.test",
+                              "Reply-To": "J. Doe <j.doe@momo.invalid>",
+                              "Content-Base": "http://example.com/",
+                              "Bcc": "Richard Roe <richard.roe@momo.invalid>"
+                            }});
+
+  add_message_to_folder(folder1, msg);
+
+  // create a message that has boring headers to be able to switch to and
+  // back from, to force the more button to collapse again.
+  msg = create_message();
+  add_message_to_folder(folder1, msg);
+
+  folder2 = create_folder("ThreadTest");
+
+  thread1 = create_thread(3);
+  add_sets_to_folders([folder2], [thread1]);
+
+  let abwc = openAddressBook();
+  close3PaneWindow();
+  mc = open3PaneWindow();
+  abwc.window.close();
+}
+
+function teardownModule() {
+  let abwc = openAddressBook();
+  close3PaneWindow();
+  mc = open3PaneWindow();
+  abwc.window.close();
+  Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
+}
+
+
+/**
+ *  Test at first that default button are sets with only icons
+ */
+function test_1_header_toolbar_check_default() {
+  let curMessage = select_message_in_folder(folder1, 0, mc);
+
+  let msgc;
+
+  open_preferences_dialog(mc, subtest_change_twoline);
+  collapse_and_assert_header(mc);
+
+  set_and_assert_toolbox_position(mc, 'top');
+
+  // only icons are shown
+  subsubtest_button_style("hdrTrashButton", "-moz-box", "none", mc);
+
+  // Display message in new window and check that the default
+  // buttons are shown there.
+  msgc = open_selected_message_in_new_window();
+  assert_selected_and_displayed(msgc, curMessage);
+  collapse_and_assert_header(msgc);
+
+  // only icons are shown
+  subsubtest_button_style("hdrTrashButton", "-moz-box", "none", msgc);
+
+  close_window(msgc);
+
+  open_preferences_dialog(mc, subtest_change_twoline);
+  expand_and_assert_header(mc);
+  set_and_assert_toolbox_position(mc, 'top');
+
+  // icons and labels are shown
+  subsubtest_button_style("hdrTrashButton", "-moz-box", "-moz-box", mc);
+
+  // Display message in new window and check that the default
+  // buttons are shown there.
+  msgc = open_selected_message_in_new_window();
+  assert_selected_and_displayed(msgc, curMessage);
+  expand_and_assert_header(msgc);
+
+  mc.sleep(10000);
+
+  // icons and labels are shown
+  subsubtest_button_style("hdrTrashButton", "-moz-box", "-moz-box", msgc);
+
+  collapse_and_assert_header(msgc);
+  close_window(msgc);
+
+  collapse_and_assert_header(mc);
+}
+
+
+/**
+ *  Test header pane toolbar position
+ */
 function test_button_visibility() {
-  if (canMoveToolbox()) {
-    be_in_folder(folder2);
-    select_click_row(0);
-    set_and_assert_toolbox_position(mc, 'right');
-    restore_and_check_default_buttons(mc);
-    Services.prefs.setBoolPref("toolkit.customization.unsafe_drag_events", true);
-    let ctc = open_header_pane_toolbar_customization(mc);
-    let palette = ctc.e("palette-box");
-
-    let button1 = ctc.e("wrapper-CompactHeader_button-starMessages");
-    let button2 = mc.e("wrapper-hdrJunkButton");
-    dump("drag target: " + button1 + "\n");
-    dump("drop target: " + button2 + "\n");
-    drag_n_drop_element(button1, ctc.window, button2, mc.window, 0.25,
-                        0.25, palette);  // fails on OSX
-    close_header_pane_toolbar_customization(ctc);
-
-    button1 = mc.e("CompactHeader_button-starMessages");
-    assert_false(button1.hasAttribute("disabled"));
-
-    make_display_threaded();
-    toggle_thread_row(0);
-
-    assert_true(button1.hasAttribute("disabled"));
-    assert_equals(button1.getAttribute("disabled"), "true");
-
-    select_message_in_folder(folder1, 0, mc);
-    assert_false(button1.hasAttribute("disabled"));
-
-    restore_and_check_default_buttons(mc);
-    Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
-  }
-}
-
-/**
- *  Make sure that opening the header toolbar customization dialog
- *  does not break the get messages button in main toolbar
- */
+  if (canMoveToolbox()) {
+    be_in_folder(folder2);
+    select_click_row(0);
+    set_and_assert_toolbox_position(mc, 'right');
+    restore_and_check_default_buttons(mc);
+    Services.prefs.setBoolPref("toolkit.customization.unsafe_drag_events", true);
+    let ctc = open_header_pane_toolbar_customization(mc);
+    let palette = ctc.e("palette-box");
+
+    let button1 = ctc.e("wrapper-CompactHeader_button-starMessages");
+    let button2 = mc.e("wrapper-hdrJunkButton");
+    dump("drag target: " + button1 + "\n");
+    dump("drop target: " + button2 + "\n");
+    drag_n_drop_element(button1, ctc.window, button2, mc.window, 0.25,
+                        0.25, palette);  // fails on OSX
+    close_header_pane_toolbar_customization(ctc);
+
+    button1 = mc.e("CompactHeader_button-starMessages");
+    assert_false(button1.hasAttribute("disabled"));
+
+    make_display_threaded();
+    toggle_thread_row(0);
+
+    assert_true(button1.hasAttribute("disabled"));
+    assert_equals(button1.getAttribute("disabled"), "true");
+
+    select_message_in_folder(folder1, 0, mc);
+    assert_false(button1.hasAttribute("disabled"));
+
+    restore_and_check_default_buttons(mc);
+    Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
+  }
+}
+
+/**
+ *  Make sure that opening the header toolbar customization dialog
+ *  does not break the get messages button in main toolbar
+ */
 function test_get_msg_button_customize_header_toolbar(){
-  select_message_in_folder(folder1, 0, mc);
-  expand_and_assert_header(mc);
-  set_and_assert_toolbox_position(mc, 'top');
-
-  // It is necessary to press the Get Message Button to get the popup menu populated
-  mc.click(mc.aid("button-getmsg", {class: "toolbarbutton-menubutton-dropmarker"}));
-  mc.ewait("button-getAllNewMsgSeparator");
-
-  var getMailButtonPopup = mc.eid("button-getMsgPopup").node;
-  var originalServerCount = getMailButtonPopup.childElementCount;
-
-  // Open customization dialog, because it broke the Get Message Button popup menu
-  // see https://bugzilla.mozilla.org/show_bug.cgi?id=565045
-  let ctc = open_header_pane_toolbar_customization(mc);
-  close_header_pane_toolbar_customization(ctc);
-
-  // Press the Get Message Button to populate popup menu again
-  mc.click(mc.aid("button-getmsg", {class: "toolbarbutton-menubutton-dropmarker"}));
-  mc.ewait("button-getAllNewMsgSeparator");
-
-  getMailButtonPopup = mc.eid("button-getMsgPopup").node;
-  var finalServerCount = getMailButtonPopup.childElementCount;
-
-  if (originalServerCount != finalServerCount) {
-    throw new Error("number of entries in Get Message Button popup menu after " +
-                    "header toolbar customization " +
-                    finalServerCount + " <> as before: " +
-                    originalServerCount);
-  }
-}
-
-/**
- *  Test header pane toolbar customization: Check for default button sets
- */
+  select_message_in_folder(folder1, 0, mc);
+  expand_and_assert_header(mc);
+  set_and_assert_toolbox_position(mc, 'top');
+
+  // It is necessary to press the Get Message Button to get the popup menu populated
+  mc.click(mc.aid("button-getmsg", {class: "toolbarbutton-menubutton-dropmarker"}));
+  mc.ewait("button-getAllNewMsgSeparator");
+
+  var getMailButtonPopup = mc.eid("button-getMsgPopup").node;
+  var originalServerCount = getMailButtonPopup.childElementCount;
+
+  // Open customization dialog, because it broke the Get Message Button popup menu
+  // see https://bugzilla.mozilla.org/show_bug.cgi?id=565045
+  let ctc = open_header_pane_toolbar_customization(mc);
+  close_header_pane_toolbar_customization(ctc);
+
+  // Press the Get Message Button to populate popup menu again
+  mc.click(mc.aid("button-getmsg", {class: "toolbarbutton-menubutton-dropmarker"}));
+  mc.ewait("button-getAllNewMsgSeparator");
+
+  getMailButtonPopup = mc.eid("button-getMsgPopup").node;
+  var finalServerCount = getMailButtonPopup.childElementCount;
+
+  if (originalServerCount != finalServerCount) {
+    throw new Error("number of entries in Get Message Button popup menu after " +
+                    "header toolbar customization " +
+                    finalServerCount + " <> as before: " +
+                    originalServerCount);
+  }
+}
+
+/**
+ *  Test header pane toolbar customization: Check for default button sets
+ */
 function test_customize_header_toolbar_check_default()
-{
-  let curMessage = select_message_in_folder(folder1, 0, mc);
-  let hdrToolbar = mc.eid("header-view-toolbar").node;
-  let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
-  expand_and_assert_header(mc);
-  set_and_assert_toolbox_position(mc, 'top');
-  assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
-  // In a fresh profile the currentset attribute does not
-  // exist, i.e. it returns empty. So check for both valid
-  // posiblities.
-  assert_true((hdrToolbar.getAttribute("currentset") == "") ||
-    (hdrToolbar.getAttribute("currentset") == hdrBarDefaultSet),
-    "Header Toolbar currentset should be empty or contain default buttons "+
-    "but contains: " + hdrToolbar.getAttribute("currentset"));
-  // Now make sure, that also the attribute gets set:
-  restore_and_check_default_buttons(mc);
-
-  // Display message in new window and check that the default
-  // buttons are shown there.
-  let msgc = open_selected_message_in_new_window();
-  assert_selected_and_displayed(msgc, curMessage);
-  expand_and_assert_header(msgc);
-  hdrToolbar = msgc.eid("header-view-toolbar").node;
-  hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
-  dump("hdrBarDefaultSet: " + hdrBarDefaultSet + "\n");
-  dump("hdrToolbar.currentSet: " + hdrToolbar.currentSet + "\n");
-  assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
-  // In a fresh profile the currentset attribute does not
-  // exist, i.e. it returns empty. So check for both valid
-  // posiblities.
-  assert_true((hdrToolbar.getAttribute("currentset") == "") ||
-    (hdrToolbar.getAttribute("currentset") == hdrBarDefaultSet),
-    "Header Toolbar currentset should be empty or contain default buttons "+
-    "but contains: " + hdrToolbar.getAttribute("currentset"));
-  // Now make sure, that also the attribute gets set:
-  restore_and_check_default_buttons(msgc);
-
-  close_window(msgc);
-}
-
-/**
-*  Test that other action button has icon
-*/
+{
+  let curMessage = select_message_in_folder(folder1, 0, mc);
+  let hdrToolbar = mc.eid("header-view-toolbar").node;
+  let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
+  expand_and_assert_header(mc);
+  set_and_assert_toolbox_position(mc, 'top');
+  assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
+  // In a fresh profile the currentset attribute does not
+  // exist, i.e. it returns empty. So check for both valid
+  // posiblities.
+  assert_true((hdrToolbar.getAttribute("currentset") == "") ||
+    (hdrToolbar.getAttribute("currentset") == hdrBarDefaultSet),
+    "Header Toolbar currentset should be empty or contain default buttons "+
+    "but contains: " + hdrToolbar.getAttribute("currentset"));
+  // Now make sure, that also the attribute gets set:
+  restore_and_check_default_buttons(mc);
+
+  // Display message in new window and check that the default
+  // buttons are shown there.
+  let msgc = open_selected_message_in_new_window();
+  assert_selected_and_displayed(msgc, curMessage);
+  expand_and_assert_header(msgc);
+  hdrToolbar = msgc.eid("header-view-toolbar").node;
+  hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
+  dump("hdrBarDefaultSet: " + hdrBarDefaultSet + "\n");
+  dump("hdrToolbar.currentSet: " + hdrToolbar.currentSet + "\n");
+  assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
+  // In a fresh profile the currentset attribute does not
+  // exist, i.e. it returns empty. So check for both valid
+  // posiblities.
+  assert_true((hdrToolbar.getAttribute("currentset") == "") ||
+    (hdrToolbar.getAttribute("currentset") == hdrBarDefaultSet),
+    "Header Toolbar currentset should be empty or contain default buttons "+
+    "but contains: " + hdrToolbar.getAttribute("currentset"));
+  // Now make sure, that also the attribute gets set:
+  restore_and_check_default_buttons(msgc);
+
+  close_window(msgc);
+}
+
+/**
+*  Test that other action button has icon
+*/
 function test_other_actions_icon()
-{
-  let curMessage = select_message_in_folder(folder1, 0, mc);
-
-  // Restore the default buttons to get defined starting conditions.
-  expand_and_assert_header(mc);
-  set_and_assert_toolbox_position(mc, 'top');
-  restore_and_check_default_buttons(mc);
-
-  let otherActionIcon = mc.a('otherActionsButton', {class: "toolbarbutton-icon"});
-
-  let imageSrc = 'url("chrome://compactheader-os/skin/other-action-small.png")';
-  assert_equals(mc.window.getComputedStyle(otherActionIcon).getPropertyValue("list-style-image"), imageSrc);
-
-}
-
-/**
- *  Test header pane toolbar customization: Reorder buttons
- */
+{
+  let curMessage = select_message_in_folder(folder1, 0, mc);
+
+  // Restore the default buttons to get defined starting conditions.
+  expand_and_assert_header(mc);
+  set_and_assert_toolbox_position(mc, 'top');
+  restore_and_check_default_buttons(mc);
+
+  let otherActionIcon = mc.a('otherActionsButton', {class: "toolbarbutton-icon"});
+
+  let imageSrc = 'url("chrome://compactheader-os/skin/other-action-small.png")';
+  assert_equals(mc.window.getComputedStyle(otherActionIcon).getPropertyValue("list-style-image"), imageSrc);
+
+}
+
+/**
+ *  Test header pane toolbar customization: Reorder buttons
+ */
 function test_customize_header_toolbar_reorder_buttons()
-{
-  Services.prefs.setBoolPref("toolkit.customization.unsafe_drag_events", true);
-  let curMessage = select_message_in_folder(folder1, 0, mc);
-
-  // Restore the default buttons to get defined starting conditions.
-  expand_and_assert_header(mc);
-  set_and_assert_toolbox_position(mc, 'top');
-  restore_and_check_default_buttons(mc);
-
-  // Save the currentSet of the toolbar before opening the
-  // customization dialog, to get out of the way of the
-  // wrapper- prefix.
-  let toolbar = mc.eid("header-view-toolbar").node;
-  let oldSet = filterInvisibleButtons(mc, toolbar.currentSet).split(",");
-
-  let ctc = open_header_pane_toolbar_customization(mc);
-  let currentSet = filterInvisibleButtons(mc, toolbar.currentSet).split(",");
-
-  for (let i=1; i<currentSet.length; i++) {
-    let button1 = mc.e(currentSet[i]);
-    let button2 = mc.e(currentSet[i-1]);
-    // Move each button to the left of its left neighbour starting with
-    // the second button, i.e. reverse the order of the buttons.
-    drag_n_drop_element(button1, mc.window, button2, mc.window, 0.25, 0.0, toolbar);  // fails on OSX
-  }
-  close_header_pane_toolbar_customization(ctc);
-
-  // Check, if the toolbar is really in reverse order of beginning.
-  let reverseSet = oldSet.reverse().join(",");
-  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet), reverseSet);
-  assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
-      reverseSet);
-
-  // Display message in new window and check that the default
-  // buttons are shown there.
-  let msgc = open_selected_message_in_new_window();
-  assert_selected_and_displayed(msgc, curMessage);
-  expand_and_assert_header(msgc);
-  set_and_assert_toolbox_position(msgc, 'top');
-  let hdrToolbar = msgc.eid("header-view-toolbar").node;
-  let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
-  assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
-  assert_equals(hdrToolbar.getAttribute("currentset"), hdrBarDefaultSet);
-  close_window(msgc);
-
-  // Leave the toolbar in the default state.
-  restore_and_check_default_buttons(mc);
-  Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
-}
-//
-///**
-// *  Test header pane toolbar customization: Change buttons in
-// *  separate mail window
-// */
+{
+  Services.prefs.setBoolPref("toolkit.customization.unsafe_drag_events", true);
+  let curMessage = select_message_in_folder(folder1, 0, mc);
+
+  // Restore the default buttons to get defined starting conditions.
+  expand_and_assert_header(mc);
+  set_and_assert_toolbox_position(mc, 'top');
+  restore_and_check_default_buttons(mc);
+
+  // Save the currentSet of the toolbar before opening the
+  // customization dialog, to get out of the way of the
+  // wrapper- prefix.
+  let toolbar = mc.eid("header-view-toolbar").node;
+  let oldSet = filterInvisibleButtons(mc, toolbar.currentSet).split(",");
+
+  let ctc = open_header_pane_toolbar_customization(mc);
+  let currentSet = filterInvisibleButtons(mc, toolbar.currentSet).split(",");
+
+  for (let i=1; i<currentSet.length; i++) {
+    let button1 = mc.e(currentSet[i]);
+    let button2 = mc.e(currentSet[i-1]);
+    // Move each button to the left of its left neighbour starting with
+    // the second button, i.e. reverse the order of the buttons.
+    drag_n_drop_element(button1, mc.window, button2, mc.window, 0.25, 0.0, toolbar);  // fails on OSX
+  }
+  close_header_pane_toolbar_customization(ctc);
+
+  // Check, if the toolbar is really in reverse order of beginning.
+  let reverseSet = oldSet.reverse().join(",");
+  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet), reverseSet);
+  assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
+      reverseSet);
+
+  // Display message in new window and check that the default
+  // buttons are shown there.
+  let msgc = open_selected_message_in_new_window();
+  assert_selected_and_displayed(msgc, curMessage);
+  expand_and_assert_header(msgc);
+  set_and_assert_toolbox_position(msgc, 'top');
+  let hdrToolbar = msgc.eid("header-view-toolbar").node;
+  let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
+  assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
+  assert_equals(hdrToolbar.getAttribute("currentset"), hdrBarDefaultSet);
+  close_window(msgc);
+
+  // Leave the toolbar in the default state.
+  restore_and_check_default_buttons(mc);
+  Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
+}
+//
+///**
+// *  Test header pane toolbar customization: Change buttons in
+// *  separate mail window
+// */
 function test_customize_header_toolbar_separate_window()
-{
-  Services.prefs.setBoolPref("toolkit.customization.unsafe_drag_events", true);
-  let curMessage = select_message_in_folder(folder1, 0, mc);
-  expand_and_assert_header(mc);
-  set_and_assert_toolbox_position(mc, 'top');
-
-  // Restore the default buttons to get defined starting conditions.
-  restore_and_check_default_buttons(mc);
-
-  // Display message in new window and check that the default
-  // buttons are shown there.
-  let msgc = open_selected_message_in_new_window();
-  assert_selected_and_displayed(msgc, curMessage);
-  expand_and_assert_header(msgc);
-  set_and_assert_toolbox_position(msgc, 'top');
-  let hdrToolbar = msgc.eid("header-view-toolbar").node;
-  let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
-  assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
-  assert_equals(hdrToolbar.getAttribute("currentset"), hdrBarDefaultSet);
-
-  // Save the currentSet of the toolbar before opening the
-  // customization dialog, to get out of the way of the
-  // wrapper- prefix.
-  let toolbar = msgc.eid("header-view-toolbar").node;
-  let oldSet = filterInvisibleButtons(msgc, toolbar.currentSet).split(",");
-
-  let ctc = open_header_pane_toolbar_customization(msgc);
-  let currentSet = filterInvisibleButtons(msgc, toolbar.currentSet).split(",");
-  for (let i=1; i<currentSet.length; i++) {
-    let button1 = msgc.e(currentSet[i]);
-    let button2 = msgc.e(currentSet[i-1]);
-    dump("drag_n_drop button: " + i + "\n");
-    // Move each button to the left of its left neighbour starting with
-    // the second button, i.e. reverse the order of the buttons.
-    drag_n_drop_element(button1, msgc.window, button2, msgc.window, 0.25, 0.0, toolbar);
-  }
-  close_header_pane_toolbar_customization(ctc);
-
-  // Check, if the toolbar is really in reverse order of beginning.
-  let reverseSet = oldSet.reverse().join(",");
-  assert_equals(filterInvisibleButtons(msgc, toolbar.currentSet), reverseSet);
-  assert_equals(filterInvisibleButtons(msgc, toolbar.getAttribute("currentset")),
-      reverseSet);
-
-  dump("reversing finished\n");
-
-  // Make sure we have a different window open, so that we don't start shutting
-  // down just because the last window was closed
-  let abwc = openAddressBook();
-  // The 3pane window is closed and opened again.
-  close3PaneWindow();
-  close_window(msgc);
-
-  mc = open3PaneWindow();
-  abwc.window.close();
-  select_message_in_folder(folder1, 0, mc);
-
-  // Check, if the buttons in the mail3pane window are the correct ones.
-  hdrToolbar = mc.eid("header-view-toolbar").node;
-  hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
-  assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
-  assert_equals(hdrToolbar.getAttribute("currentset"), hdrBarDefaultSet);
-
-  // Open separate mail window again and check another time.
-  msgc = open_selected_message_in_new_window();
-  assert_selected_and_displayed(msgc, curMessage);
-  toolbar = msgc.eid("header-view-toolbar").node;
-
-  assert_equals(filterInvisibleButtons(msgc, toolbar.currentSet), reverseSet);
-  assert_equals(filterInvisibleButtons(msgc, toolbar.getAttribute("currentset")),
-      reverseSet);
-
-  // Leave the toolbar in the default state.
-  restore_and_check_default_buttons(msgc);
-  Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
-  close_window(msgc);
-}
-
-/**
- *  Test header pane toolbar customization: Remove buttons
- */
+{
+  Services.prefs.setBoolPref("toolkit.customization.unsafe_drag_events", true);
+  let curMessage = select_message_in_folder(folder1, 0, mc);
+  expand_and_assert_header(mc);
+  set_and_assert_toolbox_position(mc, 'top');
+
+  // Restore the default buttons to get defined starting conditions.
+  restore_and_check_default_buttons(mc);
+
+  // Display message in new window and check that the default
+  // buttons are shown there.
+  let msgc = open_selected_message_in_new_window();
+  assert_selected_and_displayed(msgc, curMessage);
+  expand_and_assert_header(msgc);
+  set_and_assert_toolbox_position(msgc, 'top');
+  let hdrToolbar = msgc.eid("header-view-toolbar").node;
+  let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
+  assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
+  assert_equals(hdrToolbar.getAttribute("currentset"), hdrBarDefaultSet);
+
+  // Save the currentSet of the toolbar before opening the
+  // customization dialog, to get out of the way of the
+  // wrapper- prefix.
+  let toolbar = msgc.eid("header-view-toolbar").node;
+  let oldSet = filterInvisibleButtons(msgc, toolbar.currentSet).split(",");
+
+  let ctc = open_header_pane_toolbar_customization(msgc);
+  let currentSet = filterInvisibleButtons(msgc, toolbar.currentSet).split(",");
+  for (let i=1; i<currentSet.length; i++) {
+    let button1 = msgc.e(currentSet[i]);
+    let button2 = msgc.e(currentSet[i-1]);
+    dump("drag_n_drop button: " + i + "\n");
+    // Move each button to the left of its left neighbour starting with
+    // the second button, i.e. reverse the order of the buttons.
+    drag_n_drop_element(button1, msgc.window, button2, msgc.window, 0.25, 0.0, toolbar);
+  }
+  close_header_pane_toolbar_customization(ctc);
+
+  // Check, if the toolbar is really in reverse order of beginning.
+  let reverseSet = oldSet.reverse().join(",");
+  assert_equals(filterInvisibleButtons(msgc, toolbar.currentSet), reverseSet);
+  assert_equals(filterInvisibleButtons(msgc, toolbar.getAttribute("currentset")),
+      reverseSet);
+
+  dump("reversing finished\n");
+
+  // Make sure we have a different window open, so that we don't start shutting
+  // down just because the last window was closed
+  let abwc = openAddressBook();
+  // The 3pane window is closed and opened again.
+  close3PaneWindow();
+  close_window(msgc);
+
+  mc = open3PaneWindow();
+  abwc.window.close();
+  select_message_in_folder(folder1, 0, mc);
+
+  // Check, if the buttons in the mail3pane window are the correct ones.
+  hdrToolbar = mc.eid("header-view-toolbar").node;
+  hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
+  assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
+  assert_equals(hdrToolbar.getAttribute("currentset"), hdrBarDefaultSet);
+
+  // Open separate mail window again and check another time.
+  msgc = open_selected_message_in_new_window();
+  assert_selected_and_displayed(msgc, curMessage);
+  toolbar = msgc.eid("header-view-toolbar").node;
+
+  assert_equals(filterInvisibleButtons(msgc, toolbar.currentSet), reverseSet);
+  assert_equals(filterInvisibleButtons(msgc, toolbar.getAttribute("currentset")),
+      reverseSet);
+
+  // Leave the toolbar in the default state.
+  restore_and_check_default_buttons(msgc);
+  Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
+  close_window(msgc);
+}
+
+/**
+ *  Test header pane toolbar customization: Remove buttons
+ */
 function test_customize_header_toolbar_remove_buttons(){
-  // Save currentset of toolbar for adding the buttons back
-  // at the end.
-  var lCurrentset;
-  Services.prefs.setBoolPref("toolkit.customization.unsafe_drag_events", true);
-
-  select_message_in_folder(folder1, 0, mc);
-  expand_and_assert_header(mc);
-  set_and_assert_toolbox_position(mc, 'top');
-
-  // Restore the default buttons to get defined starting conditions.
-  restore_and_check_default_buttons(mc);
-
-  let ctc = open_header_pane_toolbar_customization(mc);
-  let toolbar = mc.eid("header-view-toolbar").node;
-  lCurrentset = filterInvisibleButtons(mc, toolbar.currentSet).split(",");
-  let target = ctc.e("palette-box");
-  for (let i=0; i<lCurrentset.length; i++) {
-    let button = mc.e(lCurrentset[i]);
-    drag_n_drop_element(button, mc.window, target, ctc.window, 0.5, 0.5, toolbar);  // fails on OSX
-  }
-  close_header_pane_toolbar_customization(ctc);
-
-  // Check, if the toolbar is really empty.
-  toolbar = mc.eid("header-view-toolbar").node;
-  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet), "__empty");
-  assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
-      "__empty");
-
-  // Move to the next message and check again.
-  let curMessage = select_message_in_folder(folder1, 1, mc);
-  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet), "__empty");
-  assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
-      "__empty");
-
-  // Display message in new window and check that the default
-  // buttons are shown there.
-  let msgc = open_selected_message_in_new_window();
-  assert_selected_and_displayed(msgc, curMessage);
-  expand_and_assert_header(msgc);
-
-  let hdrToolbar = msgc.eid("header-view-toolbar").node;
-  let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
-  assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
-  assert_equals(hdrToolbar.getAttribute("currentset"), hdrBarDefaultSet);
-  close_window(msgc);
-
-  // Check the persistency of the buttons.
-
-  // Make sure we have a different window open, so that we don't start shutting
-  // down just because the last window was closed
-  let abwc = openAddressBook();
-  // The 3pane window is closed.
-  close3PaneWindow();
-  mc = open3PaneWindow();
-  abwc.window.close();
-  select_message_in_folder(folder1, 0, mc);
-
-  toolbar = mc.eid("header-view-toolbar").node;
-  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet), "__empty");
-  assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
-      "__empty");
-
-  // Check that all removed buttons show up in the palette
-  // and move it back in the toolbar.
-  ctc = open_header_pane_toolbar_customization(mc);
-  toolbar = mc.eid("header-view-toolbar").node;
-  palette = ctc.e("palette-box");
-  for (let i=0; i<lCurrentset.length; i++) {
-    let button = ctc.e(lCurrentset[i]);
-    assert_true(button!=null, "Button " + lCurrentset[i] + " not in palette");
-    // Drop each button to the right end of the toolbar, so we should get the
-    // original order.
-    drag_n_drop_element(button, ctc.window, toolbar, mc.window, 0.99, 0.5, palette);  // fails on OSX
-  }
-  close_header_pane_toolbar_customization(ctc);
-
-  toolbar = mc.eid("header-view-toolbar").node;
-  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet),
-      filterInvisibleButtons(mc, hdrBarDefaultSet));
-  assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
-      filterInvisibleButtons(mc, hdrBarDefaultSet));
-  Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
-}
-
-/**
- *  Test header pane toolbar customization: Add all buttons to toolbar
- */
+  // Save currentset of toolbar for adding the buttons back
+  // at the end.
+  var lCurrentset;
+  Services.prefs.setBoolPref("toolkit.customization.unsafe_drag_events", true);
+
+  select_message_in_folder(folder1, 0, mc);
+  expand_and_assert_header(mc);
+  set_and_assert_toolbox_position(mc, 'top');
+
+  // Restore the default buttons to get defined starting conditions.
+  restore_and_check_default_buttons(mc);
+
+  let ctc = open_header_pane_toolbar_customization(mc);
+  let toolbar = mc.eid("header-view-toolbar").node;
+  lCurrentset = filterInvisibleButtons(mc, toolbar.currentSet).split(",");
+  let target = ctc.e("palette-box");
+  for (let i=0; i<lCurrentset.length; i++) {
+    let button = mc.e(lCurrentset[i]);
+    drag_n_drop_element(button, mc.window, target, ctc.window, 0.5, 0.5, toolbar);  // fails on OSX
+  }
+  close_header_pane_toolbar_customization(ctc);
+
+  // Check, if the toolbar is really empty.
+  toolbar = mc.eid("header-view-toolbar").node;
+  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet), "__empty");
+  assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
+      "__empty");
+
+  // Move to the next message and check again.
+  let curMessage = select_message_in_folder(folder1, 1, mc);
+  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet), "__empty");
+  assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
+      "__empty");
+
+  // Display message in new window and check that the default
+  // buttons are shown there.
+  let msgc = open_selected_message_in_new_window();
+  assert_selected_and_displayed(msgc, curMessage);
+  expand_and_assert_header(msgc);
+
+  let hdrToolbar = msgc.eid("header-view-toolbar").node;
+  let hdrBarDefaultSet = hdrToolbar.getAttribute("defaultset");
+  assert_equals(hdrToolbar.currentSet, hdrBarDefaultSet);
+  assert_equals(hdrToolbar.getAttribute("currentset"), hdrBarDefaultSet);
+  close_window(msgc);
+
+  // Check the persistency of the buttons.
+
+  // Make sure we have a different window open, so that we don't start shutting
+  // down just because the last window was closed
+  let abwc = openAddressBook();
+  // The 3pane window is closed.
+  close3PaneWindow();
+  mc = open3PaneWindow();
+  abwc.window.close();
+  select_message_in_folder(folder1, 0, mc);
+
+  toolbar = mc.eid("header-view-toolbar").node;
+  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet), "__empty");
+  assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
+      "__empty");
+
+  // Check that all removed buttons show up in the palette
+  // and move it back in the toolbar.
+  ctc = open_header_pane_toolbar_customization(mc);
+  toolbar = mc.eid("header-view-toolbar").node;
+  palette = ctc.e("palette-box");
+  for (let i=0; i<lCurrentset.length; i++) {
+    let button = ctc.e(lCurrentset[i]);
+    assert_true(button!=null, "Button " + lCurrentset[i] + " not in palette");
+    // Drop each button to the right end of the toolbar, so we should get the
+    // original order.
+    drag_n_drop_element(button, ctc.window, toolbar, mc.window, 0.99, 0.5, palette);  // fails on OSX
+  }
+  close_header_pane_toolbar_customization(ctc);
+
+  toolbar = mc.eid("header-view-toolbar").node;
+  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet),
+      filterInvisibleButtons(mc, hdrBarDefaultSet));
+  assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
+      filterInvisibleButtons(mc, hdrBarDefaultSet));
+  Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
+}
+
+/**
+ *  Test header pane toolbar customization: Add all buttons to toolbar
+ */
 function test_customize_header_toolbar_add_all_buttons(){
-
-  Services.prefs.setBoolPref("toolkit.customization.unsafe_drag_events", true);
-  select_message_in_folder(folder1, 0, mc);
-  expand_and_assert_header(mc);
-  set_and_assert_toolbox_position(mc, 'top');
-
-  // Restore the default buttons to get defined starting conditions.
-  restore_and_check_default_buttons(mc);
-
-  let toolbar = mc.eid("header-view-toolbar").node;
-  let lCurrentset = filterInvisibleButtons(mc, toolbar.currentSet).split(",");
-
-  // Get all buttons in the palette and move them to toolbar
-  let ctc = open_header_pane_toolbar_customization(mc);
-  let palette = ctc.e("palette-box");
-  let tmp = ctc.window.document.getElementById("palette-box").
-    getElementsByTagName("toolbarpaletteitem");
-
-  let wrappedButtons = new Array;
-  let buttons = new Array;
-  for (let i=0; i<tmp.length; i++) {
-    let type = tmp[i].getAttribute("type");
-    if ((type != "separator") &&
-        (type != "spring") &&
-        (type != "spacer")
-        ) {
-      wrappedButtons.push(tmp[i].id)
-      buttons.push(tmp[i].id.replace(new RegExp("wrapper-"), ""));
-    }
-  }
-
-  for (let i=0; i<wrappedButtons.length; i++) {
-    let button = ctc.e(wrappedButtons[i]);
-    // Drop each button to the right end of the toolbar.
-    drag_n_drop_element(button, ctc.window, toolbar, mc.window, 0.99, 0.5, palette);
-  }
-  close_header_pane_toolbar_customization(ctc);
-
-
-  // All buttons have shown up in the toolbar
-  let fullButtonSet = lCurrentset.concat(buttons).join(",");
-  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet),
-      fullButtonSet);
-
-  // No buttons are left in the palette
-  // Get all buttons in the palette and move them to toolbar
-  ctc = open_header_pane_toolbar_customization(mc);
-  palette = ctc.e("palette-box");
-  tmp = ctc.window.document.getElementById("palette-box").
-    getElementsByTagName("toolbarpaletteitem");
-
-  let leftButtons = new Array;
-  for (let i=0; i<tmp.length; i++) {
-    let type = tmp[i].getAttribute("type");
-    if ((type != "separator") &&
-        (type != "spring") &&
-        (type != "spacer")
-        ) {
-      leftButtons.push(tmp[i].id)
-    }
-  }
-  assert_equals(leftButtons.length, 0);
-  close_header_pane_toolbar_customization(ctc);
-
-  // Move the buttons back to palette
-  ctc = open_header_pane_toolbar_customization(mc);
-  let target = ctc.e("palette-box");
-  for (let i=wrappedButtons.length-1; i>= 0; i--) {
-    dump("drag_n_drop button: " + i + "\n");
-    dump("drag_n_drop button: " + wrappedButtons[i] + "\n");
-    let button = mc.e(wrappedButtons[i]);
-    dump("drag target: " + button + "\n");
-    dump("drop target: " + target + "\n");
-    drag_n_drop_element(button, mc.window, target, ctc.window, 0.5, 0.5, toolbar);  // fails on OSX
-  }
-  close_header_pane_toolbar_customization(ctc);
-
-  // Only defaults button are left in the toolbar
-  let hdrBarDefaultSet = toolbar.getAttribute("defaultset");
-  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet),
-      filterInvisibleButtons(mc, hdrBarDefaultSet));
-  assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
-      filterInvisibleButtons(mc, hdrBarDefaultSet));
-
-  // All buttons have shown up in the palette
-  ctc = open_header_pane_toolbar_customization(mc);
-  backButtons = new Array;
-  tmp = ctc.window.document.getElementById("palette-box").
-    getElementsByTagName("toolbarpaletteitem");
-  for (let i=tmp.length-1; i>=0; i--) {
-    let type = tmp[i].getAttribute("type");
-    if ((type != "separator") &&
-        (type != "spring") &&
-        (type != "spacer")
-        ) {
-      backButtons.push(tmp[i].id)
-    }
-  }
-  assert_equals(backButtons.join(","), wrappedButtons.join(","));
-  close_header_pane_toolbar_customization(ctc);
-
-  // Reopen customization dialog and
-  // all buttons are still in the palette
-  select_message_in_folder(folder1, 1, mc);
-  ctc = open_header_pane_toolbar_customization(mc);
-
-  backButtons = new Array;
-  tmp = ctc.window.document.getElementById("palette-box").
-    getElementsByTagName("toolbarpaletteitem");
-  for (let i=tmp.length-1; i>=0; i--) {
-    let type = tmp[i].getAttribute("type");
-    if ((type != "separator") &&
-        (type != "spring") &&
-        (type != "spacer")
-        ) {
-      backButtons.push(tmp[i].id)
-    }
-  }
-  assert_equals(backButtons.join(","), wrappedButtons.join(","));
-
-  close_header_pane_toolbar_customization(ctc);
-  Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
-
-}
-
-
-/**
- *  Test header pane toolbar customization dialog layout
- */
+
+  Services.prefs.setBoolPref("toolkit.customization.unsafe_drag_events", true);
+  select_message_in_folder(folder1, 0, mc);
+  expand_and_assert_header(mc);
+  set_and_assert_toolbox_position(mc, 'top');
+
+  // Restore the default buttons to get defined starting conditions.
+  restore_and_check_default_buttons(mc);
+
+  let toolbar = mc.eid("header-view-toolbar").node;
+  let lCurrentset = filterInvisibleButtons(mc, toolbar.currentSet).split(",");
+
+  // Get all buttons in the palette and move them to toolbar
+  let ctc = open_header_pane_toolbar_customization(mc);
+  let palette = ctc.e("palette-box");
+  let tmp = ctc.window.document.getElementById("palette-box").
+    getElementsByTagName("toolbarpaletteitem");
+
+  let wrappedButtons = new Array;
+  let buttons = new Array;
+  for (let i=0; i<tmp.length; i++) {
+    let type = tmp[i].getAttribute("type");
+    if ((type != "separator") &&
+        (type != "spring") &&
+        (type != "spacer")
+        ) {
+      wrappedButtons.push(tmp[i].id)
+      buttons.push(tmp[i].id.replace(new RegExp("wrapper-"), ""));
+    }
+  }
+
+  for (let i=0; i<wrappedButtons.length; i++) {
+    let button = ctc.e(wrappedButtons[i]);
+    // Drop each button to the right end of the toolbar.
+    drag_n_drop_element(button, ctc.window, toolbar, mc.window, 0.99, 0.5, palette);
+  }
+  close_header_pane_toolbar_customization(ctc);
+
+
+  // All buttons have shown up in the toolbar
+  let fullButtonSet = lCurrentset.concat(buttons).join(",");
+  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet),
+      fullButtonSet);
+
+  // No buttons are left in the palette
+  // Get all buttons in the palette and move them to toolbar
+  ctc = open_header_pane_toolbar_customization(mc);
+  palette = ctc.e("palette-box");
+  tmp = ctc.window.document.getElementById("palette-box").
+    getElementsByTagName("toolbarpaletteitem");
+
+  let leftButtons = new Array;
+  for (let i=0; i<tmp.length; i++) {
+    let type = tmp[i].getAttribute("type");
+    if ((type != "separator") &&
+        (type != "spring") &&
+        (type != "spacer")
+        ) {
+      leftButtons.push(tmp[i].id)
+    }
+  }
+  assert_equals(leftButtons.length, 0);
+  close_header_pane_toolbar_customization(ctc);
+
+  // Move the buttons back to palette
+  ctc = open_header_pane_toolbar_customization(mc);
+  let target = ctc.e("palette-box");
+  for (let i=wrappedButtons.length-1; i>= 0; i--) {
+    dump("drag_n_drop button: " + i + "\n");
+    dump("drag_n_drop button: " + wrappedButtons[i] + "\n");
+    let button = mc.e(wrappedButtons[i]);
+    dump("drag target: " + button + "\n");
+    dump("drop target: " + target + "\n");
+    drag_n_drop_element(button, mc.window, target, ctc.window, 0.5, 0.5, toolbar);  // fails on OSX
+  }
+  close_header_pane_toolbar_customization(ctc);
+
+  // Only defaults button are left in the toolbar
+  let hdrBarDefaultSet = toolbar.getAttribute("defaultset");
+  assert_equals(filterInvisibleButtons(mc, toolbar.currentSet),
+      filterInvisibleButtons(mc, hdrBarDefaultSet));
+  assert_equals(filterInvisibleButtons(mc, toolbar.getAttribute("currentset")),
+      filterInvisibleButtons(mc, hdrBarDefaultSet));
+
+  // All buttons have shown up in the palette
+  ctc = open_header_pane_toolbar_customization(mc);
+  backButtons = new Array;
+  tmp = ctc.window.document.getElementById("palette-box").
+    getElementsByTagName("toolbarpaletteitem");
+  for (let i=tmp.length-1; i>=0; i--) {
+    let type = tmp[i].getAttribute("type");
+    if ((type != "separator") &&
+        (type != "spring") &&
+        (type != "spacer")
+        ) {
+      backButtons.push(tmp[i].id)
+    }
+  }
+  assert_equals(backButtons.join(","), wrappedButtons.join(","));
+  close_header_pane_toolbar_customization(ctc);
+
+  // Reopen customization dialog and
+  // all buttons are still in the palette
+  select_message_in_folder(folder1, 1, mc);
+  ctc = open_header_pane_toolbar_customization(mc);
+
+  backButtons = new Array;
+  tmp = ctc.window.document.getElementById("palette-box").
+    getElementsByTagName("toolbarpaletteitem");
+  for (let i=tmp.length-1; i>=0; i--) {
+    let type = tmp[i].getAttribute("type");
+    if ((type != "separator") &&
+        (type != "spring") &&
+        (type != "spacer")
+        ) {
+      backButtons.push(tmp[i].id)
+    }
+  }
+  assert_equals(backButtons.join(","), wrappedButtons.join(","));
+
+  close_header_pane_toolbar_customization(ctc);
+  Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
+
+}
+
+
+/**
+ *  Test header pane toolbar customization dialog layout
+ */
 function test_customize_header_toolbar_dialog_style(){
-  select_message_in_folder(folder1, 0, mc);
-  expand_and_assert_header(mc);
-  set_and_assert_toolbox_position(mc, 'top');
-
-  // Restore the default buttons to get defined starting conditions.
-  restore_and_check_default_buttons(mc);
-
-  let ctc = open_header_pane_toolbar_customization(mc);
-
-  // The full mode menulist entry is hidden, because in the header toolbar
-  // this mode is disabled.
-  let fullMode = ctc.window.document.getElementById("main-box").
-    querySelector("[value='full']");
-  assert_equals(ctc.window.getComputedStyle(fullMode).getPropertyValue("display"), "none");
-  // The icon menulist entry is selected, because in the header toolbar with CompactHeader installed
-  // this is the default mode.
-  let iconMode = ctc.window.document.getElementById("modelist").
-    querySelector("[value='icons']");
-  assert_equals(iconMode.getAttribute("selected"), "true");
-
-  // The small icons checkbox is hidden, because in the header toolbar
-  // this mode is the only possible (therefore, the checked attribute is true).
-  let smallIcons = ctc.eid("smallicons").node;
-  assert_equals(smallIcons.getAttribute("checked"), "true");
-  assert_equals(ctc.window.getComputedStyle(smallIcons).getPropertyValue("display"), "none");
-
-  // The add new toolbar button is hidden, because in the header toolbar
-  // this functionality is not available.
-  let addNewToolbar = ctc.window.document.getElementById("main-box").
-    querySelector("[oncommand='addNewToolbar();']");
-  assert_equals(ctc.window.getComputedStyle(addNewToolbar).getPropertyValue("display"), "none");
-
-  close_header_pane_toolbar_customization(ctc);
-}
-
-/**
- *  Test header pane toolbar customization dialog for button style changes
- */
+  select_message_in_folder(folder1, 0, mc);
+  expand_and_assert_header(mc);
+  set_and_assert_toolbox_position(mc, 'top');
+
+  // Restore the default buttons to get defined starting conditions.
+  restore_and_check_default_buttons(mc);
+
+  let ctc = open_header_pane_toolbar_customization(mc);
+
+  // The full mode menulist entry is hidden, because in the header toolbar
+  // this mode is disabled.
+  let fullMode = ctc.window.document.getElementById("main-box").
+    querySelector("[value='full']");
+  assert_equals(ctc.window.getComputedStyle(fullMode).getPropertyValue("display"), "none");
+  // The icon menulist entry is selected, because in the header toolbar with CompactHeader installed
+  // this is the default mode.
+  let iconMode = ctc.window.document.getElementById("modelist").
+    querySelector("[value='icons']");
+  assert_equals(iconMode.getAttribute("selected"), "true");
+
+  // The small icons checkbox is hidden, because in the header toolbar
+  // this mode is the only possible (therefore, the checked attribute is true).
+  let smallIcons = ctc.eid("smallicons").node;
+  assert_equals(smallIcons.getAttribute("checked"), "true");
+  assert_equals(ctc.window.getComputedStyle(smallIcons).getPropertyValue("display"), "none");
+
+  // The add new toolbar button is hidden, because in the header toolbar
+  // this functionality is not available.
+  let addNewToolbar = ctc.window.document.getElementById("main-box").
+    querySelector("[oncommand='addNewToolbar();']");
+  assert_equals(ctc.window.getComputedStyle(addNewToolbar).getPropertyValue("display"), "none");
+
+  close_header_pane_toolbar_customization(ctc);
+}
+
+/**
+ *  Test header pane toolbar customization dialog for button style changes
+ */
 function test_customize_header_toolbar_change_button_style(){
-  Services.prefs.setBoolPref("toolkit.customization.unsafe_drag_events", true);
-  select_message_in_folder(folder1, 0, mc);
-  expand_and_assert_header(mc);
-  set_and_assert_toolbox_position(mc, 'top');
-
-  // Restore the default buttons to get defined starting conditions.
-  restore_and_check_default_buttons(mc);
-
-  // The default mode is icon visible only.
-  subtest_buttons_style("-moz-box", "none", mc);
-
-  // Change the button style to text and icon mode
-  let ctc = open_header_pane_toolbar_customization(mc);
-  let iconMode = ctc.window.document.getElementById("main-box").
-    querySelector("[value='textbesideicon']");
-  ctc.click(new elib.Elem(iconMode));
-  close_header_pane_toolbar_customization(ctc);
-
-  subtest_buttons_style("-moz-box", "-moz-box", mc);
-
-  // Change the button style to icon mode only
-  ctc = open_header_pane_toolbar_customization(mc);
-  iconMode = ctc.window.document.getElementById("main-box").
-    querySelector("[value='icons']");
-  ctc.click(new elib.Elem(iconMode));
-  close_header_pane_toolbar_customization(ctc);
-
-  subtest_buttons_style("-moz-box", "none", mc);
-
-  // Change the button style to text (only) mode
-  ctc = open_header_pane_toolbar_customization(mc);
-  let textMode = ctc.window.document.getElementById("main-box").
-    querySelector("[value='text']");
-  ctc.click(new elib.Elem(textMode));
-  close_header_pane_toolbar_customization(ctc);
-
-  subtest_buttons_style("none", "-moz-box", mc);
-
-  // The default mode is icon visible only.
-  restore_and_check_default_buttons(mc);
-  subtest_buttons_style("-moz-box", "none", mc);
-  Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
-}
-
-/**
- *  Test header pane toolbar visible after toggling
- */
+  Services.prefs.setBoolPref("toolkit.customization.unsafe_drag_events", true);
+  select_message_in_folder(folder1, 0, mc);
+  expand_and_assert_header(mc);
+  set_and_assert_toolbox_position(mc, 'top');
+
+  // Restore the default buttons to get defined starting conditions.
+  restore_and_check_default_buttons(mc);
+
+  // The default mode is icon visible only.
+  subtest_buttons_style("-moz-box", "none", mc);
+
+  // Change the button style to text and icon mode
+  let ctc = open_header_pane_toolbar_customization(mc);
+  let iconMode = ctc.window.document.getElementById("main-box").
+    querySelector("[value='textbesideicon']");
+  ctc.click(new elib.Elem(iconMode));
+  close_header_pane_toolbar_customization(ctc);
+
+  subtest_buttons_style("-moz-box", "-moz-box", mc);
+
+  // Change the button style to icon mode only
+  ctc = open_header_pane_toolbar_customization(mc);
+  iconMode = ctc.window.document.getElementById("main-box").
+    querySelector("[value='icons']");
+  ctc.click(new elib.Elem(iconMode));
+  close_header_pane_toolbar_customization(ctc);
+
+  subtest_buttons_style("-moz-box", "none", mc);
+
+  // Change the button style to text (only) mode
+  ctc = open_header_pane_toolbar_customization(mc);
+  let textMode = ctc.window.document.getElementById("main-box").
+    querySelector("[value='text']");
+  ctc.click(new elib.Elem(textMode));
+  close_header_pane_toolbar_customization(ctc);
+
+  subtest_buttons_style("none", "-moz-box", mc);
+
+  // The default mode is icon visible only.
+  restore_and_check_default_buttons(mc);
+  subtest_buttons_style("-moz-box", "none", mc);
+  Services.prefs.clearUserPref("toolkit.customization.unsafe_drag_events");
+}
+
+/**
+ *  Test header pane toolbar visible after toggling
+ */
 function test_visible_toolbar() {
-  select_message_in_folder(folder1, 1, mc);
-  expand_and_assert_header(mc);
-  set_and_assert_toolbox_position(mc, 'top');
-  let toolbar = mc.eid("header-view-toolbar").node;
-  assert_equals(isVisible(toolbar), true);
-
-  open_preferences_dialog(mc, subtest_change_twoline);
-
-  collapse_and_assert_header(mc);
-  toolbar = mc.eid("header-view-toolbar").node;
-  assert_equals(isVisible(toolbar), true);
-  expand_and_assert_header(mc);
-  toolbar = mc.eid("header-view-toolbar").node;
-  assert_equals(isVisible(toolbar), true);
-
-  set_pane_layout(kWideMailLayout);
-  assert_pane_layout(kWideMailLayout);
-  let abwc = openAddressBook();
-  // The 3pane window is closed and opened again.
-  close3PaneWindow();
-
-  mc = open3PaneWindow();
-  abwc.window.close();
-  select_message_in_folder(folder1, 1, mc);
-
-  mc.sleep(10);
-
-  collapse_and_assert_header(mc);
-  toolbar = mc.eid("header-view-toolbar").node;
-  assert_equals(isVisible(toolbar), true);
-  expand_and_assert_header(mc);
-  toolbar = mc.eid("header-view-toolbar").node;
-  assert_equals(isVisible(toolbar), true);
-
-  set_pane_layout(kClassicMailLayout);
-  assert_pane_layout(kClassicMailLayout);
-  abwc = openAddressBook();
-  // The 3pane window is closed and opened again.
-  close3PaneWindow();
-
-  mc = open3PaneWindow();
-  abwc.window.close();
-
-}
-
-/**
- *  Test header pane toolbar position
- */
+  select_message_in_folder(folder1, 1, mc);
+  expand_and_assert_header(mc);
+  set_and_assert_toolbox_position(mc, 'top');
+  let toolbar = mc.eid("header-view-toolbar").node;
+  assert_equals(isVisible(toolbar), true);
+
+  open_preferences_dialog(mc, subtest_change_twoline);
+
+  collapse_and_assert_header(mc);
+  toolbar = mc.eid("header-view-toolbar").node;
+  assert_equals(isVisible(toolbar), true);
+  expand_and_assert_header(mc);
+  toolbar = mc.eid("header-view-toolbar").node;
+  assert_equals(isVisible(toolbar), true);
+
+  set_pane_layout(kWideMailLayout);
+  assert_pane_layout(kWideMailLayout);
+  let abwc = openAddressBook();
+  // The 3pane window is closed and opened again.
+  close3PaneWindow();
+
+  mc = open3PaneWindow();
+  abwc.window.close();
+  select_message_in_folder(folder1, 1, mc);
+
+  mc.sleep(10);
+
+  collapse_and_assert_header(mc);
+  toolbar = mc.eid("header-view-toolbar").node;
+  assert_equals(isVisible(toolbar), true);
+  expand_and_assert_header(mc);
+  toolbar = mc.eid("header-view-toolbar").node;
+  assert_equals(isVisible(toolbar), true);
+
+  set_pane_layout(kClassicMailLayout);
+  assert_pane_layout(kClassicMailLayout);
+  abwc = openAddressBook();
+  // The 3pane window is closed and opened again.
+  close3PaneWindow();
+
+  mc = open3PaneWindow();
+  abwc.window.close();
+
+}
+
+/**
+ *  Test header pane toolbar position
+ */
 function test_set_toolbar_position() {
-  set_pane_layout(kClassicMailLayout);
-  assert_pane_layout(kClassicMailLayout);
-  let abwc = openAddressBook();
-  // The 3pane window is closed and opened again.
-  close3PaneWindow();
-
-  mc = open3PaneWindow();
-  abwc.window.close();
-
-  select_message_in_folder(folder1, 0, mc);
-  expand_and_assert_header(mc);
-//  restore_and_check_default_buttons(mc);
-
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'top');
-
-  collapse_and_assert_header(mc);
-  open_preferences_dialog(mc, subtest_change_twoline);
-
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'top');
-
-  collapse_and_assert_header(mc);
-  open_preferences_dialog(mc, subtest_change_oneline);
-
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'top');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'left');
-  set_and_assert_toolbox_position(mc, 'right');
-  set_and_assert_toolbox_position(mc, 'none');
-  set_and_assert_toolbox_position(mc, 'top');
-
-  expand_and_assert_header(mc);
-//  restore_and_check_default_buttons(mc);
-}
-
-
-/**
- *  Check all buttons in the toolbar for the correct style
- *  of text and icon.
- */
-function subtest_buttons_style(aIconVisibility, aLabelVisibility, aController) {
-  let toolbar = aController.eid("header-view-toolbar").node;
-  let currentSet = filterInvisibleButtons(mc, toolbar.currentSet).split(",");
-
-  for (let i=0; i<currentSet.length; i++) {
-    let button = currentSet[i];
-    subsubtest_button_style(button, aIconVisibility, aLabelVisibility, aController);
-  }
-}
-
-function subsubtest_button_style(button, aIconVisibility, aLabelVisibility, aController) {
-  // XXX For the moment only consider normal toolbar buttons.
-  // XXX Handling of toolbaritem buttons has to be added later,
-  // XXX especially the smart reply button!
-  if ((aController.eid(button).node.tagName == "toolbarbutton") &&
-      (button != "otherActionsButton") // otherActionsButton does not have an icon anymore :-(
-      ) {
-    let icon = aController.aid(button, {class: "toolbarbutton-icon"}).node;
-    let label = aController.aid(button, {class: "toolbarbutton-text"}).node;
-
-    if (!icon) {
-      let exp1 = aController.e(button);
-      let node = aController.window.document.getAnonymousElementByAttribute(exp1, "anonid", "button");
-      if (node) {
-        icon = aController.window.document.getAnonymousElementByAttribute(node, "class", "toolbarbutton-icon");
-      }
-    }
-    if (!label) {
-      let exp1 = aController.e(button);
-      let node = aController.window.document.getAnonymousElementByAttribute(exp1, "anonid", "button");
-      if (node) {
-        label = aController.window.document.getAnonymousElementByAttribute(node, "class", "toolbarbutton-text");
-      }
-    }
-    assert_not_equals(null, label, "No label of button " + button + " found!");
-    assert_not_equals(null, icon, "No icon of button " + button + " found!");
-    assert_equals(aController.window.getComputedStyle(icon).getPropertyValue("display"),
-        aIconVisibility, "wrong visiibility for icon of button " + button);
-    assert_equals(aController.window.getComputedStyle(label).getPropertyValue("display"),
-        aLabelVisibility, "wrong visiibility for label of button " + i);
-  }
-}
+  set_pane_layout(kClassicMailLayout);
+  assert_pane_layout(kClassicMailLayout);
+  let abwc = openAddressBook();
+  // The 3pane window is closed and opened again.
+  close3PaneWindow();
+
+  mc = open3PaneWindow();
+  abwc.window.close();
+
+  select_message_in_folder(folder1, 0, mc);
+  expand_and_assert_header(mc);
+//  restore_and_check_default_buttons(mc);
+
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'top');
+
+  collapse_and_assert_header(mc);
+  open_preferences_dialog(mc, subtest_change_twoline);
+
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'top');
+
+  collapse_and_assert_header(mc);
+  open_preferences_dialog(mc, subtest_change_oneline);
+
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'top');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'left');
+  set_and_assert_toolbox_position(mc, 'right');
+  set_and_assert_toolbox_position(mc, 'none');
+  set_and_assert_toolbox_position(mc, 'top');
+
+  expand_and_assert_header(mc);
+//  restore_and_check_default_buttons(mc);
+}
+
+
+/**
+ *  Check all buttons in the toolbar for the correct style
+ *  of text and icon.
+ */
+function subtest_buttons_style(aIconVisibility, aLabelVisibility, aController) {
+  let toolbar = aController.eid("header-view-toolbar").node;
+  let currentSet = filterInvisibleButtons(mc, toolbar.currentSet).split(",");
+
+  for (let i=0; i<currentSet.length; i++) {
+    let button = currentSet[i];
+    subsubtest_button_style(button, aIconVisibility, aLabelVisibility, aController);
+  }
+}
+
+function subsubtest_button_style(button, aIconVisibility, aLabelVisibility, aController) {
+  // XXX For the moment only consider normal toolbar buttons.
+  // XXX Handling of toolbaritem buttons has to be added later,
+  // XXX especially the smart reply button!
+  if ((aController.eid(button).node.tagName == "toolbarbutton") &&
+      (button != "otherActionsButton") // otherActionsButton does not have an icon anymore :-(
+      ) {
+    let icon = aController.aid(button, {class: "toolbarbutton-icon"}).node;
+    let label = aController.aid(button, {class: "toolbarbutton-text"}).node;
+
+    dump("icon1: " + icon + "\n");
+    dump("label1: " + label + "\n");
+
+    if (!icon) {
+      let node = aController.eid(button).node;
+      dump("node for icon: " + node + "\n");
+      if (node) {
+        icon = node.getElementsByAttribute("class", "toolbarbutton-icon")[0];
+        dump("icon2: " + icon + "\n");
+      }
+    }
+    if (!icon) {
+      let exp1 = aController.e(button);
+      let node = aController.window.document.getAnonymousElementByAttribute(exp1, "anonid", "button");
+      if (node) {
+        icon = aController.window.document.getAnonymousElementByAttribute(node, "class", "toolbarbutton-icon");
+      }    
+    }
+    if (!label) {
+      let node = aController.eid(button).node;
+      dump("node for label: " + node + "\n");
+      if (node) {
+        label = node.getElementsByAttribute("class", "toolbarbutton-text")[0];
+        dump("label2: " + label + "\n");
+      }
+    }
+    if (!label) {
+      let exp1 = aController.e(button);
+      let node = aController.window.document.getAnonymousElementByAttribute(exp1, "anonid", "button");
+      if (node) {
+        label = aController.window.document.getAnonymousElementByAttribute(node, "class", "toolbarbutton-text");
+      }
+    }
+    assert_not_equals(null, label, "No label of button " + button + " found!");
+    assert_not_equals(null, icon, "No icon of button " + button + " found!");
+    assert_equals(aController.window.getComputedStyle(icon).getPropertyValue("display"),
+        aIconVisibility, "wrong visiibility for icon of button " + button);
+  }
+}