diff --git a/mailnews/addrbook/content/abAddressBookNameDialog.xhtml b/mailnews/addrbook/content/abAddressBookNameDialog.xhtml
index 5536559328..3fc0d7d9e1 100644
--- a/mailnews/addrbook/content/abAddressBookNameDialog.xhtml
+++ b/mailnews/addrbook/content/abAddressBookNameDialog.xhtml
@@ -8,25 +8,43 @@
-
+
<!-- addressBookTitleEdit -->
-
-
-
+
+
+
-
&name.label;
-
diff --git a/mailnews/addrbook/content/abCardDAVDialog.xhtml b/mailnews/addrbook/content/abCardDAVDialog.xhtml
index 957914c369..fd7eeaad57 100644
--- a/mailnews/addrbook/content/abCardDAVDialog.xhtml
+++ b/mailnews/addrbook/content/abCardDAVDialog.xhtml
@@ -7,63 +7,90 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/mailnews/addrbook/content/abCardDAVProperties.xhtml b/mailnews/addrbook/content/abCardDAVProperties.xhtml
index 1cfe5c4be4..b611cbbf43 100644
--- a/mailnews/addrbook/content/abCardDAVProperties.xhtml
+++ b/mailnews/addrbook/content/abCardDAVProperties.xhtml
@@ -9,62 +9,85 @@
-
-
- <!-- addressBookTitleEdit -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ <!-- addressBookTitleEdit -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mailnews/addrbook/prefs/content/pref-editdirectories.xhtml b/mailnews/addrbook/prefs/content/pref-editdirectories.xhtml
index 41f1fcb738..381aee3050 100644
--- a/mailnews/addrbook/prefs/content/pref-editdirectories.xhtml
+++ b/mailnews/addrbook/prefs/content/pref-editdirectories.xhtml
@@ -7,41 +7,71 @@
-
-
- &pref.ldap.window.title;
-
-
- &pref.ldap.window.title;
+
+
+
-
-
-
-
-
+
+
+
+
+
+
diff --git a/mailnews/base/content/folderProps.xhtml b/mailnews/base/content/folderProps.xhtml
index 8d29780685..a2812fc383 100644
--- a/mailnews/base/content/folderProps.xhtml
+++ b/mailnews/base/content/folderProps.xhtml
@@ -1,4 +1,5 @@
-
+
+
@@ -12,196 +13,331 @@
-
-
- &folderProps.windowtitle.label;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- &folderRebuildSummaryFile.explanation;
-
-
-
+
+
+
+
+
+
+
+ &folderRebuildSummaryFile.explanation;
+
+
+
-
-
+ align="center"
+ />
+
+
+
-
- &retentionCleanup.label;
- &retentionCleanupImap.label;
- &retentionCleanupPop.label;
+
+ &retentionCleanup.label;
+ &retentionCleanupImap.label;
+ &retentionCleanupPop.label;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/mailnews/base/content/junkLog.xhtml b/mailnews/base/content/junkLog.xhtml
index 078a6e71c7..28c7071c4e 100644
--- a/mailnews/base/content/junkLog.xhtml
+++ b/mailnews/base/content/junkLog.xhtml
@@ -7,40 +7,51 @@
-
-
- &adaptiveJunkLog.title;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ &adaptiveJunkLog.title;
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mailnews/base/content/markByDate.xhtml b/mailnews/base/content/markByDate.xhtml
index ff7a8321a0..7928bf2b59 100644
--- a/mailnews/base/content/markByDate.xhtml
+++ b/mailnews/base/content/markByDate.xhtml
@@ -9,42 +9,71 @@
-
-
- &messageMarkByDate.label;
-
-
-
-
-
-
-
-
+
+
+ &messageMarkByDate.label;
+
+
+
+
+
+
+
+
diff --git a/mailnews/base/content/msgAccountCentral.xhtml b/mailnews/base/content/msgAccountCentral.xhtml
index 4565e97a75..c09954eb7b 100644
--- a/mailnews/base/content/msgAccountCentral.xhtml
+++ b/mailnews/base/content/msgAccountCentral.xhtml
@@ -7,13 +7,14 @@
-
-
+
-
-
-
diff --git a/mailnews/base/content/msgSelectOfflineFolders.xhtml b/mailnews/base/content/msgSelectOfflineFolders.xhtml
index e4df81c9d0..88e0ecbd39 100644
--- a/mailnews/base/content/msgSelectOfflineFolders.xhtml
+++ b/mailnews/base/content/msgSelectOfflineFolders.xhtml
@@ -10,29 +10,53 @@
-
-
- &MsgSelect.label;
-
-
-
-
-
-
-
- &MsgSelect.label;
+
+
+
+
+
+
+
+ &MsgSelectDesc.label;
+ &MsgSelectDesc.label;
-
-
-
-
-
-
+ onclick="gSelectOffline.onClick(event);"
+ >
+
+
+
+
diff --git a/mailnews/base/content/msgSynchronize.xhtml b/mailnews/base/content/msgSynchronize.xhtml
index 3fe7556182..3cf58703a9 100644
--- a/mailnews/base/content/msgSynchronize.xhtml
+++ b/mailnews/base/content/msgSynchronize.xhtml
@@ -8,37 +8,70 @@
-
-
- &MsgSynchronize.label;
-
-
-
-
-
- &MsgSyncDesc.label;
- &MsgSyncDirections.label;
+
+
+ &MsgSynchronize.label;
+
+
+
+
+
+ &MsgSyncDesc.label;
+ &MsgSyncDirections.label;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/mailnews/base/content/newFolderDialog.xhtml b/mailnews/base/content/newFolderDialog.xhtml
index b63f0085f6..bc141b95f3 100644
--- a/mailnews/base/content/newFolderDialog.xhtml
+++ b/mailnews/base/content/newFolderDialog.xhtml
@@ -12,61 +12,96 @@
-%newFolderDTD;
-]>
+
+%newFolderDTD; ]>
-
-
- &newFolderDialog.title;
-
-
-
-
-
-
-
- &newFolderDialog.title;
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/mailnews/base/content/newmailalert.xhtml b/mailnews/base/content/newmailalert.xhtml
index d9a5d76272..1346be9c9a 100644
--- a/mailnews/base/content/newmailalert.xhtml
+++ b/mailnews/base/content/newmailalert.xhtml
@@ -6,32 +6,50 @@
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
diff --git a/mailnews/base/content/newsError.xhtml b/mailnews/base/content/newsError.xhtml
index 8f45568e8c..519d7c3897 100644
--- a/mailnews/base/content/newsError.xhtml
+++ b/mailnews/base/content/newsError.xhtml
@@ -3,23 +3,29 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
- %htmlDTD;
-
+%htmlDTD;
+
- %netErrorDTD;
-]>
+%netErrorDTD; ]>
- &newsError.title;
-
@@ -32,9 +38,13 @@
- &serverResponded.title;
+ &serverResponded.title;
&articleExpired.title;
- &trySearching.title; <
+
+ &trySearching.title; <
@@ -42,6 +52,6 @@
the "errorTryAgain" id to piggyback on toolkit's CSS. -->
&removeExpiredArticles.title;
-
+
diff --git a/mailnews/base/content/renameFolderDialog.xhtml b/mailnews/base/content/renameFolderDialog.xhtml
index 54489dae3e..f81ba88db0 100644
--- a/mailnews/base/content/renameFolderDialog.xhtml
+++ b/mailnews/base/content/renameFolderDialog.xhtml
@@ -1,4 +1,5 @@
-
+
+
@@ -9,32 +10,54 @@
-
-
- &renameFolderDialog.title;
-
-
-
- &rename.label;
-
-
+
+
+ &renameFolderDialog.title;
+
+
+ &rename.label;
+
+
diff --git a/mailnews/base/content/shutdownWindow.xhtml b/mailnews/base/content/shutdownWindow.xhtml
index 076f0b0633..32237dc44f 100644
--- a/mailnews/base/content/shutdownWindow.xhtml
+++ b/mailnews/base/content/shutdownWindow.xhtml
@@ -9,31 +9,45 @@
-
-
-
-
-
-
-
-
+
+
-
+
+
-
-
-
-
+
+
+
+
diff --git a/mailnews/base/content/subscribe.xhtml b/mailnews/base/content/subscribe.xhtml
index 32942797e2..f6fa0c113f 100644
--- a/mailnews/base/content/subscribe.xhtml
+++ b/mailnews/base/content/subscribe.xhtml
@@ -13,164 +13,221 @@
-
-
- &subscribeDialog.title;
-
-
-
-
-
-
-
-
- &subscribeDialog.title;
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
+
+
+
diff --git a/mailnews/base/content/virtualFolderListEdit.xhtml b/mailnews/base/content/virtualFolderListEdit.xhtml
index 9b9095002c..326892734a 100644
--- a/mailnews/base/content/virtualFolderListEdit.xhtml
+++ b/mailnews/base/content/virtualFolderListEdit.xhtml
@@ -12,49 +12,73 @@
-
-
- &virtualFolderListTitle.title;
-
-
-
-
-
-
-
- &virtualFolderListTitle.title;
+
+
+
+
+
+
+
+ &virtualFolderDesc.label;
-
-
-
-
-
-
+ &virtualFolderDesc.label;
+
+
+
+
+
+
diff --git a/mailnews/base/prefs/content/SmtpServerEdit.xhtml b/mailnews/base/prefs/content/SmtpServerEdit.xhtml
index a680e2687c..d0bbda97c6 100644
--- a/mailnews/base/prefs/content/SmtpServerEdit.xhtml
+++ b/mailnews/base/prefs/content/SmtpServerEdit.xhtml
@@ -8,141 +8,201 @@
-
-
- &smtpEditTitle.label;
-
-
-
-
-
-
- &smtpEditTitle.label;
+
+
+
+
+
+
+
-
-
- &settings.caption;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &security.caption;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ &settings.caption;
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+ prefstring="mail.smtpserver.%serverkey%.port"
+ />
+
+
+ &security.caption;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mailnews/base/prefs/content/am-archiveoptions.xhtml b/mailnews/base/prefs/content/am-archiveoptions.xhtml
index f2994627f4..231f2d0063 100644
--- a/mailnews/base/prefs/content/am-archiveoptions.xhtml
+++ b/mailnews/base/prefs/content/am-archiveoptions.xhtml
@@ -9,101 +9,131 @@
-
-
- &dialogTitle.label;
-
-
-
-
-
- &archiveGranularityPrefix.label;
-
-
- &dialogTitle.label;
+
+
+
+
+
+ &archiveGranularityPrefix.label;
+
+
+
-
- &archiveExample.label;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ &archiveExample.label;
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/mailnews/base/prefs/content/am-identities-list.xhtml b/mailnews/base/prefs/content/am-identities-list.xhtml
index bc4696d865..3faa052f0d 100644
--- a/mailnews/base/prefs/content/am-identities-list.xhtml
+++ b/mailnews/base/prefs/content/am-identities-list.xhtml
@@ -7,61 +7,94 @@
-
-
- <!-- identity-list-title -->
-
-
-
-
-<!-- identity-list-title -->
+
+
+
+
+
-
+
+
-
-
+
+
-&identitiesListManageDesc.label;
+ &identitiesListManageDesc.label;
-
-
+
-
-
-
-
+
+
+
+
+
diff --git a/mailnews/base/prefs/content/am-junk.xhtml b/mailnews/base/prefs/content/am-junk.xhtml
index 45cbeb2795..af20935946 100644
--- a/mailnews/base/prefs/content/am-junk.xhtml
+++ b/mailnews/base/prefs/content/am-junk.xhtml
@@ -8,230 +8,286 @@
-
+
%brandDTD;
-%junkMailDTD;
-]>
+%junkMailDTD; ]>
-
-
- &junkSettings.label;
-
-
-
-
-
-
-
- &junkSettings.label;
+
+
+
+
+
+
+
+
-
- &junkClassification.label;
-
- &trainingDescription.label;
-
-
- &whitelistHeader.label;
-
-
-
-
-
-
-
- &ispHeadersWarning.label;
-
-
-
-
-
-
- &junkActions.label;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ &junkClassification.label;
-
-
-
-
+ &trainingDescription.label;
+
+
+ &whitelistHeader.label;
+
+
+
+
+
+
+
+ &ispHeadersWarning.label;
+
+
+
+
+
+ &junkActions.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mailnews/base/prefs/content/am-main.xhtml b/mailnews/base/prefs/content/am-main.xhtml
index f74d906804..09f5453fb8 100644
--- a/mailnews/base/prefs/content/am-main.xhtml
+++ b/mailnews/base/prefs/content/am-main.xhtml
@@ -5,222 +5,340 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
-
-
+
+
+
+
+ &identityTitle.label;
+ &identityDesc.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
- &identityTitle.label;
- &identityDesc.label;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/mailnews/base/prefs/content/am-offline.xhtml b/mailnews/base/prefs/content/am-offline.xhtml
index 338e9e6ab2..0d3a12e396 100644
--- a/mailnews/base/prefs/content/am-offline.xhtml
+++ b/mailnews/base/prefs/content/am-offline.xhtml
@@ -7,175 +7,344 @@
-
-
-
-
-
-
-
-
-
-
+
+
-
- &syncGroupTitle.label;
-
-
- &allFoldersOfflineNote.label;
-
-
-
-
-
-
-
-
-
-
-
-
- &diskspaceGroupTitle.label;
-
- &doNotDownloadImap.label;
- &doNotDownloadNntp.label;
- &doNotDownloadPop3Movemail.label;
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+ &syncGroupTitle.label;
-
-
+
+
- &retentionCleanup.label;
- &retentionCleanupImap.label;
- &retentionCleanupPop.label;
+ &allFoldersOfflineNote.label;
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+ &diskspaceGroupTitle.label;
+
+ &doNotDownloadImap.label;
+ &doNotDownloadNntp.label;
+ &doNotDownloadPop3Movemail.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &retentionCleanup.label;
+ &retentionCleanupImap.label;
+ &retentionCleanupPop.label;
+
+
+
+
+
+
+
+
+
+
-
-
+ checked="true"
+ />
+
+
+
+
+
+
-
-
-
-
+
diff --git a/mailnews/base/prefs/content/am-server-advanced.xhtml b/mailnews/base/prefs/content/am-server-advanced.xhtml
index 08fe8512b6..b8349af38f 100644
--- a/mailnews/base/prefs/content/am-server-advanced.xhtml
+++ b/mailnews/base/prefs/content/am-server-advanced.xhtml
@@ -9,150 +9,214 @@
-
-
- &serverAdvanced.label;
-
-
-
-
-
-
- &serverAdvanced.label;
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
- &namespaceDesc.label;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &pop3DeferringDesc.label;
-
-
-
-
- &namespaceDesc.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &pop3DeferringDesc.label;
+
+
-
-
-
+
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/mailnews/base/prefs/content/am-server.xhtml b/mailnews/base/prefs/content/am-server.xhtml
index 35f1f3444d..b41e93e290 100644
--- a/mailnews/base/prefs/content/am-server.xhtml
+++ b/mailnews/base/prefs/content/am-server.xhtml
@@ -7,463 +7,668 @@
-
-%trashDTD;
-]>
+
+%trashDTD; ]>
-
-
- &serverSettings.label;
-
-
-
-
-
-
-
-
-
-
- &serverSettings.label;
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
- &securitySettings.label;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ &securitySettings.label;
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- &serverSettings.label;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &serverSettings.label;
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &messageStorage.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &messageStorage.label;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/mailnews/base/prefs/content/am-serverwithnoidentities.xhtml b/mailnews/base/prefs/content/am-serverwithnoidentities.xhtml
index 51cf4f74bc..1cdc36550f 100644
--- a/mailnews/base/prefs/content/am-serverwithnoidentities.xhtml
+++ b/mailnews/base/prefs/content/am-serverwithnoidentities.xhtml
@@ -5,106 +5,148 @@
-%accountNoIdentDTD;
+
+%accountNoIdentDTD;
%accountServerTopDTD;
]>
-
-
-
&accountTitle.label;
-
-
-
-
-
-
-
-
-
+
+
+ &accountTitle.label;
+
+
+
+
+
+
+
+
+
- &accountSettingsDesc.label;
-
- &accountSettingsDesc.label;
+
+
+
+
+
+ &messageStorage.label;
+
+
+
+
+
+
+
+
+
-
-
-
- &messageStorage.label;
-
-
-
-
+ datatype="nsIFile"
+ prefstring="mail.server.%serverkey%.directory"
+ class="uri-element input-inline"
+ aria-labelledby="server.localPath.label"
+ />
+
+
+
+
-
-
-
-
-
-
-
-
-
+
diff --git a/mailnews/base/prefs/content/am-smtp.xhtml b/mailnews/base/prefs/content/am-smtp.xhtml
index 02546442e4..851fb8da3e 100644
--- a/mailnews/base/prefs/content/am-smtp.xhtml
+++ b/mailnews/base/prefs/content/am-smtp.xhtml
@@ -7,88 +7,115 @@
-
-
-
&smtpServer.label;
-
-
-
-
-
-
- &smtpServer.label;
+
+
+
+
+
+
+
-
+
+
- &smtpDescription.label;
- &smtpDescription.label;
+
-
+
-
-
+
+
+
-
-
- &serverDescription.label;
-
-
- &serverName.label;
-
-
- &serverPort.label;
-
-
- &userName.label;
-
-
- &authMethod.label;
-
-
- &connectionSecurity.label;
-
-
-
+
+
+
+ &serverDescription.label;
+
+
+ &serverName.label;
+
+
+ &serverPort.label;
+
+
+ &userName.label;
+
+
+ &authMethod.label;
+
+
+ &connectionSecurity.label;
+
+
+
diff --git a/mailnews/base/prefs/content/converterDialog.xhtml b/mailnews/base/prefs/content/converterDialog.xhtml
index cee11522af..40944fd556 100644
--- a/mailnews/base/prefs/content/converterDialog.xhtml
+++ b/mailnews/base/prefs/content/converterDialog.xhtml
@@ -3,17 +3,18 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
-
+
%brandDTD;
-%converterDTD;
-]>
+%converterDTD; ]>
&converterDialog.title;
-
+
@@ -25,7 +26,9 @@
&converterDialog.cancelButton;
-
+
&converterDialog.continueButton;
&sendDialog.title;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ &sendDialog.title;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mailnews/export/content/exportDialog.xhtml b/mailnews/export/content/exportDialog.xhtml
index 681ef7ff76..9cc28fb064 100644
--- a/mailnews/export/content/exportDialog.xhtml
+++ b/mailnews/export/content/exportDialog.xhtml
@@ -7,32 +7,43 @@
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/mailnews/extensions/mdn/am-mdn.xhtml b/mailnews/extensions/mdn/am-mdn.xhtml
index 273e881539..3cdf85d9e5 100644
--- a/mailnews/extensions/mdn/am-mdn.xhtml
+++ b/mailnews/extensions/mdn/am-mdn.xhtml
@@ -8,134 +8,224 @@
-
-
- &pane.title;
-
-
-
-
-
-
-
- &pane.title;
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
-
- &receiptArrive.label;
-
-
-
+
+
- &requestMDN.label;
-
-
+ &receiptArrive.label;
+
+
+
-
-
-
-
+ &requestMDN.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/mailnews/extensions/newsblog/am-newsblog.xhtml b/mailnews/extensions/newsblog/am-newsblog.xhtml
index 80487afc08..e6ba0f6a5d 100644
--- a/mailnews/extensions/newsblog/am-newsblog.xhtml
+++ b/mailnews/extensions/newsblog/am-newsblog.xhtml
@@ -6,161 +6,228 @@
-
+
%newsblogDTD;
%feedDTD;
%accountNoIdentDTD;
-%accountServerTopDTD;
-]>
+%accountServerTopDTD; ]>
-
-
- &accountTitle.label;
-
-
-
-
-
-
-
-
-
-
-
-
-
- &accountSettingsDesc.label;
-
-
-
-
-
-
- &serverSettings.label;
-
-
-
-
-
- &newFeedSettings.label;
-
-
-
-
+
+
+ &accountTitle.label;
+
+
+
+
+
+
+
+
+
+
+
+
- &accountSettingsDesc.label;
-
-
-
-
-
-
+
+
+ &serverSettings.label;
+
+
-
-
- &messageStorage.label;
+
+
+ &newFeedSettings.label;
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ &messageStorage.label;
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mailnews/extensions/newsblog/feed-subscriptions.xhtml b/mailnews/extensions/newsblog/feed-subscriptions.xhtml
index 3bb8ee1d32..d2f8cba2bb 100644
--- a/mailnews/extensions/newsblog/feed-subscriptions.xhtml
+++ b/mailnews/extensions/newsblog/feed-subscriptions.xhtml
@@ -13,259 +13,361 @@
-
- %feedDTD;
-
- %newsblogDTD;
-]>
+
+%feedDTD;
+
+%newsblogDTD; ]>
-
-
- &feedSubscriptions.label;
-
-
-
-
+
+
+ &feedSubscriptions.label;
+
+
+
+
-
-
-
+
+
+
-
+ seltype="single"
+ >
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/mailnews/extensions/newsblog/feedAccountWizard.xhtml b/mailnews/extensions/newsblog/feedAccountWizard.xhtml
index 3494513a3b..ef1be03dd7 100644
--- a/mailnews/extensions/newsblog/feedAccountWizard.xhtml
+++ b/mailnews/extensions/newsblog/feedAccountWizard.xhtml
@@ -8,69 +8,88 @@
-
- %accountDTD;
-
- %newsblogDTD;
-
- %imDTD;
-]>
+
+%accountDTD;
+
+%newsblogDTD;
+
+%imDTD; ]>
-
-
- &feedWindowTitle.label;
-
-
-
-
-
-
- &accnameDesc.label;
-
-
-
-
+
+
+ &feedWindowTitle.label;
+
+
+
+
+
+
+ &accnameDesc.label;
+
+
+
+
-
-
-
- &accountSummaryInfo.label;
-
-
-
-
-
-
+
+
+
+ &accountSummaryInfo.label;
+
+
+
+
+
+
diff --git a/mailnews/extensions/smime/certFetchingStatus.xhtml b/mailnews/extensions/smime/certFetchingStatus.xhtml
index 83c712ba89..b82042edda 100644
--- a/mailnews/extensions/smime/certFetchingStatus.xhtml
+++ b/mailnews/extensions/smime/certFetchingStatus.xhtml
@@ -8,21 +8,33 @@
-
-
- &title.label;
-
-
-
-
- &title.label;
+
+
+
+
+ &info.message;
-
-
+ &info.message;
+
+
diff --git a/mailnews/extensions/smime/certpicker.xhtml b/mailnews/extensions/smime/certpicker.xhtml
index 8bcc4bd9ac..c0ff513cb6 100644
--- a/mailnews/extensions/smime/certpicker.xhtml
+++ b/mailnews/extensions/smime/certpicker.xhtml
@@ -5,35 +5,50 @@
-
-%amE2EDTD;
-]>
+
+%amE2EDTD; ]>
-
-
- &certPicker.title;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ &title.label;
-
-
- &title.label;
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mailnews/import/content/fieldMapImport.xhtml b/mailnews/import/content/fieldMapImport.xhtml
index 5f72c40826..8278436321 100644
--- a/mailnews/import/content/fieldMapImport.xhtml
+++ b/mailnews/import/content/fieldMapImport.xhtml
@@ -9,66 +9,96 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
- &fieldMapImport.text;
- &fieldMapImport.text;
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/mailnews/import/content/importDialog.xhtml b/mailnews/import/content/importDialog.xhtml
index 7ce3827b3f..c3147d8c99 100644
--- a/mailnews/import/content/importDialog.xhtml
+++ b/mailnews/import/content/importDialog.xhtml
@@ -8,140 +8,218 @@
-
+
%brandDTD;
-%importDTD;
-]>
+%importDTD; ]>
-
-
- &importDialog.windowTitle;
-
-
-
-
-
-
+
+
+ &importDialog.windowTitle;
+
+
+
+
+
+
+
-
- &importDescription1.label;
- &importDescription2.label;
-
- &select.label;
-
-
-
-
-
-
-
-
-
+
+ &importDescription1.label;
+ &importDescription2.label;
+
+ &select.label;
+
+
-
- &noModulesFound.label;
+
-
-
-
-
-
+
+
+
+
+
+ &noModulesFound.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/mailnews/jsaccount/readme.html b/mailnews/jsaccount/readme.html
index 066fc0a81a..cb1b875dbe 100644
--- a/mailnews/jsaccount/readme.html
+++ b/mailnews/jsaccount/readme.html
@@ -6,38 +6,50 @@
Overview
- JsAccount is a technology that allows message account types to be created
+
+ JsAccount is a technology that allows message account types to be created
in Mozilla Mailnews code using JavaScript. Although this is primarily
targeted at allowing extensions to create new accounts, it might also be
useful as a bridge to convert existing account types from being C++ based
- to JavaScript based.
+ to JavaScript based.
+
Existing C++-based architecture of mailnews accounts
- In mailnews code, an account type is a set of classes that allow
+
+ In mailnews code, an account type is a set of classes that allow
implementation of a messaging particular protocol. The account type is
given a short string identifier ("imap", "news", "pop3") and is then used
to create objects of the appropriate type by appending that string to the
end of a base XPCOM contractID. So, for example, to create an imap server,
you generate a contractID using a base ID,
- "@mozilla.org/messenger/server;1?type=", then append "imap" to get:
+ "@mozilla.org/messenger/server;1?type=", then append "imap" to get:
+
@mozilla.org/messenger/server;1?type=imap
- In the C++ code, there is a base object implementing shared
- functionality. An account-specific class inherits that base functionality,
- then extends it to represent the account-specific behavior that is needed.
- This same basic concept is used to represent a whole series of classes
- that are necessary to implement a specific mailnews account type.
- For the server example, there is a base class named
+
+ In the C++ code, there is a base object implementing shared functionality.
+ An account-specific class inherits that base functionality, then extends
+ it to represent the account-specific behavior that is needed. This same
+ basic concept is used to represent a whole series of classes that are
+ necessary to implement a specific mailnews account type.
+
+
+ For the server example, there is a base class named
nsMsgIncomingServer.cpp that implements that base interface
nsIMsgIncomingServer.idl. For imap, there is a specific class
nsImapIncomingServer.cpp that inherits from nsMsgIncomingServer.cpp,
overrides some of the methods in nsIMsgIncomingServer.idl, and also
implements an imap-specific interface nsIImapIncomingServer.idl. All of
- this works fine using C++ inheritance and polymorphism.
- Although JsAccount is intended mostly for mailnews accounts, the same
- basic method of using a base class extended for specific types is also used
- in other ways in mailnews code, including for addressbook types and views.
- The technology may also be applied to those other object types as well.
+ this works fine using C++ inheritance and polymorphism.
+
+
+ Although JsAccount is intended mostly for mailnews accounts, the same
+ basic method of using a base class extended for specific types is also
+ used in other ways in mailnews code, including for addressbook types and
+ views. The technology may also be applied to those other object types as
+ well.
+
Role of JsAccount
- The JavaScript class system works very differently than the C++ system,
+
+ The JavaScript class system works very differently than the C++ system,
and you cannot use normal language constructs to override a C++ class with
a JavaScript class. What JsAccount allows you to do is to create XPCOM
objects in JavaScript, and use those objects to override or extend the
@@ -46,10 +58,10 @@
code. This allows you to create a new account using JavaScript code, while
using the same base class functionality that is used by the core C++
account types. Thus a new account type may be created in JavaScript-based
- extension. The technology may also be used to create JavaScript
- versions of existing account types in an incremental manner, slowly
- converting methods from C++ to JavaScript.
-
+
diff --git a/mailnews/news/content/downloadheaders.xhtml b/mailnews/news/content/downloadheaders.xhtml
index f099365704..f5fe7635e3 100644
--- a/mailnews/news/content/downloadheaders.xhtml
+++ b/mailnews/news/content/downloadheaders.xhtml
@@ -9,42 +9,72 @@
-
+
+
-
-
-
-
diff --git a/mailnews/search/content/viewLog.xhtml b/mailnews/search/content/viewLog.xhtml
index d24adfbe0f..66d2671df9 100644
--- a/mailnews/search/content/viewLog.xhtml
+++ b/mailnews/search/content/viewLog.xhtml
@@ -7,46 +7,59 @@
-
-
- &viewLog.title;
-
-
-
-
-
-
- &viewLogInfo.text;
-
-
-
-
-
-
-
+
+
+ &viewLog.title;
+
+
+
+
+
+ &viewLogInfo.text;
+
+
+
+
+
+
+
+