diff --git a/mail/components/compose/content/dialogs/EdColorPicker.js b/mail/components/compose/content/dialogs/EdColorPicker.js
index 72fe157acf..2cd1c66b7f 100644
--- a/mail/components/compose/content/dialogs/EdColorPicker.js
+++ b/mail/components/compose/content/dialogs/EdColorPicker.js
@@ -5,8 +5,6 @@
/* import-globals-from ../editorUtilities.js */
/* import-globals-from EdDialogCommon.js */
-// Cancel() is in EdDialogCommon.js
-
var insertNew = true;
var tagname = "TAG NAME";
var gColor = "";
@@ -21,15 +19,11 @@ var gColorObj;
// dialog initialization code
+window.addEventListener("load", Startup);
document.addEventListener("dialogaccept", onAccept);
document.addEventListener("dialogcancel", onCancelColor);
function Startup() {
- if (!window.arguments[1]) {
- dump("EdColorPicker: Missing color object param\n");
- return;
- }
-
// window.arguments[1] is object to get initial values and return color data
gColorObj = window.arguments[1];
gColorObj.Cancel = false;
diff --git a/mail/components/compose/content/dialogs/EdColorPicker.xhtml b/mail/components/compose/content/dialogs/EdColorPicker.xhtml
index 519e7336fd..62a28aeb47 100644
--- a/mail/components/compose/content/dialogs/EdColorPicker.xhtml
+++ b/mail/components/compose/content/dialogs/EdColorPicker.xhtml
@@ -3,104 +3,118 @@
- 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/. -->
-
-
-
+
-
-
-
-
-
+
+ &windowTitle.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+