Fixing bug 397097, Account Manager, Preferences and Import Dialogs aren't marked up correctly for accessibility. Patch by Marco Zehe <marco.zehe@googlemail.com>. r=philringnalda, sr=neil.

mailnews/base/prefs/resources/content/AccountWizard.xul

@@ -68,7 +68,7 @@
     <vbox flex="1">
       <description>&accountSetupInfo.label;</description>
       <description>&accountTypeDesc.label;</description>
-      <description>&accountTypeDirections.label;</description>
+      <label control="acctyperadio">&accountTypeDirections.label;</label>
       <separator/>
       <radiogroup id="acctyperadio" >
         <radio id="mailaccount" value="mailaccount"
@@ -104,7 +104,7 @@
       <description>&fullnameDesc.label; &fullnameExample.label;</description>
       <separator class="thin"/>
       <hbox align="center">
-        <label class="awIdentityLabel" for="fullName" value="&fullnameLabel.label;"
+        <label class="awIdentityLabel" value="&fullnameLabel.label;"
                accesskey="&fullnameLabel.accesskey;" control="fullName"/>
         <textbox mailtype="identity" wsm_persist="true" name="fullName" id="fullName" flex="1"/>
       </hbox>
@@ -139,7 +139,7 @@
               onpageadvanced="return serverPageValidate();">
     <vbox flex="1">
         <vbox id="serverTypeBox">
-        <description>&incomingServerTypeDesc.label;</description>
+        <label control="servertype">&incomingServerTypeDesc.label;</label>
           <separator class="thin"/>
           <hbox align="center" class="serverDataBox">
             <!-- The initial value for the servertype radiogroup is set in onInit() -->
@@ -156,7 +156,7 @@
         <vbox id="incomingServerbox">
           <description>&incomingServerNameDesc.label;</description>
           <hbox align="center" class="serverDataBox">
-            <label class="label, serverLabel" value="&incomingServerLabel.label;" for="incomingServer"
+            <label class="label, serverLabel" value="&incomingServerLabel.label;"
                    accesskey="&incomingServerLabel.accesskey;" control="incomingServer"/>
             <textbox wsm_persist="true" id="incomingServer" flex="1" class="uri-element"/>
           </hbox>
@@ -174,7 +174,7 @@
         <vbox id="noSmtp">
           <description>&smtpServerDesc.label;</description>
           <hbox align="center" class="serverDataBox">
-            <label class="label, serverLabel" value="&smtpServerLabel.label;" for="smtphostname"
+            <label class="label, serverLabel" value="&smtpServerLabel.label;"
                    accesskey="&smtpServerLabel.accesskey;" control="smtphostname"/>
             <textbox id="smtphostname" wsm_persist="true" flex="1" class="uri-element"/>
           </hbox>
@@ -197,7 +197,7 @@
       <description>&usernameDesc.label; &usernameExample.label;</description>
       <separator class="thin"/>
       <hbox align="center">
-        <label class="label" value="&usernameLabel.label;" for="username" style="width: 8em;"
+        <label class="label" value="&usernameLabel.label;" style="width: 8em;"
                accesskey="&usernameLabel.accesskey;" control="username"/>
         <textbox id="username" wsm_persist="true" flex="1"/>
       </hbox>
@@ -208,7 +208,7 @@
         <description>&usernameSmtpDesc.label;</description>
         <separator class="thin"/>
         <hbox align="center">
-          <label class="label" value="&usernameSmtpLabel.label;" for="smtpusername" style="width: 8em;"
+          <label class="label" value="&usernameSmtpLabel.label;" style="width: 8em;"
                  accesskey="&usernameSmtpLabel.accesskey;" control="smtpusername"/>
           <textbox id="smtpusername" wsm_persist="true" flex="1"/>
         </hbox>
@@ -252,7 +252,7 @@
       <description>&accnameDesc.label;</description>
       <separator class="thin"/>
       <hbox align="center">
-        <label class="label" value="&accnameLabel.label;" for="prettyName" style="width: 8em;"
+        <label class="label" value="&accnameLabel.label;" style="width: 8em;"
                accesskey="&accnameLabel.accesskey;" control="prettyName"/>
         <textbox id="prettyName" size="40" wsm_persist="true" flex="1"/>
       </hbox>

mailnews/base/prefs/resources/content/am-addressingOverlay.xul

@@ -118,7 +118,7 @@
       <separator class="thin"/>
 #endif
 
-      <description>&addressingText.label;</description>
+      <label control="ldapAutocomplete">&addressingText.label;</label>
       <radiogroup class="indent" id="ldapAutocomplete" wsm_persist="true" oncommand="enabling();">
         <observes element="identity.overrideGlobalPref" attribute="disabled"/>
         <radio id="useGlobalPref" value="0" label="&useGlobal.label;"

mailnews/base/prefs/resources/content/am-copiesOverlay.xul

@@ -143,7 +143,7 @@
       <caption label="&specialFoldersTitle.label;"/>
 
       <hbox align="center">
-        <label value="&keepDrafts.label;"/>
+        <label value="&keepDrafts.label;" control="messageDrafts"/>
       </hbox>
     
       <radiogroup id="messageDrafts">
@@ -173,7 +173,7 @@
         </grid>
       </radiogroup>
       <hbox align="center">
-        <label value="&keepTempltes.label;"/>
+        <label value="&keepTempltes.label;" control="messageTemplates"/>
       </hbox>
 	  
       <radiogroup id="messageTemplates">

mailnews/base/prefs/resources/content/am-offline.xul

@@ -116,7 +116,7 @@
 
     <vbox align="start">  
     <separator hidefor="none"/>
-    <description id="retentionDescription" hidefor="" class="desc">&retentionCleanup.label;</description>
+    <label id="retentionDescription" hidefor="" class="desc" control="retention.keepMsg">&retentionCleanup.label;</label>
 
     <radiogroup wsm_persist="true" hidefor="" id="retention.keepMsg" class="indent">
         <radio wsm_persist="true" id="retention.keepAllMsg" value="1" accesskey="&retentionKeepAll.accesskey;"

mailnews/base/prefs/resources/content/am-server-advanced.xul

@@ -132,7 +132,7 @@
 
     <!-- POP3 Panel -->
     <vbox id="pop3Panel">
-      <description flex="1">&pop3Desc.label;</description>
+      <label flex="1" control="folderStorage">&pop3Desc.label;</label>
       <hbox align="center">
         <radiogroup id="folderStorage" orient="horizontal" amsa_persist="true">
           <rows>

mailnews/base/prefs/resources/content/am-server.xul

@@ -113,7 +113,7 @@
   <groupbox hidefor="movemail">
     <caption label="&securitySettings.label;"/>
     <vbox align="start" hidefor="nntp,movemail">
-      <label value="&socketType.label;"/>
+      <label value="&socketType.label;" control="server.socketType"/>
       <radiogroup wsm_persist="true" id="server.socketType"
                   prefattribute="value"
                   prefstring="mail.server.%serverkey%.socketType"
@@ -222,7 +222,7 @@
 
   <hbox align="center" hidefor="pop3,nntp,movemail">
     <label value="&deleteMessagePrefix.label;" align="left"
-           control="imap.deleteModel.box"/>
+           control="imap.deleteModel"/>
   </hbox>
   <hbox align="center" id="imap.deleteModel.box" hidefor="pop3,nntp,movemail">
     <radiogroup wsm_persist="true" id="imap.deleteModel"

mailnews/base/prefs/resources/content/am-smtp.xul

@@ -50,27 +50,27 @@
         </columns>
         <rows>
           <row align="center">
-            <hbox pack="end"><label id="descriptionLabel" value="&serverDescription.label;"/></hbox>
+            <hbox pack="end"><label id="descriptionLabel" value="&serverDescription.label;" control="descriptionValue"/></hbox>
             <textbox id="descriptionValue" readonly="true" class="plain"/>
           </row>
           <row align="center">
-            <hbox pack="end"><label id="nameLabel" value="&serverName.label;"/></hbox>
+            <hbox pack="end"><label id="nameLabel" value="&serverName.label;" control="nameValue"/></hbox>
             <textbox id="nameValue" readonly="true" class="plain"/>
           </row>
           <row align="center">
