a couple more cleanup fixes for the new pref ui for bug #21649

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

@@ -93,13 +93,14 @@
                 <html:legend align="left">
                         <html:div>&emoticonsAndStructs.label;</html:div>
                 </html:legend>
-		<html:input id="pref:0:bool:mail.convert_emoticons" type="checkbox"/>
-		<html:label for="pref:0:bool:mail.convert_emoticons">&convertEmoticons.label;</html:label>
-                <html:legend align="left">
-                        <html:div>&structs.label;</html:div>
-                </html:legend>
-		<html:input id="pref:0:bool:mail.convert_structs" type="checkbox"/>
-		<html:label for="pref:0:bool:mail.convert_structs">&convertStructs.label;</html:label>
+		<html:div>
+			<html:input id="pref:0:bool:mail.convert_emoticons" type="checkbox"/>
+			<html:label for="pref:0:bool:mail.convert_emoticons">&convertEmoticons.label;</html:label>
+		</html:div>
+		<html:div>
+			<html:input id="pref:0:bool:mail.convert_structs" type="checkbox"/>
+			<html:label for="pref:0:bool:mail.convert_structs">&convertStructs.label;</html:label>
+		</html:div>
 	</html:fieldset>
 
 </window>

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

@@ -43,7 +43,5 @@ Rights Reserved.
 <!ENTITY useMIMEpart1.label "Using the 'quoted printable' MIME encoding">
 <!ENTITY useMIMEpart2.label "(does not work well with some mail or newsgroups readers)">
 <!ENTITY emoticonsAndStructs.label "Emoticons And Structs">
-<!ENTITY emoticons.label "Emoticons">
-<!ENTITY structs.label "Structs">
 <!ENTITY convertEmoticons.label "When viewing a text message, convert emoticons to glyphs.">
 <!ENTITY convertStructs.label "When viewing a text message, convert structs to styles.">