diff --git a/_data/comm-beta.json b/_data/comm-beta.json
index 64420531..5930bba6 100644
--- a/_data/comm-beta.json
+++ b/_data/comm-beta.json
@@ -205,6 +205,9 @@
     "calendar-invitations-accept.label",
     "calendar-invitations-decline.label"
   ],
+  "calendar/calendar/calendar-item-summary.ftl": [
+    "header-comment.value"
+  ],
   "calendar/calendar/calendar-itip-identity-dialog.ftl": [
     "calendar-itip-identity-dialog-box-title",
     "calendar-itip-identity-warning-body",
@@ -2597,7 +2600,7 @@
     "gtalk-protocol-name",
     "odnoklassniki-protocol-name",
     "gtalk-disabled",
-    "odnoklassniki-username-hint",
+    "odnoklassniki-disabled",
     "command-join3",
     "command-part2",
     "command-topic",
@@ -3657,8 +3660,8 @@
     "openpgpKey.accesskey"
   ],
   "mail/chrome/messenger/am-smime.properties": [
-    "NoSenderSigningCert",
-    "NoSenderEncryptionCert",
+    "SenderSigningCertInvalid",
+    "SenderEncryptionCertInvalid",
     "MissingRecipientEncryptionCert",
     "ErrorEncryptMail",
     "ErrorCanNotSignMail",
@@ -4694,16 +4697,6 @@
     "watchThreadMenu.key",
     "tagMenu.label",
     "tagMenu.accesskey",
-    "tagCmd0.key",
-    "tagCmd1.key",
-    "tagCmd2.key",
-    "tagCmd3.key",
-    "tagCmd4.key",
-    "tagCmd5.key",
-    "tagCmd6.key",
-    "tagCmd7.key",
-    "tagCmd8.key",
-    "tagCmd9.key",
     "markMenu.label",
     "markMenu.accesskey",
     "toggleReadCmd.key",
@@ -4864,10 +4857,6 @@
     "appmenuNewMsgCmd.label",
     "appmenuNewContactCmd.label",
     "appmenuToolbarLayout.label",
-    "addNewTag.label",
-    "addNewTag.accesskey",
-    "manageTags.label",
-    "manageTags.accesskey",
     "folderNameColumn.label",
     "folderUnreadColumn.label",
     "folderTotalColumn.label",
@@ -5083,7 +5072,6 @@
     "markFolderRead",
     "markNewsgroupRead",
     "folderProperties",
-    "newTag",
     "advanceNextPrompt",
     "titleNewsPreHost",
     "replyToSender",
@@ -5172,13 +5160,6 @@
     "templatesFolderName",
     "outboxFolderName",
     "archivesFolderName",
-    "mailnews.tags.remove",
-    "mailnews.labels.description.1",
-    "mailnews.labels.description.2",
-    "mailnews.labels.description.3",
-    "mailnews.labels.description.4",
-    "mailnews.labels.description.5",
-    "mailnews.tags.format",
     "mailnews.search_date_format",
     "mailnews.search_date_separator",
     "mailnews.search_date_leading_zeros",
@@ -5250,8 +5231,6 @@
     "confirmSavedSearchDeleteMessage",
     "passwordPrompt",
     "passwordTitle",
-    "tagExists",
-    "editTagTitle",
     "editVirtualFolderPropertiesTitle",
     "alertNoSearchFoldersSelected",
     "byteAbbreviation2",
@@ -7804,12 +7783,14 @@
     "atn-addons-heading-search-input.placeholder",
     "atn-addons-heading-search-button.title",
     "atn-addons-heading-search-button.aria-label",
-    "details-notification-suppressed-esr.message"
+    "details-notification-suppressed-esr-2.message"
   ],
   "mail/messenger/aboutDialog.ftl": [
     "about-update-whats-new",
     "about-dialog-title",
     "release-notes-link",
+    "about-dialog-meadow-logo.alt",
+    "about-dialog-meadow-logo.title",
     "update-internal-error",
     "update-check-for-updates-button",
     "update-check-for-updates-button.accesskey",
@@ -8180,14 +8161,32 @@
     "account-hub-email-manually-configure-button",
     "account-hub-email-continue-button",
     "account-hub-email-confirm-button",
-    "account-hub-result-incoming-server-legend",
-    "account-hub-result-incoming-server-legend.title",
-    "account-hub-result-outgoing-server-legend",
-    "account-hub-result-outgoing-server-legend.title",
+    "account-hub-result-incoming-legend",
+    "account-hub-result-outgoing-legend",
+    "account-hub-all-servers-legend",
     "account-hub-protocol-label",
     "account-hub-result-hostname-label",
     "account-hub-result-hostname-label.title",
     "account-hub-result-socket-type-label",
+    "account-hub-servers-username-label",
+    "account-hub-result-server-label",
+    "account-hub-result-port-label",
+    "account-hub-result-security-label",
+    "account-hub-result-authentication-type-label",
+    "account-hub-result-auth-none",
+    "account-hub-result-auth-none.title",
+    "account-hub-result-auth-password",
+    "account-hub-result-auth-password.title",
+    "account-hub-result-auth-encrypted-password",
+    "account-hub-result-auth-encrypted-password.title",
+    "account-hub-result-auth-gssapi",
+    "account-hub-result-auth-gssapi.title",
+    "account-hub-result-auth-ntlm",
+    "account-hub-result-auth-ntlm.title",
+    "account-hub-result-auth-external",
+    "account-hub-result-auth-external.title",
+    "account-hub-result-auth-oauth2",
+    "account-hub-result-auth-oauth2.title",
     "account-hub-on-port-label",
     "account-hub-auto-description",
     "account-hub-ssl-label",
@@ -8212,7 +8211,7 @@
     "account-hub-email-setup-header",
     "account-hub-email-setup-incoming",
     "account-hub-email-setup-outgoing",
-    "account-hub-email-config-found",
+    "account-hub-email-connect-settings",
     "account-hub-email-enter-password",
     "account-hub-email-sync-accounts",
     "account-hub-test-configuration",
@@ -8225,15 +8224,18 @@
     "account-hub-result-graph-description",
     "account-hub-result-exchange-description",
     "account-hub-result-ews-text",
+    "account-hub-result-ews-expanded-text",
+    "account-hub-result-graph-expanded-text",
     "account-hub-result-recommended-label",
     "account-hub-result-addon-label",
     "account-hub-edit-configuration",
-    "account-hub-config-success",
-    "account-hub-config-success-exchange",
-    "account-hub-config-success-guess",
-    "account-hub-config-success-disk",
-    "account-hub-config-success-isp",
-    "account-hub-config-success-unknown",
+    "account-hub-config-success-title",
+    "account-hub-config-success-description-db",
+    "account-hub-config-success-description-exchange",
+    "account-hub-config-success-description-guess",
+    "account-hub-config-success-description-disk",
+    "account-hub-config-success-description-isp",
+    "account-hub-config-success-description-read-more",
     "account-hub-password-info",
     "account-hub-creating-account",
     "account-hub-sync-accounts-found",
@@ -8345,8 +8347,11 @@
     "account-hub-success-addon",
     "account-hub-success-half-manual",
     "account-hub-result-no-encryption",
+    "account-hub-result-no-encryption.title",
     "account-hub-result-ssl",
+    "account-hub-result-ssl.title",
     "account-hub-result-starttls",
+    "account-hub-result-starttls.title",
     "account-hub-credentials-wrong",
     "account-hub-find-settings-failed",
     "account-hub-exchange-config-unverifiable",
@@ -8362,7 +8367,9 @@
     "account-hub-address-books-button",
     "account-hub-calendars-button",
     "account-hub-thundermail-button",
-    "account-hub-thundermail-divider-text"
+    "account-hub-thundermail-divider-text",
+    "account-hub-manual-config-incoming-legend",
+    "account-hub-manual-config-outgoing-legend"
   ],
   "mail/messenger/accountcreation/accountSetup.ftl": [
     "account-setup-tab-title",
@@ -8551,7 +8558,11 @@
     "gloda-indexing-status-exact",
     "gloda-indexing-folder-status-exact",
     "gloda-indexed-folder",
-    "gloda-indexed-folder-status"
+    "gloda-indexed-folder-status",
+    "extension-send-activity-live",
+    "extension-send-activity-progress",
+    "extension-send-activity-event",
+    "extension-send-activity-event-status"
   ],
   "mail/messenger/activityFeedback.ftl": [
     "looking-for-messages-account",
@@ -9061,17 +9072,18 @@
     "cert-error-expired",
     "cert-error-not-yet-valid",
     "cert-error-untrusted-default",
+    "cert-error-ssl-connection-error",
     "cert-error-inline-domain-mismatch.title",
     "cert-error-inline-expired.title",
     "cert-error-inline-not-yet-valid.title",
     "cert-error-inline-untrusted-default.title",
+    "cert-error-inline-ssl-connection-error.title",
     "certificate-check-test-button",
     "certificate-check-view-button",
     "certificate-check-add-exception-button",
     "certificate-check-remove-exception-button",
     "certificate-checking",
     "certificate-test-success",
-    "certificate-test-failure",
     "certificate-check-exception-added",
     "certificate-check-exception-removed",
     "certificate-check-exception-exists"
@@ -9156,6 +9168,8 @@
     "webext-perms-description-messagesDelete",
     "webext-perms-description-messagesRead2",
     "webext-perms-description-messagesUpdate",
+    "webext-perms-description-messages-send",
+    "webext-perms-description-messages-save",
     "webext-perms-description-messagesTags",
     "webext-perms-description-messagesTagsList",
     "webext-perms-description-sensitiveDataUpload",
@@ -9169,8 +9183,8 @@
   "mail/messenger/extensionsUI.ftl": [
     "webext-experiment-warning",
     "webext-perms-learn-more",
-    "webext-install-suppressed-message",
-    "webext-install-suppressed-details",
+    "webext-install-suppressed-message-2",
+    "webext-install-suppressed-details-2",
     "addon-post-install-message"
   ],
   "mail/messenger/feeds.ftl": [
@@ -9788,7 +9802,21 @@
     "ignored-subtheads-feedback",
     "attachment-view-attachment-count",
     "allow-remote-content-resource.label",
-    "remote-content-option-allow-all.label"
+    "remote-content-option-allow-all.label",
+    "tags-label-1",
+    "tags-label-2",
+    "tags-label-3",
+    "tags-label-4",
+    "tags-label-5",
+    "tags-add-new.label",
+    "tags-add-new.accesskey",
+    "tags-manage.label",
+    "tags-manage.accesskey",
+    "tags-remove-all.label",
+    "tags-remove-all.accesskey",
+    "tags-format-with-accesskey.label",
+    "tags-format-with-accesskey.accesskey",
+    "tags-format-without-accesskey.label"
   ],
   "mail/messenger/messengercompose/messengercompose.ftl": [
     "compose-send-format-menu.label",
@@ -10033,6 +10061,10 @@
     "try-searching-prefix",
     "remove-expired-articles-label"
   ],
+  "mail/messenger/oauth.ftl": [
+    "oauth-reauthorize-title",
+    "oauth-reauthorize-description"
+  ],
   "mail/messenger/oauthResultPage.ftl": [
     "oauth-result-wordmark-alt",
     "oauth-result-footer-text",
@@ -11182,10 +11214,12 @@
   ],
   "mail/messenger/preferences/new-tag.ftl": [
     "tag-dialog-title",
+    "tag-edit-dialog-title",
     "tag-name-label.value",
     "tag-name-label.accesskey",
     "tag-color-label.value",
-    "tag-color-label.accesskey"
+    "tag-color-label.accesskey",
+    "tag-already-exists"
   ],
   "mail/messenger/preferences/notifications.ftl": [
     "notifications-dialog-title",
@@ -12221,7 +12255,9 @@
     "configured-cert-ok-enc",
     "configured-cert-ok-sig",
     "configured-cert-failure-detail",
-    "configured-cert-failure"
+    "configured-cert-failure",
+    "configured-cert-failure-use-anyway-detail-v2",
+    "configured-cert-failure-use-anyway-v2"
   ],
   "mail/messenger/syncAccounts.ftl": [
     "sync-verification-sent-title",
diff --git a/_data/comm.json b/_data/comm.json
index 5930bba6..3abc6349 100644
--- a/_data/comm.json
+++ b/_data/comm.json
@@ -3726,75 +3726,6 @@
     "productHelpMac.commandkey",
     "productHelpMac.modifiers"
   ],
-  "mail/chrome/messenger/charsetTitles.properties": [
-    "iso-8859-1.title",
-    "iso-8859-2.title",
-    "iso-8859-3.title",
-    "iso-8859-4.title",
-    "iso-8859-10.title",
-    "iso-8859-13.title",
-    "iso-8859-14.title",
-    "iso-8859-15.title",
-    "iso-8859-16.title",
-    "windows-1250.title",
-    "windows-1252.title",
-    "windows-1254.title",
-    "windows-1257.title",
-    "macintosh.title",
-    "x-mac-ce.title",
-    "x-mac-turkish.title",
-    "x-mac-croatian.title",
-    "x-mac-romanian.title",
-    "x-mac-icelandic.title",
-    "iso-2022-jp.title",
-    "shift_jis.title",
-    "euc-jp.title",
-    "big5.title",
-    "big5-hkscs.title",
-    "gb2312.title",
-    "gbk.title",
-    "euc-kr.title",
-    "utf-7.title",
-    "utf-8.title",
-    "utf-16.title",
-    "utf-16le.title",
-    "utf-16be.title",
-    "iso-8859-5.title",
-    "windows-1251.title",
-    "x-mac-cyrillic.title",
-    "x-mac-ukrainian.title",
-    "koi8-r.title",
-    "koi8-u.title",
-    "iso-8859-7.title",
-    "windows-1253.title",
-    "x-mac-greek.title",
-    "windows-1258.title",
-    "windows-874.title",
-    "iso-8859-6.title",
-    "iso-8859-8.title",
-    "iso-8859-8-i.title",
-    "windows-1255.title",
-    "windows-1256.title",
-    "x-user-defined.title",
-    "ibm866.title",
-    "gb18030.title",
-    "x-mac-arabic.title",
-    "x-mac-farsi.title",
-    "x-mac-hebrew.title",
-    "x-mac-devanagari.title",
-    "x-mac-gujarati.title",
-    "x-mac-gurmukhi.title",
-    "chardet.off.title",
-    "chardet.universal_charset_detector.title",
-    "chardet.ja_parallel_state_machine.title",
-    "chardet.ko_parallel_state_machine.title",
-    "chardet.zhtw_parallel_state_machine.title",
-    "chardet.zhcn_parallel_state_machine.title",
-    "chardet.zh_parallel_state_machine.title",
-    "chardet.cjk_parallel_state_machine.title",
-    "chardet.ruprob.title",
-    "chardet.ukprob.title"
-  ],
   "mail/chrome/messenger/chat.dtd": [
     "onlineContactsHeader.label",
     "offlineContactsHeader.label",
@@ -3945,47 +3876,6 @@
     "deleteContactTitle",
     "deleteContactMessage"
   ],
-  "mail/chrome/messenger/folderProps.dtd": [
-    "folderProps.windowtitle.label",
-    "generalInfo.label",
-    "folderRebuildSummaryFileTip2.label",
-    "folderRebuildSummaryFile2.label",
-    "folderRebuildSummaryFile2.accesskey",
-    "folderRebuildSummaryFile.explanation",
-    "folderIncludeInGlobalSearch.label",
-    "folderIncludeInGlobalSearch.accesskey",
-    "folderSynchronizationTab.label",
-    "folderCheckForNewMessages2.label",
-    "folderCheckForNewMessages2.accesskey",
-    "offlineFolder.check.label",
-    "offlineFolder.check.accesskey",
-    "offlineFolder.button.label",
-    "offlineFolder.button.accesskey",
-    "selectofflineNewsgroup.check.label",
-    "selectofflineNewsgroup.check.accesskey",
-    "offlineNewsgroup.button.label",
-    "offlineNewsgroup.button.accesskey",
-    "folderProps.name.label",
-    "folderProps.name.accesskey",
-    "folderProps.color.label",
-    "folderProps.color.accesskey",
-    "folderProps.reset.tooltip",
-    "folderProps.location.label",
-    "folderProps.location.accesskey",
-    "folderSharingTab.label",
-    "privileges.button.label",
-    "privileges.button.accesskey",
-    "permissionsDesc.label",
-    "folderOtherUsers.label",
-    "folderType.label",
-    "folderQuotaTab.label",
-    "folderQuotaUsage.label",
-    "folderQuotaStatus.label",
-    "numberOfMessages.label",
-    "numberUnknown.label",
-    "sizeOnDisk.label",
-    "sizeUnknown.label"
-  ],
   "mail/chrome/messenger/folderpane.dtd": [
     "nameColumn.label",
     "unreadColumn.label",
@@ -5231,8 +5121,6 @@
     "confirmSavedSearchDeleteMessage",
     "passwordPrompt",
     "passwordTitle",
-    "editVirtualFolderPropertiesTitle",
-    "alertNoSearchFoldersSelected",
     "byteAbbreviation2",
     "kiloByteAbbreviation2",
     "megaByteAbbreviation2",
@@ -6824,19 +6712,6 @@
     "MdnDeniedReceipt",
     "MdnFailedReceipt"
   ],
-  "mail/chrome/messenger/newFolderDialog.dtd": [
-    "newFolderDialog.title",
-    "name.label",
-    "name.accesskey",
-    "description.label",
-    "description.accesskey",
-    "folderRestriction1.label",
-    "folderRestriction2.label",
-    "foldersOnly.label",
-    "messagesOnly.label",
-    "accept.label",
-    "accept.accesskey"
-  ],
   "mail/chrome/messenger/offline.properties": [
     "downloadMessagesWindowTitle1",
     "downloadMessagesLabel1",
@@ -7070,31 +6945,6 @@
     "authMethod.label",
     "authMethod.accesskey"
   ],
-  "mail/chrome/messenger/subscribe.dtd": [
-    "subscribeDialog.title",
-    "newGroupsTab.label",
-    "newGroupsTab.accesskey",
-    "refreshButton.label",
-    "refreshButton.accesskey",
-    "stopButton.label",
-    "stopButton.accesskey",
-    "server.label",
-    "server.accesskey",
-    "subscribedHeader.label",
-    "namefield.label",
-    "namefield.accesskey"
-  ],
-  "mail/chrome/messenger/subscribe.properties": [
-    "subscribeLabel-nntp",
-    "subscribeLabel-imap",
-    "currentListTab-nntp.label",
-    "currentListTab-nntp.accesskey",
-    "currentListTab-imap.label",
-    "currentListTab-imap.accesskey",
-    "pleaseWaitString",
-    "offlineState",
-    "errorPopulating"
-  ],
   "mail/chrome/messenger/tabmail.dtd": [
     "closeTab.label",
     "listAllTabs.label",
@@ -7236,27 +7086,6 @@
     "fullZoom.label",
     "fullZoom.accesskey"
   ],
-  "mail/chrome/messenger/virtualFolderListDialog.dtd": [
-    "virtualFolderListTitle.title",
-    "virtualFolderDesc.label"
-  ],
-  "mail/chrome/messenger/virtualFolderProperties.dtd": [
-    "virtualFolderProperties.title",
-    "name.label",
-    "name.accesskey",
-    "description.label",
-    "description.accesskey",
-    "searchTermCaption.label",
-    "folderSelectionCaption.label",
-    "chooseFoldersButton.label",
-    "chooseFoldersButton.accesskey",
-    "searchOnline.label",
-    "searchOnline.accesskey",
-    "newFolderButton.label",
-    "newFolderButton.accesskey",
-    "editFolderButton.label",
-    "editFolderButton.accesskey"
-  ],
   "mail/chrome/mozldap/ldap.properties": [
     "authPromptTitle",
     "authPromptText",
@@ -8173,20 +8002,20 @@
     "account-hub-result-port-label",
     "account-hub-result-security-label",
     "account-hub-result-authentication-type-label",
-    "account-hub-result-auth-none",
-    "account-hub-result-auth-none.title",
-    "account-hub-result-auth-password",
-    "account-hub-result-auth-password.title",
-    "account-hub-result-auth-encrypted-password",
-    "account-hub-result-auth-encrypted-password.title",
-    "account-hub-result-auth-gssapi",
-    "account-hub-result-auth-gssapi.title",
-    "account-hub-result-auth-ntlm",
-    "account-hub-result-auth-ntlm.title",
-    "account-hub-result-auth-external",
-    "account-hub-result-auth-external.title",
-    "account-hub-result-auth-oauth2",
-    "account-hub-result-auth-oauth2.title",
+    "account-hub-result-authentication-none",
+    "account-hub-result-authentication-none.title",
+    "account-hub-result-authentication-password",
+    "account-hub-result-authentication-password.title",
+    "account-hub-result-authentication-encrypted-password",
+    "account-hub-result-authentication-encrypted-password.title",
+    "account-hub-result-authentication-gssapi",
+    "account-hub-result-authentication-gssapi.title",
+    "account-hub-result-authentication-ntlm",
+    "account-hub-result-authentication-ntlm.title",
+    "account-hub-result-authentication-external",
+    "account-hub-result-authentication-external.title",
+    "account-hub-result-authentication-oauth2",
+    "account-hub-result-authentication-oauth2.title",
     "account-hub-on-port-label",
     "account-hub-auto-description",
     "account-hub-ssl-label",
@@ -8346,12 +8175,12 @@
     "account-hub-installing-addon",
     "account-hub-success-addon",
     "account-hub-success-half-manual",
-    "account-hub-result-no-encryption",
-    "account-hub-result-no-encryption.title",
-    "account-hub-result-ssl",
-    "account-hub-result-ssl.title",
-    "account-hub-result-starttls",
-    "account-hub-result-starttls.title",
+    "account-hub-result-security-no-encryption",
+    "account-hub-result-security-no-encryption.title",
+    "account-hub-result-security-ssl",
+    "account-hub-result-security-ssl.title",
+    "account-hub-result-security-starttls",
+    "account-hub-result-security-starttls.title",
     "account-hub-credentials-wrong",
     "account-hub-find-settings-failed",
     "account-hub-exchange-config-unverifiable",
@@ -9319,6 +9148,43 @@
     "folder-widgets-no-folders"
   ],
   "mail/messenger/folderprops.ftl": [
+    "folder-props-window-title",
+    "folder-props-general-tab.label",
+    "folder-props-name.value",
+    "folder-props-name.accesskey",
+    "folder-props-color.value",
+    "folder-props-color.accesskey",
+    "folder-props-reset-color.tooltiptext",
+    "folder-props-location.value",
+    "folder-props-location.accesskey",
+    "folder-props-number-of-messages.value",
+    "folder-props-number-unknown.value",
+    "folder-props-size-on-disk.value",
+    "folder-props-size-unknown.value",
+    "folder-props-rebuild-summary.label",
+    "folder-props-rebuild-summary.accesskey",
+    "folder-props-rebuild-summary.tooltiptext",
+    "folder-props-include-in-global-search.label",
+    "folder-props-include-in-global-search.accesskey",
+    "folder-props-check-for-new-messages.label",
+    "folder-props-check-for-new-messages.accesskey",
+    "folder-props-rebuild-summary-explanation",
+    "folder-props-synchronization-tab.label",
+    "folder-props-select-for-offline.label",
+    "folder-props-select-for-offline.accesskey",
+    "folder-props-download-now.label",
+    "folder-props-download-now.accesskey",
+    "folder-props-select-newsgroup-for-offline.label",
+    "folder-props-select-newsgroup-for-offline.accesskey",
+    "folder-props-download-newsgroup-now.label",
+    "folder-props-download-newsgroup-now.accesskey",
+    "folder-props-sharing-tab.label",
+    "folder-props-privileges.label",
+    "folder-props-privileges.accesskey",
+    "folder-props-permissions.value",
+    "folder-props-other-users.value",
+    "folder-props-type.value",
+    "folder-props-quota-tab.label",
     "quota-percent-used"
   ],
   "mail/messenger/glodaFacetView.ftl": [
@@ -9442,6 +9308,25 @@
     "file-new-ldap-addressbook.label",
     "file-new-ldap-addressbook.accesskey"
   ],
+  "mail/messenger/menulist-charsetpicker.ftl": [
+    "charset-utf-8",
+    "charset-big5",
+    "charset-euc-kr",
+    "charset-gbk",
+    "charset-koi8-r",
+    "charset-iso-2022-jp",
+    "charset-iso-8859-1",
+    "charset-iso-8859-2",
+    "charset-iso-8859-7",
+    "charset-windows-874",
+    "charset-windows-1250",
+    "charset-windows-1251",
+    "charset-windows-1252",
+    "charset-windows-1255",
+    "charset-windows-1256",
+    "charset-windows-1257",
+    "charset-windows-1258"
+  ],
   "mail/messenger/messageheader/headerFields.ftl": [
     "message-header-to-list-name",
     "message-header-from-list-name",
@@ -10028,6 +9913,19 @@
     "max-count-exceeded",
     "max-thread-count-exceeded"
   ],
+  "mail/messenger/new-folder-dialog.ftl": [
+    "new-folder-dialog-title",
+    "new-folder-dialog-accept-button.buttonlabelaccept",
+    "new-folder-dialog-accept-button.buttonaccesskeyaccept",
+    "new-folder-name-label",
+    "new-folder-name-label.accesskey",
+    "new-folder-description-label",
+    "new-folder-description-label.accesskey",
+    "new-folder-restriction-1",
+    "new-folder-restriction-2",
+    "new-folder-folders-only.label",
+    "new-folder-messages-only.label"
+  ],
   "mail/messenger/newmailalert.ftl": [
     "new-mail-alert-message"
   ],
@@ -12259,6 +12157,28 @@
     "configured-cert-failure-use-anyway-detail-v2",
     "configured-cert-failure-use-anyway-v2"
   ],
