fix the pref ui a little, fix a js exception, add a label to the spell

checking field set, add ui for emoticon to glyph conversion.  part 1 of fix
for #21649

mailnews/addrbook/prefs/resources/content/pref-addressing.xul

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
+<?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://addressbook/locale/pref-addressing.dtd">
 
@@ -9,6 +9,8 @@
         class="dialog"
 		align="vertical">
 
+<html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>
+
 	<box class="header" align="horizontal">
 		<html:div class="left-header-text">&pane.title;</html:div>
 		<spring flex="100%"/>

mailnews/compose/prefs/resources/content/pref-messages.xul

@@ -47,6 +47,10 @@
 	</html:fieldset>
 
 	<html:fieldset>
+		<html:legend align="left">
+                        <html:div>&spellCheckHeader.label;</html:div>
+                </html:legend>
+
 		<html:input id="pref:0:bool:mail.SpellCheckBeforeSend" type="checkbox"/>
 		<html:label for="pref:0:bool:mail.SpellCheckBeforeSend">&spellCheck.label;</html:label>
 	</html:fieldset>
@@ -85,5 +89,12 @@
 		<html:div class="indent">&useMIMEpart2.label;</html:div>
 
 	</html:fieldset>
+	 <html:fieldset>
+                <html:legend align="left">
+                        <html:div>&emoticons.label;</html:div>
+                </html:legend>
+		<html:input id="pref:0:bool:mail.enable_emoticons" type="checkbox"/>
+		<html:label for="pref:0:bool:mail.enable_emoticons">&enableEmoticons.label;</html:label>
+	</html:fieldset>
 
 </window>

mailnews/compose/prefs/resources/locale/en-US/pref-messages.dtd

@@ -31,6 +31,7 @@ Rights Reserved.
 <!ENTITY belowQuote.label "start my reply below the quoted text">
 <!ENTITY selectAndAboveQuote.label "start my reply above, and select the quoted text">
 <!ENTITY selectAndBelowQuote.label "start my reply below, and select the quoted text">
+<!ENTITY spellCheckHeader.label "Spell checking">
 <!ENTITY spellCheck.label "Spell check messages before sending">
 <!ENTITY msgWrapping.label "Message Wrapping">
 <!ENTITY wrapInMsg.label "Wrap incoming, plain text messages to window width">
@@ -41,3 +42,5 @@ Rights Reserved.
 <!ENTITY asIs.label "As is (does not work well with some mail servers)">
 <!ENTITY useMIMEpart1.label "Using the 'quoted printable' MIME encoding">
 <!ENTITY useMIMEpart2.label "(does not work well with some mail or newsgroups readers)">
+<!ENTITY emoticons.label "Emoticons">
+<!ENTITY enableEmoticons.label "When viewing a text message, convert emoticons to glyphs.">

mailnews/mailnews.js

@@ -363,3 +363,4 @@ pref("mail.server.default.max_size", 50);
 pref("mail.server.default.auth_login", true);
 pref("mail.server.default.delete_mail_left_on_server", false);
 
+pref("mail.enable_emoticons",true);

modules/libpref/src/init/mailnews.js

@@ -363,3 +363,4 @@ pref("mail.server.default.max_size", 50);
 pref("mail.server.default.auth_login", true);
 pref("mail.server.default.delete_mail_left_on_server", false);
 
+pref("mail.enable_emoticons",true);