-            <hbox pack="end"><label id="portLabel" value="&serverPort.label;"/></hbox>
+            <hbox pack="end"><label id="portLabel" value="&serverPort.label;" control="portValue"/></hbox>
             <textbox id="portValue" readonly="true" class="plain"/>
           </row>
           <row align="center">
-            <hbox pack="end"><label id="userNameLabel" value="&userName.label;"/></hbox>
+            <hbox pack="end"><label id="userNameLabel" value="&userName.label;" control="userNameValue"/></hbox>
             <textbox id="userNameValue" readonly="true" class="plain"/>
           </row>
           <row align="center">
-              <hbox pack="end"><label id="useSecureAuthenticationLabel" value="&useSecureAuthentication.label;"/></hbox>
+              <hbox pack="end"><label id="useSecureAuthenticationLabel" value="&useSecureAuthentication.label;" control="useSecureAuthenticationValue"/></hbox>
               <textbox id="useSecureAuthenticationValue" readonly="true" class="plain"/>
           </row>
           <row align="center">
-            <hbox pack="end"><label id="useSecureConnectionLabel" value="&useSecureConnection.label;"/></hbox>
+            <hbox pack="end"><label id="useSecureConnectionLabel" value="&useSecureConnection.label;" control="useSecureConnectionValue"/></hbox>
             <textbox id="useSecureConnectionValue" readonly="true" class="plain"/>
           </row>
         </rows>

mailnews/base/prefs/resources/content/pref-offline.xul

@@ -74,7 +74,7 @@
   <caption label="&pref.offline.caption;"/>
 
   <hbox align="center">
-    <label value="&textStartUp;"/>
+    <label value="&textStartUp;" control="whenStartingUp"/>
     <menulist id="whenStartingUp" prefstring="offline.startup_state">
       <menupopup>
         <menuitem value="0" label="&menuitemRememberPrevState;"/>
@@ -88,7 +88,7 @@
 
   <separator/>
 
-  <label value="&textGoingOnline;"/>
+  <label value="&textGoingOnline;" control="whengoingOnlinestate"/>
     <radiogroup id="whengoingOnlinestate"
                 orient="horizontal" class="indent"
                 prefstring="offline.send.unsent_messages">
@@ -102,7 +102,7 @@
 
   <separator/>
 
-  <label value="&textGoingOffline;"/>
+  <label value="&textGoingOffline;" control="whengoingOfflinestate"/>
     <radiogroup id="whengoingOfflinestate"
                 orient="horizontal" class="indent"
                 prefstring="offline.download.download_messages">

mailnews/base/prefs/resources/content/pref-receipts.xul

@@ -64,7 +64,7 @@
                 accesskey="&requestReceipt.accesskey;"/>
 
       <vbox id="receiptArrive">
-        <description>&receiptArrive.label;</description>
+        <label control="receiptFolder">&receiptArrive.label;</label>
         <radiogroup id="receiptFolder" prefstring="mail.incorporate.return_receipt">
           <radio value="0" label="&leaveIt.label;" accesskey="&leaveIt.accesskey;"/>
           <radio value="1" label="&moveToSent.label;" accesskey="&moveToSent.accesskey;"/> 
@@ -72,7 +72,7 @@
       </vbox>
 
       <vbox id="receiptRequest">
-        <description>&requestMDN.label;</description>
+        <label control="receiptSend">&requestMDN.label;</label>
         <radiogroup id="receiptSend" preftype="bool" prefstring="mail.mdn.report.enabled" oncommand="EnableDisableAllowedReceipts();">
           <radio value="false" label="&never.label;" accesskey="&never.accesskey;"/>
           <radio value="true" label="&returnSome.label;" accesskey="&returnSome.accesskey;"/> 

mailnews/base/prefs/resources/content/pref-viewing_messages.xul

@@ -35,7 +35,7 @@
 
   <groupbox align="start">
     <caption label="&generalMessageDisplay.caption;"/>
-    <label value="&openingMessages.label;"/>
+    <label value="&openingMessages.label;" control="reuseMessageWindow"/>
     <hbox class="indent" align="center">
       <radiogroup id="reuseMessageWindow" orient="horizontal"
                   preftype="bool" prefstring="mailnews.reuse_message_window">
@@ -69,7 +69,7 @@
 
   <groupbox>
     <caption label="&displayPlainText.caption;"/>
-    <label value="&plainTextFont.label;"/>
+    <label value="&plainTextFont.label;" control="mailFixedWidthMessages"/>
     <hbox class="indent" align="center">
       <radiogroup id="mailFixedWidthMessages" orient="horizontal"
                   preftype="bool" prefstring="mail.fixed_width_messages">

mailnews/base/prefs/resources/content/smtpEditOverlay.xul

@@ -114,7 +114,7 @@
         <separator class="thin"/>
 
         <hbox align="center">
-           <label value="&isSecure.label;"/>
+           <label value="&isSecure.label;" control="smtp.trySSL"/>
         </hbox>
 
         <radiogroup id="smtp.trySSL"

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

@@ -31,7 +31,7 @@
 
     <radiogroup id="forwardMessageMode" orient="horizontal" align="center"
                 prefstring="mail.forward_message_mode">
-      <label value="&forwardMsg.label;"/>
+      <label value="&forwardMsg.label;" control="forwardMessageMode"/>
       <radio value="2" label="&inline.label;" accesskey="&inline.accesskey;"/>
       <radio value="0" label="&asAttachment.label;"
              accesskey="&asAttachment.accesskey;"/>

mailnews/extensions/mailviews/resources/content/mailViewSetup.xul

@@ -71,7 +71,7 @@
     <separator class="thin"/>
     <vbox>
        <hbox align="center">
-         <label value="&mailViewHeading.label;" accesskey="&mailViewHeading.accesskey;"/>
+         <label value="&mailViewHeading.label;" accesskey="&mailViewHeading.accesskey;" control="name"/>
          <textbox tabindex="0" id="name" oninput="doEnabling();"/>
       </hbox>
     </vbox>

mailnews/extensions/mdn/resources/content/am-mdn.xul

@@ -73,7 +73,7 @@
                 preftype="bool" prefstring="mail.identity.%identitykey%.request_return_receipt_on"/>
 
       <vbox id="receiptArrive">
-        <description id="receiptArriveLabel">&receiptArrive.label;</description>
+        <label id="receiptArriveLabel" control="server.incorporate_return_receipt">&receiptArrive.label;</label>
         <radiogroup id="server.incorporate_return_receipt" wsm_persist="true" genericattr="true" 
                     preftype="int" prefstring="mail.server.%serverkey%.incorporate_return_receipt">
           <radio id="leave_in_inbox" value="0" label="&leaveIt.label;"
@@ -84,7 +84,7 @@
       </vbox>
 
       <vbox id="receiptRequest">
-        <description id="receiptRequestLabel">&requestMDN.label;</description>
+        <label id="receiptRequestLabel" control="server.mdn_report_enabled">&requestMDN.label;</label>
         <radiogroup id="server.mdn_report_enabled" wsm_persist="true" genericattr="true" 
                     preftype="bool" prefstring="mail.server.%serverkey%.mdn_report_enabled" 
                     oncommand="EnableDisableAllowedReceipts();">

mailnews/extensions/smime/resources/content/am-smime.xul

@@ -108,7 +108,7 @@
 
     <separator class="thin"/>
 
-    <label value="&encryptionChoiceLabel.label;"/>
+    <label value="&encryptionChoiceLabel.label;" control="encryptionChoices"/>
 
     <radiogroup id="encryptionChoices">
       <radio id="encrypt_mail_never" wsm_persist="true" value="0"

mailnews/extensions/smime/resources/content/msgCompSecurityInfo.xul

@@ -72,7 +72,7 @@
   </grid>
 
   <separator class="thin"/>
-  <label value="&status.certificates;"/>
+  <label value="&status.certificates;" control="infolist"/>
 
   <listbox id="infolist" flex="1"
         onselect="onSelectionChange(event);">

mailnews/import/resources/content/importDialog.xul

@@ -72,7 +72,7 @@
       <description>&importDescription.label;</description>
       <description>&importDescription2.label;</description>
       <separator/>
-      <description>&select.label;</description>
+      <label control="importFields">&select.label;</label>
       <separator class="thin"/>
       <radiogroup id="importFields" class="indent">
         <radio value="addressbook" id="addressbookRadio" label="&importDialog.addressbookTitle;"/>