+  "mail/messenger/subscribe.ftl": [
+    "subscribe-window-title",
+    "subscribe-server",
+    "subscribe-server.accesskey",
+    "subscribe-namefield",
+    "subscribe-namefield.accesskey",
+    "subscribe-new-groups-tab.label",
+    "subscribe-new-groups-tab.accesskey",
+    "subscribe-refresh-button.label",
+    "subscribe-refresh-button.accesskey",
+    "subscribe-stop-button.label",
+    "subscribe-stop-button.accesskey",
+    "subscribe-label-nntp",
+    "subscribe-label-imap",
+    "subscribe-current-list-tab-nntp.label",
+    "subscribe-current-list-tab-nntp.accesskey",
+    "subscribe-current-list-tab-imap.label",
+    "subscribe-current-list-tab-imap.accesskey",
+    "subscribe-please-wait",
+    "subscribe-offline",
+    "subscribe-error-populating"
+  ],
   "mail/messenger/syncAccounts.ftl": [
     "sync-verification-sent-title",
     "sync-verification-sent-body",
@@ -12488,7 +12408,26 @@
     "text-action-find-again.accesskey"
   ],
   "mail/messenger/virtualFolderProperties.ftl": [
-    "virtual-folder-sources-chosen"
+    "virtual-folder-sources-chosen",
+    "virtual-folder-no-search-folders-selected",
+    "virtual-folder-properties-title",
+    "virtual-folder-properties-edit-title",
+    "virtual-folder-name",
+    "virtual-folder-name.accesskey",
+    "virtual-folder-description",
+    "virtual-folder-description.accesskey",
+    "virtual-folder-folder-selection-caption",
+    "virtual-folder-choose-folders-button.label",
+    "virtual-folder-choose-folders-button.accesskey",
+    "virtual-folder-search-online.label",
+    "virtual-folder-search-online.accesskey",
+    "virtual-folder-search-term-caption",
+    "virtual-folder-accept-button-create.label",
+    "virtual-folder-accept-button-create.accesskey",
+    "virtual-folder-accept-button-update.label",
+    "virtual-folder-accept-button-update.accesskey",
+    "virtual-folder-list-title",
+    "virtual-folder-list-desc"
   ],
   "mail/updater/updater.ini": [
     "Strings.TitleText",
diff --git a/mail/messenger/accountcreation/accountHub.ftl b/mail/messenger/accountcreation/accountHub.ftl
index c04cb0c0..4da7c2e6 100644
--- a/mail/messenger/accountcreation/accountHub.ftl
+++ b/mail/messenger/accountcreation/accountHub.ftl
@@ -69,6 +69,20 @@ account-hub-result-server-label = Server:
 account-hub-result-port-label = Port:
 account-hub-result-security-label = Security:
 account-hub-result-authentication-type-label = Authentication:
+account-hub-result-authentication-none = None
+    .title = None
+account-hub-result-authentication-password = Normal Password
+    .title = Normal Password
+account-hub-result-authentication-encrypted-password = Encrypted Password
+    .title = Encrypted Password
+account-hub-result-authentication-gssapi = Kerberos
+    .title = Kerberos
+account-hub-result-authentication-ntlm = NTLM
+    .title = NTLM
+account-hub-result-authentication-external = External
+    .title = External
+account-hub-result-authentication-oauth2 = OAuth2
+    .title = OAuth2
 account-hub-result-auth-none = None
     .title = None
 account-hub-result-auth-password = Normal Password
@@ -180,6 +194,12 @@ account-hub-exchange-label = Your login
 account-hub-installing-addon = Downloading and installing add-on…
 account-hub-success-addon = Successfully installed the add-on
 account-hub-success-half-manual = The following settings were found by probing the given server:
+account-hub-result-security-no-encryption = No Encryption
+    .title = No Encryption
+account-hub-result-security-ssl = SSL/TLS
+    .title = SSL/TLS
+account-hub-result-security-starttls = STARTTLS
+    .title = STARTTLS
 account-hub-result-no-encryption = No Encryption
     .title = No Encryption
 account-hub-result-ssl = SSL/TLS
diff --git a/mail/messenger/folderprops.ftl b/mail/messenger/folderprops.ftl
index 8610bf91..7a83e079 100644
--- a/mail/messenger/folderprops.ftl
+++ b/mail/messenger/folderprops.ftl
@@ -2,8 +2,80 @@
 # 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/.
 
+folder-props-window-title = Properties
+
+## General Information tab
+
+folder-props-general-tab =
+    .label = General Information
+folder-props-name =
+    .value = Name:
+    .accesskey = N
+folder-props-color =
+    .value = Icon Color:
+    .accesskey = I
+folder-props-reset-color =
+    .tooltiptext = Restore default color
+folder-props-location =
+    .value = Location:
+    .accesskey = L
+folder-props-number-of-messages =
+    .value = Number of messages:
+folder-props-number-unknown =
+    .value = unknown
+folder-props-size-on-disk =
+    .value = Size on disk:
+folder-props-size-unknown =
+    .value = unknown
+folder-props-rebuild-summary =
+    .label = Repair Folder
+    .accesskey = R
+    .tooltiptext = Rebuild Summary File Index
+folder-props-include-in-global-search =
+    .label = Include messages in this folder in Global Search results
+    .accesskey = G
+folder-props-check-for-new-messages =
+    .label = When getting new messages for this account, always check this folder
+    .accesskey = c
+folder-props-rebuild-summary-explanation = Sometimes the folder index (.msf) file becomes damaged and messages may appear missing or deleted messages continue showing; repairing the folder may fix these issues.
+
+## Retention tab (see retention.ftl)
+##
+## Synchronization tab
+
+folder-props-synchronization-tab =
+    .label = Synchronization
+folder-props-select-for-offline =
+    .label = Select this folder for offline use
+    .accesskey = S
+folder-props-download-now =
+    .label = Download Now
+    .accesskey = D
+folder-props-select-newsgroup-for-offline =
+    .label = Select this newsgroup for offline use
+    .accesskey = o
+folder-props-download-newsgroup-now =
+    .label = Download Now
+    .accesskey = D
+
+## Sharing tab
+
+folder-props-sharing-tab =
+    .label = Sharing
+folder-props-privileges =
+    .label = Privileges…
+    .accesskey = P
+folder-props-permissions =
+    .value = You have the following permissions:
+folder-props-other-users =
+    .value = Others with access to this folder:
+folder-props-type =
+    .value = Folder Type:
+
 ## Quota tab
 
 # Variables:
 #   $percent (Number) - Usage percentage of the assigned IMAP quota.
 quota-percent-used = { $percent }% full
+folder-props-quota-tab =
+    .label = Quota
diff --git a/mail/messenger/menulist-charsetpicker.ftl b/mail/messenger/menulist-charsetpicker.ftl
new file mode 100644
index 00000000..4b7dd6a2
--- /dev/null
+++ b/mail/messenger/menulist-charsetpicker.ftl
@@ -0,0 +1,21 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+charset-utf-8 = Unicode (UTF-8)
+charset-big5 = Chinese Traditional (Big5)
+charset-euc-kr = Korean (EUC-KR)
+charset-gbk = Chinese Simplified (GBK)
+charset-koi8-r = Cyrillic (KOI8-R)
+charset-iso-2022-jp = Japanese (ISO-2022-JP)
+charset-iso-8859-1 = Western (ISO-8859-1)
+charset-iso-8859-2 = Central European (ISO-8859-2)
+charset-iso-8859-7 = Greek (ISO-8859-7)
+charset-windows-874 = Thai (Windows-874)
+charset-windows-1250 = Central European (Windows-1250)
+charset-windows-1251 = Cyrillic (Windows-1251)
+charset-windows-1252 = Western (Windows-1252)
+charset-windows-1255 = Hebrew (Windows-1255)
+charset-windows-1256 = Arabic (Windows-1256)
+charset-windows-1257 = Baltic (Windows-1257)
+charset-windows-1258 = Vietnamese (Windows-1258)
diff --git a/mail/messenger/new-folder-dialog.ftl b/mail/messenger/new-folder-dialog.ftl
new file mode 100644
index 00000000..250586b7
--- /dev/null
+++ b/mail/messenger/new-folder-dialog.ftl
@@ -0,0 +1,18 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+new-folder-dialog-title = New Folder
+new-folder-dialog-accept-button =
+    .buttonlabelaccept = Create Folder
+    .buttonaccesskeyaccept = r
+new-folder-name-label = Name:
+    .accesskey = n
+new-folder-description-label = Create as a subfolder of:
+    .accesskey = c
+new-folder-restriction-1 = This server restricts folders to two special kinds.
+new-folder-restriction-2 = Allow your new folder to contain:
+new-folder-folders-only =
+    .label = Folders Only
+new-folder-messages-only =
+    .label = Messages Only
diff --git a/mail/messenger/subscribe.ftl b/mail/messenger/subscribe.ftl
new file mode 100644
index 00000000..369d269a
--- /dev/null
+++ b/mail/messenger/subscribe.ftl
@@ -0,0 +1,29 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+subscribe-window-title = Subscribe
+subscribe-server = Account:
+    .accesskey = A
+subscribe-namefield = Show items that contain:
+    .accesskey = O
+subscribe-new-groups-tab =
+    .label = New Groups
+    .accesskey = N
+subscribe-refresh-button =
+    .label = Refresh
+    .accesskey = R
+subscribe-stop-button =
+    .label = Stop
+    .accesskey = T
+subscribe-label-nntp = Select the newsgroups to subscribe to:
+subscribe-label-imap = Select the folders to subscribe to:
+subscribe-current-list-tab-nntp =
+    .label = Current Group List
+    .accesskey = L
+subscribe-current-list-tab-imap =
+    .label = Folder List
+    .accesskey = L
+subscribe-please-wait = Please wait…
+subscribe-offline = You are offline. Items could not be retrieved from the server.
+subscribe-error-populating = Error retrieving items from the server.
diff --git a/mail/messenger/virtualFolderProperties.ftl b/mail/messenger/virtualFolderProperties.ftl
index 96d83d18..b0916185 100644
--- a/mail/messenger/virtualFolderProperties.ftl
+++ b/mail/messenger/virtualFolderProperties.ftl
@@ -2,6 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+
+## Strings for the virtual folder properties dialog, which is used for both
+## creating and editing saved search folders.
+
 # Variables:
 #   $count - number of chosen folders
 virtual-folder-sources-chosen =
@@ -9,3 +13,32 @@ virtual-folder-sources-chosen =
         [one] { $count } folder chosen
        *[other] { $count } folders chosen
     }
+virtual-folder-no-search-folders-selected = You must choose at least one folder to search for the saved search folder.
+virtual-folder-properties-title = New Saved Search Folder
+# Variables:
+#   $folderName (String): The name of the saved search folder.
+virtual-folder-properties-edit-title = Edit Saved Search Properties for { $folderName }
+virtual-folder-name = Name:
+    .accesskey = N
+virtual-folder-description = Create as a subfolder of:
+    .accesskey = C
+virtual-folder-folder-selection-caption = Select the folders to search:
+virtual-folder-choose-folders-button =
+    .label = Choose…
+    .accesskey = h
+virtual-folder-search-online =
+    .label = Search Online (Gives up-to-date results for IMAP and News folders but increases time to open the folder)
+    .accesskey = S
+virtual-folder-search-term-caption = Configure the search criteria used for this saved search folder:
+virtual-folder-accept-button-create =
+    .label = Create
+    .accesskey = r
+virtual-folder-accept-button-update =
+    .label = Update
+    .accesskey = U
+
+## The following are for the virtual folder list dialog, which is opened when
+## the user clicks the "Choose..." button to select folders.
+
+virtual-folder-list-title = Select Folder(s)
+virtual-folder-list-desc = Select the folders to search: