diff --git a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
index 5f1150d5169..b012bc8db18 100644
--- a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@@ -73,7 +73,7 @@
 
 	<separator class="thin"/>
 	<html>&displayText.label;</html>
-    <box class="indent">
+    <box class="indent" autostretch="never">
 	  <text class="label" value="&style.label;" accesskey="&style.accesskey;" for="mailQuotedStyle"/>
       <menulist id="mailQuotedStyle" pref="true" preftype="int" prefstring="mail.quoted_style"
                 prefattribute="data">
diff --git a/mailnews/base/prefs/resources/locale/en-US/am-main.dtd b/mailnews/base/prefs/resources/locale/en-US/am-main.dtd
index 25354f4d46d..c19a6a38e8c 100644
--- a/mailnews/base/prefs/resources/locale/en-US/am-main.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/am-main.dtd
@@ -19,7 +19,7 @@
 <!ENTITY sampleSig2.label "Sample Signature 2">
 <!ENTITY sampleSig3.label "Sample Signature 3">
 <!-- LOCALIZATION NOTE (useHtml.label) : do not translate "html" in below line -->
-<!ENTITY useHtml.label "Compose messages using HTML.">
+<!ENTITY useHtml.label "Compose messages using HTML">
 <!-- LOCALIZATION NOTE (attachVCard.label) : do not translate "vCard" in below line -->
 <!ENTITY attachVCard.label "Attach my vCard to messages">
 <!ENTITY advancedButton.label "Advanced...">
diff --git a/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd b/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd
index 12256e39c1e..aae91c96b01 100644
--- a/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd
@@ -7,7 +7,7 @@
 <!ENTITY mesCheck.accesskey "m">
 
 <!ENTITY mail.label "Mail and Newsgroups">
-<!ENTITY address.label "Address Book">
+<!ENTITY address.label "Address Books">
 <!ENTITY viewingMessages.label "Message Display">
 <!ENTITY composingMessages.label "Message Composition">
 <!ENTITY format.label "Send Format">
diff --git a/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd b/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd
index c583f6a179f..e172ef0f9e2 100644
--- a/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd
@@ -42,7 +42,7 @@ Rights Reserved.
 <!ENTITY coding.label					  "Use the following character coding as the default for viewing messages:">
 <!ENTITY sendDefaultCharset.label         "Character Coding:">
 <!ENTITY sendDefaultCharset.accesskey	  "h">
-<!ENTITY forceCharsetOverride.label       "Apply default to all messages (ignore character coding specified by MIME header).">
+<!ENTITY forceCharsetOverride.label       "Apply default to all messages (ignore character coding specified by MIME header)">
 <!ENTITY forceCharsetOverride.accesskey   "p">
 <!ENTITY fixedWidth.label                 "Fixed width font">
 <!ENTITY fixedWidth.accesskey             "f">
@@ -53,7 +53,7 @@ Rights Reserved.
 <!ENTITY wrapInMsg.label                  "Wrap text to fit window width">
 <!ENTITY wrapInMsg.accesskey              "w">
 <!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
-<!ENTITY convertEmoticons.label           "Display emoticons as graphics.">
+<!ENTITY convertEmoticons.label           "Display emoticons as graphics">
 <!ENTITY convertEmoticons.accesskey       "d">
 
 <!-- Tooltips  -->  
diff --git a/mailnews/base/resources/content/newFolderNameDialog.xul b/mailnews/base/resources/content/newFolderNameDialog.xul
index acc63070932..a69613dd89a 100644
--- a/mailnews/base/resources/content/newFolderNameDialog.xul
+++ b/mailnews/base/resources/content/newFolderNameDialog.xul
@@ -51,6 +51,7 @@ Rights Reserved.
         		<spring flex="100%"/>
         	</box>
 		<spring flex="100%"/>
+		<separator/>
 		<box id="okCancelButtons"/>
 		
 	</box>
diff --git a/mailnews/compose/prefs/resources/content/pref-formatting.xul b/mailnews/compose/prefs/resources/content/pref-formatting.xul
index 58fbae09543..1507fef8ccd 100644
--- a/mailnews/compose/prefs/resources/content/pref-formatting.xul
+++ b/mailnews/compose/prefs/resources/content/pref-formatting.xul
@@ -20,6 +20,7 @@
 
   <titledbox orient="vertical">
     <title><html>&sendMail.label;</html></title>
+    <html>&sendMaildesc.label;</html>
 
     <radiogroup id="mailDefaultHTMLAction" orient="vertical" autostretch="never"
                 pref="true" preftype="int" prefstring="mail.default_html_action"
diff --git a/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd b/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
index f9f46e5e372..468eeab1094 100644
--- a/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
+++ b/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
@@ -20,7 +20,7 @@ Rights Reserved.
 
 <!ENTITY pane.title                           "Message Composition">
 <!ENTITY pane.description                     "Composing mail messages">
-<!ENTITY forwardReply.label                   "Forwarding and replying to messages">
+<!ENTITY forwardReply.label                   "Forwarding and Replying to Messages">
 <!ENTITY forwardMsg.label                     "Forward messages:">
 <!ENTITY forwardMsg.accesskey                 "f">
 <!ENTITY inline.label                         "Inline">
diff --git a/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd b/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd
index cbdf6c6dfc3..1e977ad3f5e 100644
--- a/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd
+++ b/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd
@@ -20,7 +20,8 @@ Rights Reserved.
 
 <!ENTITY pane.title                   "Send Format">
 <!ENTITY pane.description             "Message formatting">
-<!ENTITY sendMail.label               "When sending messages in HTML format and one or more recipients are not listed as being able to receive HTML:">
+<!ENTITY sendMail.label               "Send Format">
+<!ENTITY sendMaildesc.label           "When sending messages in HTML format and one or more recipients are not listed as being able to receive HTML:">
 <!ENTITY askMe.label                  "Ask me what to do (Mail prompts you to choose a format)">
 <!ENTITY askMe.accesskey              "a">
 <!ENTITY convertPlain.label           "Convert the message to plain text (some formatting may be lost)">
@@ -30,4 +31,4 @@ Rights Reserved.
 <!ENTITY sendBoth.label               "Send the message in both plain text and HTML (larger message size)">
 <!ENTITY sendBoth.accesskey           "e">
 <!ENTITY override.label               "You can override these settings for individual messages by using the Options menu in the Mail Compose window.">
-<!ENTITY receiveHTML.label            "If you know a particular recipient can reveive HTML mail, unckeck the 'Send email as plain text(no HTML)' checkbox on hte recipients's Address Book card.">
\ No newline at end of file
+<!ENTITY receiveHTML.label            "If you know a particular recipient can receive HTML mail, uncheck the 'Send email as plain text (no HTML)' checkbox on the recipient's Address Book card.">
\ No newline at end of file
