diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
index f7283248a32..04b3248bee8 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
@@ -11,57 +11,57 @@
 <!-- menu items:  the . means that the menu item isn't implemented yet -->
 
 <!-- File menu items -->
-<!ENTITY newMessage.label				"Message">  
-	<!ENTITY newMessage.accesskey			"M">  
+<!ENTITY newMessage.label "Message">  
+<!ENTITY newMessage.accesskey "M">  
 <!ENTITY saveCmd.label "Save">
-	<!ENTITY saveCmd.key "S">
-  <!ENTITY saveCmd.accesskey "s">
+<!ENTITY saveCmd.key "S">
+<!ENTITY saveCmd.accesskey "s">
 <!ENTITY saveAsCmd.label "Save As">
-	<!ENTITY saveAsCmd.accesskey "A">
+<!ENTITY saveAsCmd.accesskey "A">
 <!ENTITY saveAsFileCmd.label "File...">
-	<!ENTITY saveAsFileCmd.accesskey "F">
+<!ENTITY saveAsFileCmd.accesskey "F">
 <!ENTITY saveAsDraftCmd.label "Draft">
-	<!ENTITY saveAsDraftCmd.accesskey "D">
+<!ENTITY saveAsDraftCmd.accesskey "D">
 <!ENTITY saveAsTemplateCmd.label "Template">
-	<!ENTITY saveAsTemplateCmd.accesskey "T">
+<!ENTITY saveAsTemplateCmd.accesskey "T">
 <!ENTITY attachFileCmd.label "Attach File...">
-	<!ENTITY attachFileCmd.key "">
-	<!ENTITY attachFileCmd.accesskey "F">
+<!ENTITY attachFileCmd.key "">
+<!ENTITY attachFileCmd.accesskey "F">
 <!ENTITY attachPageCmd.label "Attach Web Page...">
-	<!ENTITY attachPageCmd.accesskey "W">
+<!ENTITY attachPageCmd.accesskey "W">
 <!ENTITY sendNowCmd.label "Send Now">
-	<!ENTITY sendCmd.keycode "VK_RETURN">
-	<!ENTITY sendNowCmd.accesskey "d">
+<!ENTITY sendCmd.keycode "VK_RETURN">
+<!ENTITY sendNowCmd.accesskey "d">
 <!ENTITY sendLaterCmd.label "Send Later">
-	<!ENTITY sendLaterCmd.keycode "VK_RETURN">
-	<!ENTITY sendLaterCmd.accesskey "L">
+<!ENTITY sendLaterCmd.keycode "VK_RETURN">
+<!ENTITY sendLaterCmd.accesskey "L">
 <!ENTITY printSetupCmd.label "Page Setup...">
-	<!ENTITY printSetupCmd.accesskey "u">
+<!ENTITY printSetupCmd.accesskey "u">
 <!ENTITY printCmd.label "Print...">
-	<!ENTITY printCmd.key "P">
-	<!ENTITY printCmd.accesskey "P">
+<!ENTITY printCmd.key "P">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 
 <!-- Edit menu items -->
 <!ENTITY findCmd.label "Find and Replace...">
-	<!ENTITY findCmd.key "F">
-	<!ENTITY findCmd.accesskey "F">
+<!ENTITY findCmd.key "F">
+<!ENTITY findCmd.accesskey "F">
 <!ENTITY findAgainCmd.label "Find Again">
-	<!ENTITY findAgainCmd.key "G">
-	<!ENTITY findAgainCmd.accesskey "g">
+<!ENTITY findAgainCmd.key "G">
+<!ENTITY findAgainCmd.accesskey "g">
 <!ENTITY accountManagerCmd.label "Mail &amp; Newsgroups Account Settings...">
-	<!ENTITY accountManagerCmd.accesskey "m">
+<!ENTITY accountManagerCmd.accesskey "m">
 
 <!-- View menu items -->
 <!ENTITY showComposeToolbarCmd.label "Mail Toolbar">
-	<!ENTITY showComposeToolbarCmd.accesskey "o">
+<!ENTITY showComposeToolbarCmd.accesskey "o">
 <!ENTITY showFormatToolbarCmd.label "Formatting Toolbar">
-	<!ENTITY showFormatToolbarCmd.accesskey "F">
+<!ENTITY showFormatToolbarCmd.accesskey "F">
 <!ENTITY showParagraphMarksCmd.label ".Show Paragraph Marks">
 <!ENTITY pageSourceCmd.label ".Page Source">
-	<!ENTITY pageSourceCmd.accesskey "u">
+<!ENTITY pageSourceCmd.accesskey "u">
 <!ENTITY pageInfoCmd.label ".Page Info">
-	<!ENTITY pageInfoCmd.accesskey "I">
+<!ENTITY pageInfoCmd.accesskey "I">
 <!ENTITY dcharMenu.label "Character Set">
 <!ENTITY dcharIso1Cmd.label "Western (ISO-8859-1)">
 <!ENTITY dcharIso2Cmd.label "Central European (ISO-8859-2)">
@@ -98,19 +98,19 @@
 <!--LOCALIZATION NOTE attachVCardCmd.label Don't translate the term 'vCard' -->
 <!ENTITY addSignatureCmd.label ".Add Signature File">
 <!ENTITY attachVCardCmd.label ".Include Personal Card (vCard)">
-	<!ENTITY attachVCardCmd.accesskey "P">
+<!ENTITY attachVCardCmd.accesskey "P">
 
 <!ENTITY quoteCmd.label "Quote Message">
-	<!ENTITY quoteCmd.accesskey "Q">
+<!ENTITY quoteCmd.accesskey "Q">
 <!ENTITY editRewrapCmd.label "Rewrap">
 <!ENTITY editRewrapCmd.accesskey  "R">
 <!ENTITY selectAddressCmd.label "Select Addresses...">
-	<!ENTITY selectAddressCmd.key "">
-	<!ENTITY selectAddressCmd.accesskey "c">
+<!ENTITY selectAddressCmd.key "">
+<!ENTITY selectAddressCmd.accesskey "c">
 
 <!ENTITY checkSpellingCmd.label "Check Spelling...">
-	<!ENTITY checkSpellingCmd.key "K">
-	<!ENTITY checkSpellingCmd.accesskey "S">
+<!ENTITY checkSpellingCmd.key "K">
+<!ENTITY checkSpellingCmd.accesskey "S">
 
 <!ENTITY priorityMenu.label "Priority">
 <!ENTITY priorityMenu.accesskey "p">