diff --git a/mail/base/content/mail3PaneWindowCommands.js b/mail/base/content/mail3PaneWindowCommands.js
index a5ed1110b94..31ea283f786 100644
--- a/mail/base/content/mail3PaneWindowCommands.js
+++ b/mail/base/content/mail3PaneWindowCommands.js
@@ -572,7 +572,7 @@ var DefaultController =
MsgOpenSelectedMessages();
return;
case "cmd_printSetup":
- NSPrintSetup();
+ PrintUtils.showPageSetup();
return;
case "cmd_print":
PrintEnginePrint();
diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index 0a3a667f4f4..c729057a4f2 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -64,7 +64,7 @@
-
+
diff --git a/mail/base/content/messageWindow.js b/mail/base/content/messageWindow.js
index 3028d273946..08b061b8582 100644
--- a/mail/base/content/messageWindow.js
+++ b/mail/base/content/messageWindow.js
@@ -1033,7 +1033,7 @@ var MessageWindowController =
MsgDeleteMessageFromMessageWindow(false, true);
break;
case "cmd_printSetup":
- NSPrintSetup();
+ PrintUtils.showPageSetup();
break;
case "cmd_print":
PrintEnginePrint();
diff --git a/mail/base/content/msgPrintEngine.xul b/mail/base/content/msgPrintEngine.xul
index b39ca28f04a..849529ea86b 100644
--- a/mail/base/content/msgPrintEngine.xul
+++ b/mail/base/content/msgPrintEngine.xul
@@ -59,7 +59,7 @@
-
+
diff --git a/mail/components/addrbook/content/addressbook.xul b/mail/components/addrbook/content/addressbook.xul
index 801e05f50f4..2b87e459a6d 100644
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -75,7 +75,7 @@
-
+
@@ -259,7 +259,7 @@
-
+
#ifndef XP_MACOSX
diff --git a/mail/components/compose/content/MsgComposeCommands.js b/mail/components/compose/content/MsgComposeCommands.js
index ec5c18033dc..9bd92bf664c 100644
--- a/mail/components/compose/content/MsgComposeCommands.js
+++ b/mail/components/compose/content/MsgComposeCommands.js
@@ -511,7 +511,7 @@ var defaultController =
case "cmd_sendNow" : if (defaultController.isCommandEnabled(command)) SendMessage(); break;
case "cmd_sendWithCheck" : if (defaultController.isCommandEnabled(command)) SendMessageWithCheck(); break;
case "cmd_sendLater" : if (defaultController.isCommandEnabled(command)) SendMessageLater(); break;
- case "cmd_printSetup" : NSPrintSetup(); break;
+ case "cmd_printSetup" : PrintUtils.showPageSetup(); break;
case "cmd_print" : DoCommandPrint(); break;
//Edit Menu
@@ -1081,7 +1081,7 @@ function DoCommandClose()
function DoCommandPrint()
{
try {
- NSPrint();
+ PrintUtils.print();
} catch(ex) {dump("#PRINT ERROR: " + ex + "\n");}
}
diff --git a/mail/components/compose/content/messengercompose.xul b/mail/components/compose/content/messengercompose.xul
index 2b094ab0642..80997c66175 100644
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -73,7 +73,7 @@
-
+