Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

263 files changed, 5307 insertions, 0 deletions

diff --git a/comm/mail/components/search/extensions/allaannonser-sv-SE/favicon.ico b/comm/mail/components/search/extensions/allaannonser-sv-SE/favicon.ico
new file mode 100644
index 0000000000..3917eaec10
--- /dev/null
+++ b/comm/mail/components/search/extensions/allaannonser-sv-SE/favicon.ico
diff --git a/comm/mail/components/search/extensions/allaannonser-sv-SE/manifest.json b/comm/mail/components/search/extensions/allaannonser-sv-SE/manifest.json
new file mode 100644
index 0000000000..a5b5914634
--- /dev/null
+++ b/comm/mail/components/search/extensions/allaannonser-sv-SE/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Allaannonser",
+  "description": "Allaannonser",
+  "manifest_version": 2,
+  "version": "1.2",
+  "applications": {
+    "gecko": {
+      "id": "allaannonser-sv-SE@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Allaannonser",
+      "encoding": "ISO-8859-1",
+      "search_url": "https://www.allaannonser.se/hitlist.php",
+      "search_form": "https://www.allaannonser.se",
+      "search_url_get_params": "sourceid=Mozilla-search&keyword={searchTerms}&order=date&desc=1"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/allegro-pl/favicon.ico b/comm/mail/components/search/extensions/allegro-pl/favicon.ico
new file mode 100644
index 0000000000..42b4f90149
--- /dev/null
+++ b/comm/mail/components/search/extensions/allegro-pl/favicon.ico
diff --git a/comm/mail/components/search/extensions/allegro-pl/manifest.json b/comm/mail/components/search/extensions/allegro-pl/manifest.json
new file mode 100644
index 0000000000..ad38f187dc
--- /dev/null
+++ b/comm/mail/components/search/extensions/allegro-pl/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Allegro",
+  "description": "Wyszukiwanie w aukcjach Allegro",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "allegro-pl@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Allegro",
+      "search_url": "https://allegro.pl/listing/listing.php",
+      "search_form": "https://allegro.pl",
+      "search_url_get_params": "string={searchTerms}&sourceid=Mozilla-search"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazon/_locales/au/messages.json b/comm/mail/components/search/extensions/amazon/_locales/au/messages.json
new file mode 100644
index 0000000000..c8fbcbcb69
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazon/_locales/au/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "Amazon.com.au"
+  },
+  "extensionDescription": {
+    "message": "Amazon.com.au Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.com.au/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.com.au/exec/obidos/external-search/?field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazon/_locales/ca/messages.json b/comm/mail/components/search/extensions/amazon/_locales/ca/messages.json
new file mode 100644
index 0000000000..cb54e55658
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazon/_locales/ca/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "Amazon.ca"
+  },
+  "extensionDescription": {
+    "message": "Amazon.ca Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.ca/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.ca/exec/obidos/external-search/?field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazon/_locales/de/messages.json b/comm/mail/components/search/extensions/amazon/_locales/de/messages.json
new file mode 100644
index 0000000000..e9eebaf229
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazon/_locales/de/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "Amazon.de"
+  },
+  "extensionDescription": {
+    "message": "Amazon.de Suche"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.de/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.de/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazon/_locales/en-GB/messages.json b/comm/mail/components/search/extensions/amazon/_locales/en-GB/messages.json
new file mode 100644
index 0000000000..596283dd0d
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazon/_locales/en-GB/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "Amazon.co.uk"
+  },
+  "extensionDescription": {
+    "message": "Amazon.co.uk Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.co.uk/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.co.uk/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazon/_locales/france/messages.json b/comm/mail/components/search/extensions/amazon/_locales/france/messages.json
new file mode 100644
index 0000000000..77730b1a40
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazon/_locales/france/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "Amazon.fr"
+  },
+  "extensionDescription": {
+    "message": "Recherche Amazon.fr"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.fr/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.fr/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazon/_locales/in/messages.json b/comm/mail/components/search/extensions/amazon/_locales/in/messages.json
new file mode 100644
index 0000000000..d4f912cc96
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazon/_locales/in/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "Amazon.in"
+  },
+  "extensionDescription": {
+    "message": "Amazon.in Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.in/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.in/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazon/_locales/it/messages.json b/comm/mail/components/search/extensions/amazon/_locales/it/messages.json
new file mode 100644
index 0000000000..07382eec95
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazon/_locales/it/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "Amazon.it"
+  },
+  "extensionDescription": {
+    "message": "Ricerca Amazon.it"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.it/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.it/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazon/_locales/jp/messages.json b/comm/mail/components/search/extensions/amazon/_locales/jp/messages.json
new file mode 100644
index 0000000000..b3bebb43c2
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazon/_locales/jp/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "Amazon.co.jp"
+  },
+  "extensionDescription": {
+    "message": "Amazon.co.jp Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.co.jp/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.co.jp/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&mode=blended&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazon/_locales/mx/messages.json b/comm/mail/components/search/extensions/amazon/_locales/mx/messages.json
new file mode 100644
index 0000000000..a70ed76634
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazon/_locales/mx/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "Amazon.com.mx"
+  },
+  "extensionDescription": {
+    "message": "Amazon.com.mx Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.com.mx/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.com.mx/exec/obidos/external-search/?field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazon/_locales/nl/messages.json b/comm/mail/components/search/extensions/amazon/_locales/nl/messages.json
new file mode 100644
index 0000000000..5d5e62e637
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazon/_locales/nl/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "Amazon.nl"
+  },
+  "extensionDescription": {
+    "message": "Amazon.nl Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.nl/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.nl/exec/obidos/external-search/?field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazon/favicon.ico b/comm/mail/components/search/extensions/amazon/favicon.ico
new file mode 100644
index 0000000000..1c39eaf8fe
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazon/favicon.ico
diff --git a/comm/mail/components/search/extensions/amazon/manifest.json b/comm/mail/components/search/extensions/amazon/manifest.json
new file mode 100644
index 0000000000..fd44cf29cb
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazon/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.1",
+  "applications": {
+    "gecko": {
+      "id": "amazon@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "au",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazondotcn/favicon.ico b/comm/mail/components/search/extensions/amazondotcn/favicon.ico
new file mode 100644
index 0000000000..1c39eaf8fe
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazondotcn/favicon.ico
diff --git a/comm/mail/components/search/extensions/amazondotcn/manifest.json b/comm/mail/components/search/extensions/amazondotcn/manifest.json
new file mode 100644
index 0000000000..e6215d9660
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazondotcn/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "亚马逊",
+  "description": "亚马逊搜索",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "amazondotcn@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "亚马逊",
+      "search_url": "https://www.amazon.cn/mn/searchApp",
+      "search_form": "https://www.amazon.cn/",
+      "search_url_get_params": "keywords={searchTerms}&ix=sunray&pageletid=headsearch&searchType=&Go.x=0&Go.y=0&bestSaleNum=0"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazondotcom/_locales/en/messages.json b/comm/mail/components/search/extensions/amazondotcom/_locales/en/messages.json
new file mode 100644
index 0000000000..e1f3405dab
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazondotcom/_locales/en/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Amazon.com"
+  },
+  "extensionDescription": {
+    "message": "Amazon.com Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.com/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.com/exec/obidos/external-search/?field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/amazondotcom/favicon.ico b/comm/mail/components/search/extensions/amazondotcom/favicon.ico
new file mode 100644
index 0000000000..1c39eaf8fe
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazondotcom/favicon.ico
diff --git a/comm/mail/components/search/extensions/amazondotcom/manifest.json b/comm/mail/components/search/extensions/amazondotcom/manifest.json
new file mode 100644
index 0000000000..5def9f413d
--- /dev/null
+++ b/comm/mail/components/search/extensions/amazondotcom/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.1",
+  "applications": {
+    "gecko": {
+      "id": "amazondotcom@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "en",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "suggest_url": "__MSG_suggestUrl__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/atlas-sk/favicon.ico b/comm/mail/components/search/extensions/atlas-sk/favicon.ico
new file mode 100644
index 0000000000..eb4d3ec31a
--- /dev/null
+++ b/comm/mail/components/search/extensions/atlas-sk/favicon.ico
diff --git a/comm/mail/components/search/extensions/atlas-sk/manifest.json b/comm/mail/components/search/extensions/atlas-sk/manifest.json
new file mode 100644
index 0000000000..774c021f91
--- /dev/null
+++ b/comm/mail/components/search/extensions/atlas-sk/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Atlas",
+  "description": "Internetovy portal - Atlas.sk",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "atlas-sk@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Atlas",
+      "search_url": "https://www.atlas.sk/search.php",
+      "search_form": "https://www.atlas.sk/",
+      "search_url_get_params": "phrase={searchTerms}&sourceid=firefox"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/azerdict/favicon.ico b/comm/mail/components/search/extensions/azerdict/favicon.ico
new file mode 100644
index 0000000000..ba687ca8e7
--- /dev/null
+++ b/comm/mail/components/search/extensions/azerdict/favicon.ico
diff --git a/comm/mail/components/search/extensions/azerdict/manifest.json b/comm/mail/components/search/extensions/azerdict/manifest.json
new file mode 100644
index 0000000000..9454d14600
--- /dev/null
+++ b/comm/mail/components/search/extensions/azerdict/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Azerdict",
+  "description": "Azərbaycanın Online Lüğəti",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "azerdict@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Azerdict",
+      "search_url": "https://azerdict.com/english/",
+      "search_form": "https://azerdict.com/",
+      "search_url_get_params": "word={searchTerms}",
+      "suggest_url": "https://api.azerdict.com/english/autocomplete",
+      "suggest_url_get_params": "action=opensearch&query={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/azet-sk/favicon.ico b/comm/mail/components/search/extensions/azet-sk/favicon.ico
new file mode 100644
index 0000000000..39ab78bbd9
--- /dev/null
+++ b/comm/mail/components/search/extensions/azet-sk/favicon.ico
diff --git a/comm/mail/components/search/extensions/azet-sk/manifest.json b/comm/mail/components/search/extensions/azet-sk/manifest.json
new file mode 100644
index 0000000000..84b6faa38d
--- /dev/null
+++ b/comm/mail/components/search/extensions/azet-sk/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Azet",
+  "description": "Azet - portal, kde je vzdy najviac ludi",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "azet-sk@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Azet",
+      "search_url": "https://www.azet.sk/katalog/vyhladavanie/firmy/",
+      "search_form": "https://www.azet.sk/katalog/",
+      "search_url_get_params": "q={searchTerms}&k="
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/baidu/favicon.ico b/comm/mail/components/search/extensions/baidu/favicon.ico
new file mode 100644
index 0000000000..6c27b018c8
--- /dev/null
+++ b/comm/mail/components/search/extensions/baidu/favicon.ico
diff --git a/comm/mail/components/search/extensions/baidu/manifest.json b/comm/mail/components/search/extensions/baidu/manifest.json
new file mode 100644
index 0000000000..a53f905716
--- /dev/null
+++ b/comm/mail/components/search/extensions/baidu/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "百度",
+  "description": "百度网页搜索",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "baidu@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "百度",
+      "search_url": "https://www.baidu.com/baidu",
+      "search_form": "https://www.baidu.com/",
+      "search_url_get_params": "wd={searchTerms}&ie=utf-8",
+      "suggest_url": "https://www.baidu.com/su",
+      "suggest_url_get_params": "wd={searchTerms}&ie=utf-8&action=opensearch"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/bbc-alba/favicon.ico b/comm/mail/components/search/extensions/bbc-alba/favicon.ico
new file mode 100644
index 0000000000..8f62b07af8
--- /dev/null
+++ b/comm/mail/components/search/extensions/bbc-alba/favicon.ico
diff --git a/comm/mail/components/search/extensions/bbc-alba/manifest.json b/comm/mail/components/search/extensions/bbc-alba/manifest.json
new file mode 100644
index 0000000000..6de91c53c9
--- /dev/null
+++ b/comm/mail/components/search/extensions/bbc-alba/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "BBC ┐ BBC Alba",
+  "description": "Lorg BBC ┐ BBC Alba",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "bbc-alba@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "BBC ┐ BBC Alba",
+      "search_url": "https://search.bbc.co.uk/search",
+      "search_form": "https://www.bbc.co.uk/alba/",
+      "search_url_get_params": "opensearch=all-1&q={searchTerms}",
+      "suggest_url": "https://search.bbc.co.uk/suggest",
+      "suggest_url_get_params": "format=opensearch&q={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/bing/favicon.ico b/comm/mail/components/search/extensions/bing/favicon.ico
new file mode 100644
index 0000000000..1e90a10d6e
--- /dev/null
+++ b/comm/mail/components/search/extensions/bing/favicon.ico
diff --git a/comm/mail/components/search/extensions/bing/manifest.json b/comm/mail/components/search/extensions/bing/manifest.json
new file mode 100644
index 0000000000..bc0a1060ab
--- /dev/null
+++ b/comm/mail/components/search/extensions/bing/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Bing",
+  "description": "Bing. Search by Microsoft.",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "bing@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Bing",
+      "search_url": "https://www.bing.com/search",
+      "search_form": "https://www.bing.com/search?q={searchTerms}",
+      "search_url_get_params": "q={searchTerms}",
+      "suggest_url": "https://www.bing.com/osjson.aspx",
+      "suggest_url_get_params": "query={searchTerms}&form=OSDJAS&language={moz:locale}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/bok-NO/favicon.png b/comm/mail/components/search/extensions/bok-NO/favicon.png
new file mode 100644
index 0000000000..c2d46117ef
--- /dev/null
+++ b/comm/mail/components/search/extensions/bok-NO/favicon.png
diff --git a/comm/mail/components/search/extensions/bok-NO/manifest.json b/comm/mail/components/search/extensions/bok-NO/manifest.json
new file mode 100644
index 0000000000..fb0138103b
--- /dev/null
+++ b/comm/mail/components/search/extensions/bok-NO/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Ordbok",
+  "description": "Norske ordbøker",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "bok-NO@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Ordbok",
+      "search_url": "https://ordbok.uib.no/perl/ordbok.cgi",
+      "search_form": "https://ordbok.uib.no/",
+      "search_url_get_params": "OPP={searchTerms}&sourceid=Mozilla-search"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/bolcom/_locales/fy-NL/messages.json b/comm/mail/components/search/extensions/bolcom/_locales/fy-NL/messages.json
new file mode 100644
index 0000000000..252afad896
--- /dev/null
+++ b/comm/mail/components/search/extensions/bolcom/_locales/fy-NL/messages.json
@@ -0,0 +1,14 @@
+{
+  "extensionName": {
+    "message": "bol.com"
+  },
+  "extensionDescription": {
+    "message": "Sykje by bol.com"
+  },
+  "searchUrl": {
+    "message": "https://www.bol.com/nl/s/algemeen/zoekresultaten/Ntt/{searchTerms}/Ntk/media_all/Nty/1/suggestedFor/{searchTerms}/N/0/Ne/0/search/true/searchType/qck/index.html"
+  },
+  "searchForm": {
+    "message": "https://www.bol.com/"
+  }
+}
diff --git a/comm/mail/components/search/extensions/bolcom/_locales/nl/messages.json b/comm/mail/components/search/extensions/bolcom/_locales/nl/messages.json
new file mode 100644
index 0000000000..7e9baa8b3b
--- /dev/null
+++ b/comm/mail/components/search/extensions/bolcom/_locales/nl/messages.json
@@ -0,0 +1,14 @@
+{
+  "extensionName": {
+    "message": "bol.com"
+  },
+  "extensionDescription": {
+    "message": "Zoeken bij bol.com"
+  },
+  "searchUrl": {
+    "message": "https://www.bol.com/nl/s/algemeen/zoekresultaten/Ntt/{searchTerms}/Ntk/media_all/Nty/1/suggestedFor/{searchTerms}/N/0/Ne/0/search/true/searchType/qck/index.html"
+  },
+  "searchForm": {
+    "message": "https://www.bol.com/"
+  }
+}
diff --git a/comm/mail/components/search/extensions/bolcom/favicon.ico b/comm/mail/components/search/extensions/bolcom/favicon.ico
new file mode 100644
index 0000000000..0f0db9b990
--- /dev/null
+++ b/comm/mail/components/search/extensions/bolcom/favicon.ico
diff --git a/comm/mail/components/search/extensions/bolcom/manifest.json b/comm/mail/components/search/extensions/bolcom/manifest.json
new file mode 100644
index 0000000000..25a08232e7
--- /dev/null
+++ b/comm/mail/components/search/extensions/bolcom/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "bolcom@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "fy-NL",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/ceneji/favicon.png b/comm/mail/components/search/extensions/ceneji/favicon.png
new file mode 100644
index 0000000000..3c77b64d3c
--- /dev/null
+++ b/comm/mail/components/search/extensions/ceneji/favicon.png
diff --git a/comm/mail/components/search/extensions/ceneji/manifest.json b/comm/mail/components/search/extensions/ceneji/manifest.json
new file mode 100644
index 0000000000..3c915c8b15
--- /dev/null
+++ b/comm/mail/components/search/extensions/ceneji/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Ceneje.si",
+  "description": "Iskalnik Ceneje.si",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "ceneji@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Ceneje.si",
+      "search_url": "https://www.ceneje.si/search_new.aspx",
+      "search_form": "https://www.ceneje.si",
+      "search_url_get_params": "q={searchTerms}&FF-SearchBox=1"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/chambers-en-GB/favicon.ico b/comm/mail/components/search/extensions/chambers-en-GB/favicon.ico
new file mode 100644
index 0000000000..ecea4aac74
--- /dev/null
+++ b/comm/mail/components/search/extensions/chambers-en-GB/favicon.ico
diff --git a/comm/mail/components/search/extensions/chambers-en-GB/manifest.json b/comm/mail/components/search/extensions/chambers-en-GB/manifest.json
new file mode 100644
index 0000000000..17ce83d616
--- /dev/null
+++ b/comm/mail/components/search/extensions/chambers-en-GB/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Chambers (UK)",
+  "description": "Chambers 21st Century Dictionary Search",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "chambers-en-GB@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Chambers (UK)",
+      "search_url": "https://chambers.co.uk/search/",
+      "search_form": "https://chambers.co.uk/search/?query={searchTerms}&title=21st&sourceid=Mozilla-search",
+      "search_url_get_params": "query={searchTerms}&title=21st&sourceid=Mozilla-search"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/coccoc/favicon.ico b/comm/mail/components/search/extensions/coccoc/favicon.ico
new file mode 100644
index 0000000000..e6e82d938e
--- /dev/null
+++ b/comm/mail/components/search/extensions/coccoc/favicon.ico
diff --git a/comm/mail/components/search/extensions/coccoc/manifest.json b/comm/mail/components/search/extensions/coccoc/manifest.json
new file mode 100644
index 0000000000..790d56badd
--- /dev/null
+++ b/comm/mail/components/search/extensions/coccoc/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Cốc Cốc",
+  "description": "Use Cốc Cốc to search on coccoc.com",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "coccoc@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Cốc Cốc",
+      "search_url": "https://coccoc.com/search",
+      "search_url_get_params": "query={searchTerms}&s=ff&utm_source=firefox",
+      "suggest_url": "https://coccoc.com/composer/autocomplete",
+      "suggest_url_get_params": "of=b&q={searchTerms}&s=ff"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/daum-kr/favicon.ico b/comm/mail/components/search/extensions/daum-kr/favicon.ico
new file mode 100644
index 0000000000..ed803f50e2
--- /dev/null
+++ b/comm/mail/components/search/extensions/daum-kr/favicon.ico
diff --git a/comm/mail/components/search/extensions/daum-kr/manifest.json b/comm/mail/components/search/extensions/daum-kr/manifest.json
new file mode 100644
index 0000000000..1e0946be7a
--- /dev/null
+++ b/comm/mail/components/search/extensions/daum-kr/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "다음",
+  "description": "다음 검색",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "daum-kr@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "다음",
+      "search_url": "https://search.daum.net/search",
+      "search_form": "https://search.daum.net",
+      "search_url_get_params": "q={searchTerms}&w=tot&nil_ch=ffsr",
+      "suggest_url": "https://sug.search.daum.net/search_nsuggest",
+      "suggest_url_get_params": "mod=fxjson&code=utf_in_out&q={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/ddg/favicon.ico b/comm/mail/components/search/extensions/ddg/favicon.ico
new file mode 100644
index 0000000000..dda80dfd88
--- /dev/null
+++ b/comm/mail/components/search/extensions/ddg/favicon.ico
diff --git a/comm/mail/components/search/extensions/ddg/manifest.json b/comm/mail/components/search/extensions/ddg/manifest.json
new file mode 100644
index 0000000000..402a305684
--- /dev/null
+++ b/comm/mail/components/search/extensions/ddg/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "DuckDuckGo",
+  "description": "Search DuckDuckGo",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "ddg@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "DuckDuckGo",
+      "search_url": "https://duckduckgo.com/",
+      "search_form": "https://duckduckgo.com/?q={searchTerms}",
+      "search_url_get_params": "q={searchTerms}",
+      "suggest_url": "https://ac.duckduckgo.com/ac/",
+      "suggest_url_get_params": "q={searchTerms}&type=list"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/diec2/favicon.png b/comm/mail/components/search/extensions/diec2/favicon.png
new file mode 100644
index 0000000000..fa0fb8f1ff
--- /dev/null
+++ b/comm/mail/components/search/extensions/diec2/favicon.png
diff --git a/comm/mail/components/search/extensions/diec2/manifest.json b/comm/mail/components/search/extensions/diec2/manifest.json
new file mode 100644
index 0000000000..c4a11a0c36
--- /dev/null
+++ b/comm/mail/components/search/extensions/diec2/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "DIEC2",
+  "description": "Diccionari de l'Institut d'Estudis Catalans",
+  "manifest_version": 2,
+  "version": "1.2",
+  "applications": {
+    "gecko": {
+      "id": "diec2@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "DIEC2",
+      "encoding": "ISO-8859-1",
+      "search_url": "https://dlc.iec.cat/results.asp",
+      "search_form": "https://dlc.iec.cat",
+      "search_url_get_params": "txtEntrada={searchTerms}&OperEntrada=0"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/drae/favicon.ico b/comm/mail/components/search/extensions/drae/favicon.ico
new file mode 100644
index 0000000000..6b3a278678
--- /dev/null
+++ b/comm/mail/components/search/extensions/drae/favicon.ico
diff --git a/comm/mail/components/search/extensions/drae/manifest.json b/comm/mail/components/search/extensions/drae/manifest.json
new file mode 100644
index 0000000000..e181545da1
--- /dev/null
+++ b/comm/mail/components/search/extensions/drae/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Diccionario RAE",
+  "description": "Real Academia Española. Diccionario Usual.",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "drae@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Diccionario RAE",
+      "search_url": "https://dle.rae.es/",
+      "search_form": "https://dle.rae.es/?w={searchTerms}",
+      "search_url_get_params": "w={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/ecosia/favicon.ico b/comm/mail/components/search/extensions/ecosia/favicon.ico
new file mode 100644
index 0000000000..cc72d09d6d
--- /dev/null
+++ b/comm/mail/components/search/extensions/ecosia/favicon.ico
diff --git a/comm/mail/components/search/extensions/ecosia/manifest.json b/comm/mail/components/search/extensions/ecosia/manifest.json
new file mode 100644
index 0000000000..a1dc0cf385
--- /dev/null
+++ b/comm/mail/components/search/extensions/ecosia/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Ecosia",
+  "description": "Search Ecosia",
+  "manifest_version": 2,
+  "version": "1.1",
+  "applications": {
+    "gecko": {
+      "id": "ecosia@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Ecosia",
+      "search_url": "https://www.ecosia.org/search",
+      "search_form": "https://www.ecosia.org/",
+      "search_url_get_params": "tt=mzl&q={searchTerms}",
+      "suggest_url": "https://ac.ecosia.org/autocomplete",
+      "suggest_url_get_params": "type=list&q={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/eki-ee/favicon.ico b/comm/mail/components/search/extensions/eki-ee/favicon.ico
new file mode 100644
index 0000000000..537829c30f
--- /dev/null
+++ b/comm/mail/components/search/extensions/eki-ee/favicon.ico
diff --git a/comm/mail/components/search/extensions/eki-ee/manifest.json b/comm/mail/components/search/extensions/eki-ee/manifest.json
new file mode 100644
index 0000000000..c0c9ee7175
--- /dev/null
+++ b/comm/mail/components/search/extensions/eki-ee/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Õigekeelsussõnaraamat",
+  "description": "EKI.ee Eesti õigekeelsussõnaraamat ÕS 2013",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "eki-ee@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Õigekeelsussõnaraamat",
+      "search_url": "https://www.eki.ee/dict/qs/index.cgi",
+      "search_form": "https://www.eki.ee/dict/qs/",
+      "search_url_get_params": "F=M&Q={searchTerms}",
+      "suggest_url": "https://www.eki.ee/dict/soovita.cgi",
+      "suggest_url_get_params": "D=qs&Q={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/eudict/favicon.ico b/comm/mail/components/search/extensions/eudict/favicon.ico
new file mode 100644
index 0000000000..20750d0c19
--- /dev/null
+++ b/comm/mail/components/search/extensions/eudict/favicon.ico
diff --git a/comm/mail/components/search/extensions/eudict/manifest.json b/comm/mail/components/search/extensions/eudict/manifest.json
new file mode 100644
index 0000000000..3b0e881291
--- /dev/null
+++ b/comm/mail/components/search/extensions/eudict/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "EUdict Eng->Cro",
+  "description": "EUdict - englesko-hrvatski rječnik",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "eudict@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "EUdict Eng->Cro",
+      "search_url": "https://eudict.com",
+      "search_form": "https://eudict.com?lang=engcro&word={searchTerms}",
+      "search_url_get_params": "lang=engcro&word={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/faclair-beag/favicon.ico b/comm/mail/components/search/extensions/faclair-beag/favicon.ico
new file mode 100644
index 0000000000..990cf93298
--- /dev/null
+++ b/comm/mail/components/search/extensions/faclair-beag/favicon.ico
diff --git a/comm/mail/components/search/extensions/faclair-beag/manifest.json b/comm/mail/components/search/extensions/faclair-beag/manifest.json
new file mode 100644
index 0000000000..d183697b78
--- /dev/null
+++ b/comm/mail/components/search/extensions/faclair-beag/manifest.json
@@ -0,0 +1,23 @@
+{
+  "name": "Am Faclair Beag",
+  "description": "Lorg Am Faclair Beag",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "faclair-beag@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Am Faclair Beag",
+      "search_url": "https://www.faclair.com/",
+      "search_url_get_params": "txtSearch={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/flip/favicon.png b/comm/mail/components/search/extensions/flip/favicon.png
new file mode 100644
index 0000000000..96fc159dbf
--- /dev/null
+++ b/comm/mail/components/search/extensions/flip/favicon.png
diff --git a/comm/mail/components/search/extensions/flip/manifest.json b/comm/mail/components/search/extensions/flip/manifest.json
new file mode 100644
index 0000000000..75a2d0abaa
--- /dev/null
+++ b/comm/mail/components/search/extensions/flip/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "flip.kz",
+  "description": "Қазақстандық интернет-дүкенде іздеу",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "flip@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "flip.kz",
+      "search_url": "https://www.flip.kz/search",
+      "search_form": "https://flip.kz/",
+      "search_url_get_params": "search={searchTerms}",
+      "suggest_url": "https://www.flip.kz/ajax/search_keyword.php",
+      "suggest_url_get_params": "q={searchTerms}&type=os"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/freelang/favicon.ico b/comm/mail/components/search/extensions/freelang/favicon.ico
new file mode 100644
index 0000000000..510a0379f8
--- /dev/null
+++ b/comm/mail/components/search/extensions/freelang/favicon.ico
diff --git a/comm/mail/components/search/extensions/freelang/manifest.json b/comm/mail/components/search/extensions/freelang/manifest.json
new file mode 100644
index 0000000000..3f49d83fbc
--- /dev/null
+++ b/comm/mail/components/search/extensions/freelang/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Freelang (br)",
+  "description": "Geriadur Freelang",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "freelang@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Freelang (br)",
+      "search_url": "https://www.freelang.com/enligne/breton.php",
+      "search_form": "https://www.freelang.com/enligne/breton.php",
+      "search_url_post_params": "dico=fr_bre_fra&lg=fr&mot1={searchTerms}&mot2=&entier=on"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/google/favicon.ico b/comm/mail/components/search/extensions/google/favicon.ico
new file mode 100644
index 0000000000..82339b3b1d
--- /dev/null
+++ b/comm/mail/components/search/extensions/google/favicon.ico
diff --git a/comm/mail/components/search/extensions/google/manifest.json b/comm/mail/components/search/extensions/google/manifest.json
new file mode 100644
index 0000000000..98d177e465
--- /dev/null
+++ b/comm/mail/components/search/extensions/google/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Google",
+  "description": "Google Search",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "google@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Google",
+      "search_url": "https://www.google.com/search",
+      "search_form": "https://www.google.com/search?q={searchTerms}",
+      "search_url_get_params": "q={searchTerms}",
+      "suggest_url": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/gulesider-NO/favicon.ico b/comm/mail/components/search/extensions/gulesider-NO/favicon.ico
new file mode 100644
index 0000000000..e35572a557
--- /dev/null
+++ b/comm/mail/components/search/extensions/gulesider-NO/favicon.ico
diff --git a/comm/mail/components/search/extensions/gulesider-NO/manifest.json b/comm/mail/components/search/extensions/gulesider-NO/manifest.json
new file mode 100644
index 0000000000..37e7461e22
--- /dev/null
+++ b/comm/mail/components/search/extensions/gulesider-NO/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Gule sider",
+  "description": "Gule sider person og firmasøk",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "gulesider-NO@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Gule sider",
+      "search_url": "https://www.gulesider.no/query",
+      "search_form": "https://www.gulesider.no/",
+      "search_url_get_params": "what=all&search_word={searchTerms}&cmpid=fre_partner_fire_gssbtop"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/heureka-cz/favicon.ico b/comm/mail/components/search/extensions/heureka-cz/favicon.ico
new file mode 100644
index 0000000000..95ceff009d
--- /dev/null
+++ b/comm/mail/components/search/extensions/heureka-cz/favicon.ico
diff --git a/comm/mail/components/search/extensions/heureka-cz/manifest.json b/comm/mail/components/search/extensions/heureka-cz/manifest.json
new file mode 100644
index 0000000000..023d3455d9
--- /dev/null
+++ b/comm/mail/components/search/extensions/heureka-cz/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Heureka",
+  "description": "Vyhledávání na Heureka.cz",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "heureka-cz@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Heureka",
+      "search_url": "https://www.heureka.cz/",
+      "search_form": "https://www.heureka.cz/",
+      "search_url_get_params": "h[fraze]={searchTerms}&utm_source=firefox-search",
+      "suggest_url": "https://www.heureka.cz/direct/firefox/autocompleter.php",
+      "suggest_url_get_params": "query={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/hotline-ua/favicon.ico b/comm/mail/components/search/extensions/hotline-ua/favicon.ico
new file mode 100644
index 0000000000..53d8fc3bac
--- /dev/null
+++ b/comm/mail/components/search/extensions/hotline-ua/favicon.ico
diff --git a/comm/mail/components/search/extensions/hotline-ua/manifest.json b/comm/mail/components/search/extensions/hotline-ua/manifest.json
new file mode 100644
index 0000000000..9f642d18a5
--- /dev/null
+++ b/comm/mail/components/search/extensions/hotline-ua/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Hotline",
+  "description": "Hotline - порівняти ціни в інтернет-магазинах України",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "hotline-ua@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Hotline",
+      "search_url": "https://hotline.ua/sr/",
+      "search_form": "https://hotline.ua/",
+      "search_url_get_params": "q={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/kannadastore/favicon.png b/comm/mail/components/search/extensions/kannadastore/favicon.png
new file mode 100644
index 0000000000..8c96fe851f
--- /dev/null
+++ b/comm/mail/components/search/extensions/kannadastore/favicon.png
diff --git a/comm/mail/components/search/extensions/kannadastore/manifest.json b/comm/mail/components/search/extensions/kannadastore/manifest.json
new file mode 100644
index 0000000000..e87aeea130
--- /dev/null
+++ b/comm/mail/components/search/extensions/kannadastore/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Kannada Store",
+  "description": "Kanada Store, Online store",
+  "manifest_version": 2,
+  "version": "1.2",
+  "applications": {
+    "gecko": {
+      "id": "kannadastore@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Kannada Store",
+      "encoding": "ISO-8859-1",
+      "search_url": "https://www.kannadastore.com/advanced_search_result.php",
+      "search_form": "https://www.kannadastore.com/advanced_search_result.php",
+      "search_url_get_params": "keywords={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/leo_ende_de/favicon.png b/comm/mail/components/search/extensions/leo_ende_de/favicon.png
new file mode 100644
index 0000000000..04e5e344ef
--- /dev/null
+++ b/comm/mail/components/search/extensions/leo_ende_de/favicon.png
diff --git a/comm/mail/components/search/extensions/leo_ende_de/manifest.json b/comm/mail/components/search/extensions/leo_ende_de/manifest.json
new file mode 100644
index 0000000000..6f1b77a581
--- /dev/null
+++ b/comm/mail/components/search/extensions/leo_ende_de/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "LEO Eng-Deu",
+  "description": "Deutsch-Englisch Wörterbuch von LEO",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "leo_ende_de@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "LEO Eng-Deu",
+      "search_url": "https://dict.leo.org/englisch-deutsch/{searchTerms}",
+      "search_form": "https://dict.leo.org",
+      "suggest_url": "https://dict.leo.org/dictQuery/m-query/conf/ende/query.conf/strlist.json",
+      "suggest_url_get_params": "q={searchTerms}&sort=PLa&shortQuery=undefined&noDescription=undefined&noQueryURLs=undefined"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/list-am/favicon.gif b/comm/mail/components/search/extensions/list-am/favicon.gif
new file mode 100644
index 0000000000..031afb5dfc
--- /dev/null
+++ b/comm/mail/components/search/extensions/list-am/favicon.gif
diff --git a/comm/mail/components/search/extensions/list-am/manifest.json b/comm/mail/components/search/extensions/list-am/manifest.json
new file mode 100644
index 0000000000..e2dd32304b
--- /dev/null
+++ b/comm/mail/components/search/extensions/list-am/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "List.am",
+  "description": "Հանրային զերծ ads մասին: Վաճառք եւ գնման բնակարաններ, կենցաղային իրեր, որոնել աշխատանքի.",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "list-am@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.gif"
+  },
+  "web_accessible_resources": ["favicon.gif"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "List.am",
+      "search_url": "https://www.list.am/category",
+      "search_form": "https://www.list.am/category?q=",
+      "search_url_get_params": "q={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/list.json b/comm/mail/components/search/extensions/list.json
new file mode 100644
index 0000000000..b3b440481c
--- /dev/null
+++ b/comm/mail/components/search/extensions/list.json
@@ -0,0 +1,1223 @@
+{
+  "default": {
+    "searchDefault": "Google",
+    "searchOrder": ["Google", "Bing"],
+    "visibleDefaultEngines": [
+      "google",
+      "amazondotcom",
+      "bing",
+      "ddg",
+      "wikipedia"
+    ]
+  },
+  "regionOverrides": {
+    "CA": {
+      "amazondotcom": "amazon-ca",
+      "amazon-france": "amazon-ca"
+    },
+    "AU": {
+      "amazondotcom": "amazon-au",
+      "amazon-en-GB": "amazon-au"
+    },
+    "FR": {
+      "amazondotcom": "amazon-france"
+    },
+    "GB": {
+      "amazondotcom": "amazon-en-GB"
+    }
+  },
+  "locales": {
+    "en-US": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazondotcom",
+          "bing",
+          "ddg",
+          "wikipedia"
+        ]
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": [
+          "amazon-ca",
+          "amazon-au",
+          "yandex-en",
+          "google"
+        ]
+      }
+    },
+    "ach": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia"
+        ]
+      }
+    },
+    "af": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-af"
+        ]
+      }
+    },
+    "an": {
+      "default": {
+        "visibleDefaultEngines": ["google", "bing", "wikipedia-an", "ddg"]
+      }
+    },
+    "ar": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-ar"
+        ]
+      }
+    },
+    "as": {
+      "default": {
+        "visibleDefaultEngines": ["google", "amazon-in", "ddg", "wikipedia-as"]
+      }
+    },
+    "ast": {
+      "default": {
+        "visibleDefaultEngines": ["google", "bing", "ddg", "wikipedia-ast"]
+      }
+    },
+    "az": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazondotcom",
+          "azerdict",
+          "bing",
+          "ddg",
+          "wikipedia-az",
+          "yandex-az"
+        ]
+      }
+    },
+    "be": {
+      "default": {
+        "visibleDefaultEngines": [
+          "yandex-by",
+          "google",
+          "ddg",
+          "wikipedia-be",
+          "wikipedia-be-tarask"
+        ]
+      },
+      "BY": {
+        "searchDefault": "Яндекс"
+      },
+      "KZ": {
+        "searchDefault": "Яндекс"
+      },
+      "RU": {
+        "searchDefault": "Яндекс"
+      },
+      "TR": {
+        "searchDefault": "Яндекс"
+      }
+    },
+    "bg": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazondotcom",
+          "ddg",
+          "pazaruvaj",
+          "wikipedia-bg"
+        ]
+      }
+    },
+    "bn": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-in",
+          "bing",
+          "ddg",
+          "wikipedia-bn"
+        ]
+      }
+    },
+    "bn-BD": {
+      "default": {
+        "visibleDefaultEngines": ["google", "bing", "ddg", "wikipedia-bn"]
+      }
+    },
+    "bn-IN": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-in",
+          "bing",
+          "ddg",
+          "wikipedia-bn"
+        ]
+      }
+    },
+    "br": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-france",
+          "ddg",
+          "freelang",
+          "wikipedia-br"
+        ]
+      }
+    },
+    "bs": {
+      "default": {
+        "visibleDefaultEngines": ["google", "ddg", "olx", "wikipedia-bs"]
+      }
+    },
+    "ca": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "diec2",
+          "ddg",
+          "wikipedia-ca"
+        ]
+      }
+    },
+    "cak": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-es"
+        ]
+      }
+    },
+    "crh": {
+      "default": {
+        "visibleDefaultEngines": ["google", "ddg", "wikipedia-crh"]
+      }
+    },
+    "cs": {
+      "default": {
+        "searchOrder": ["Google", "Seznam"],
+        "visibleDefaultEngines": [
+          "google",
+          "seznam-cz",
+          "ddg",
+          "heureka-cz",
+          "mapy-cz",
+          "wikipedia-cz"
+        ]
+      }
+    },
+    "cy": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-en-GB",
+          "ddg",
+          "palasprint",
+          "wikipedia-cy"
+        ]
+      }
+    },
+    "da": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-en-GB",
+          "ddg",
+          "wikipedia-da"
+        ]
+      }
+    },
+    "de": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-de",
+          "bing",
+          "ddg",
+          "ecosia",
+          "leo_ende_de",
+          "wikipedia-de"
+        ]
+      }
+    },
+    "dsb": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-de",
+          "ddg",
+          "leo_ende_de",
+          "wikipedia-dsb"
+        ]
+      }
+    },
+    "el": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-en-GB",
+          "bing",
+          "ddg",
+          "wikipedia-el"
+        ]
+      }
+    },
+    "en-CA": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-ca",
+          "bing",
+          "ddg",
+          "wikipedia"
+        ]
+      }
+    },
+    "en-GB": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-en-GB",
+          "chambers-en-GB",
+          "ddg",
+          "wikipedia"
+        ]
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": ["yandex-en"]
+      }
+    },
+    "en-ZA": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia"
+        ]
+      }
+    },
+    "eo": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-eo"
+        ]
+      }
+    },
+    "es-AR": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazondotcom",
+          "drae",
+          "ddg",
+          "mercadolibre-ar",
+          "wikipedia-es"
+        ]
+      }
+    },
+    "es-CL": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "drae",
+          "ddg",
+          "mercadolibre-cl",
+          "wikipedia-es"
+        ]
+      }
+    },
+    "es-ES": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "drae",
+          "ddg",
+          "wikipedia-es"
+        ]
+      }
+    },
+    "es-MX": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "ddg",
+          "mercadolibre-mx",
+          "wikipedia-es"
+        ]
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": ["amazon-mx"]
+      }
+    },
+    "et": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "neti-ee",
+          "ddg",
+          "osta-ee",
+          "wikipedia-et",
+          "eki-ee"
+        ]
+      }
+    },
+    "eu": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-en-GB",
+          "ddg",
+          "wikipedia-eu"
+        ]
+      }
+    },
+    "fa": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazondotcom",
+          "bing",
+          "ddg",
+          "wikipedia-fa"
+        ]
+      }
+    },
+    "ff": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-france",
+          "ddg",
+          "wikipedia-fr"
+        ]
+      }
+    },
+    "fi": {
+      "default": {
+        "visibleDefaultEngines": ["google", "bing", "ddg", "wikipedia-fi"]
+      }
+    },
+    "fr": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-france",
+          "ddg",
+          "qwant",
+          "wikipedia-fr"
+        ]
+      }
+    },
+    "fy-NL": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "bolcom-fy-NL",
+          "ddg",
+          "marktplaats-fy-NL",
+          "wikipedia-fy-NL"
+        ]
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": ["amazon-nl"]
+      }
+    },
+    "ga-IE": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-en-GB",
+          "ddg",
+          "tearma",
+          "wikipedia-ga-IE"
+        ]
+      }
+    },
+    "gd": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-en-GB",
+          "bbc-alba",
+          "ddg",
+          "faclair-beag",
+          "wikipedia-gd"
+        ]
+      }
+    },
+    "gl": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-en-GB",
+          "ddg",
+          "wikipedia-gl"
+        ]
+      }
+    },
+    "gn": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-gn"
+        ]
+      }
+    },
+    "gu-IN": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-in",
+          "ddg",
+          "wikipedia-gu"
+        ]
+      }
+    },
+    "he": {
+      "default": {
+        "visibleDefaultEngines": ["google", "ddg", "wikipedia-he", "morfix-dic"]
+      }
+    },
+    "hi-IN": {
+      "default": {
+        "visibleDefaultEngines": ["google", "bing", "ddg", "wikipedia-hi"]
+      }
+    },
+    "hr": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-en-GB",
+          "bing",
+          "ddg",
+          "eudict",
+          "wikipedia-hr"
+        ]
+      }
+    },
+    "hsb": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-de",
+          "ddg",
+          "leo_ende_de",
+          "wikipedia-hsb"
+        ]
+      }
+    },
+    "hu": {
+      "default": {
+        "visibleDefaultEngines": ["google", "ddg", "vatera", "wikipedia-hu"]
+      }
+    },
+    "hy-AM": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazondotcom",
+          "ddg",
+          "list-am",
+          "wikipedia-hy"
+        ]
+      }
+    },
+    "ia": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-ia"
+        ]
+      }
+    },
+    "id": {
+      "default": {
+        "visibleDefaultEngines": ["google", "ddg", "wikipedia-id"]
+      }
+    },
+    "is": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-is"
+        ]
+      }
+    },
+    "it": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-it",
+          "ddg",
+          "wikipedia-it"
+        ]
+      }
+    },
+    "ja-JP-macos": {
+      "default": {
+        "searchOrder": [
+          "Google",
+          "Yahoo! JAPAN",
+          "Bing",
+          "Amazon.co.jp",
+          "楽天市場",
+          "ヤフオク!",
+          "教えて！goo",
+          "Wikipedia (ja)"
+        ],
+        "visibleDefaultEngines": [
+          "google",
+          "yahoo-jp",
+          "bing",
+          "amazon-jp",
+          "rakuten",
+          "yahoo-jp-auctions",
+          "oshiete-goo",
+          "wikipedia-ja",
+          "ddg"
+        ]
+      }
+    },
+    "ja": {
+      "default": {
+        "searchOrder": [
+          "Google",
+          "Yahoo! JAPAN",
+          "Bing",
+          "Amazon.co.jp",
+          "楽天市場",
+          "ヤフオク!",
+          "教えて！goo",
+          "Wikipedia (ja)"
+        ],
+        "visibleDefaultEngines": [
+          "google",
+          "yahoo-jp",
+          "bing",
+          "amazon-jp",
+          "rakuten",
+          "yahoo-jp-auctions",
+          "oshiete-goo",
+          "wikipedia-ja",
+          "ddg"
+        ]
+      }
+    },
+    "ka": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-ka"
+        ]
+      }
+    },
+    "kab": {
+      "default": {
+        "visibleDefaultEngines": ["google", "bing", "ddg", "wikipedia-kab"]
+      }
+    },
+    "kk": {
+      "default": {
+        "visibleDefaultEngines": [
+          "yandex-kk",
+          "google",
+          "ddg",
+          "flip",
+          "wikipedia-kk"
+        ]
+      },
+      "KZ": {
+        "searchDefault": "Яндекс"
+      },
+      "BY": {
+        "searchDefault": "Яндекс"
+      },
+      "RU": {
+        "searchDefault": "Яндекс"
+      },
+      "TR": {
+        "searchDefault": "Яндекс"
+      }
+    },
+    "km": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-km"
+        ]
+      }
+    },
+    "kn": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-in",
+          "ddg",
+          "kannadastore",
+          "wikipedia-kn"
+        ]
+      }
+    },
+    "ko": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "ddg",
+          "naver-kr",
+          "daum-kr",
+          "wikipedia-kr"
+        ]
+      }
+    },
+    "lij": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-it",
+          "ddg",
+          "wikipedia-lij"
+        ]
+      }
+    },
+    "lo": {
+      "default": {
+        "visibleDefaultEngines": ["google", "bing", "ddg", "wikipedia-lo"]
+      }
+    },
+    "lt": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "wikipedia-lt",
+          "bing",
+          "amazondotcom",
+          "ddg"
+        ]
+      }
+    },
+    "ltg": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "ddg",
+          "salidzinilv",
+          "sslv",
+          "wikipedia-ltg"
+        ]
+      }
+    },
+    "lv": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "ddg",
+          "salidzinilv",
+          "sslv",
+          "wikipedia-lv"
+        ]
+      }
+    },
+    "mai": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-in",
+          "ddg",
+          "wikipedia-hi"
+        ]
+      }
+    },
+    "mk": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-mk"
+        ]
+      }
+    },
+    "ml": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-in",
+          "ddg",
+          "wikipedia",
+          "wikipedia-ml"
+        ]
+      }
+    },
+    "mr": {
+      "default": {
+        "visibleDefaultEngines": ["google", "amazon-in", "ddg", "wikipedia-mr"]
+      }
+    },
+    "ms": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-ms"
+        ]
+      }
+    },
+    "my": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-my"
+        ]
+      }
+    },
+    "nb-NO": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-en-GB",
+          "bing",
+          "ddg",
+          "gulesider-NO",
+          "bok-NO",
+          "qxl-NO",
+          "wikipedia-NO"
+        ]
+      }
+    },
+    "ne-NP": {
+      "default": {
+        "visibleDefaultEngines": ["google", "bing", "ddg", "wikipedia-ne"]
+      }
+    },
+    "nl": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "bolcom-nl",
+          "ddg",
+          "marktplaats-nl",
+          "wikipedia-nl"
+        ]
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": ["amazon-nl"]
+      }
+    },
+    "nn-NO": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-en-GB",
+          "ddg",
+          "gulesider-NO",
+          "bok-NO",
+          "qxl-NO",
+          "wikipedia-NN"
+        ]
+      }
+    },
+    "oc": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "ddg",
+          "wikipedia-oc",
+          "wiktionary-oc"
+        ]
+      }
+    },
+    "or": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-in",
+          "ddg",
+          "wikipedia-or"
+        ]
+      }
+    },
+    "pa-IN": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-in",
+          "ddg",
+          "wikipedia-pa"
+        ]
+      }
+    },
+    "pl": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "allegro-pl",
+          "ddg",
+          "pwn-pl",
+          "wikipedia-pl",
+          "wolnelektury-pl"
+        ]
+      }
+    },
+    "pt-BR": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "ddg",
+          "mercadolivre",
+          "wikipedia-pt"
+        ]
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": ["amazon-br"]
+      }
+    },
+    "pt-PT": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-en-GB",
+          "ddg",
+          "priberam",
+          "wikipedia-pt"
+        ]
+      }
+    },
+    "rm": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "ddg",
+          "leo_ende_de",
+          "wikipedia-rm"
+        ]
+      }
+    },
+    "ro": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-ro"
+        ]
+      }
+    },
+    "ru": {
+      "default": {
+        "visibleDefaultEngines": [
+          "yandex-ru",
+          "google",
+          "ddg",
+          "ozonru",
+          "priceru",
+          "wikipedia-ru",
+          "mailru"
+        ]
+      },
+      "RU": {
+        "searchDefault": "Яндекс"
+      },
+      "BY": {
+        "searchDefault": "Яндекс"
+      },
+      "KZ": {
+        "searchDefault": "Яндекс"
+      },
+      "TR": {
+        "searchDefault": "Яндекс"
+      }
+    },
+    "si": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-si"
+        ]
+      }
+    },
+    "sk": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "azet-sk",
+          "atlas-sk",
+          "ddg",
+          "wikipedia-sk",
+          "zoznam-sk"
+        ]
+      }
+    },
+    "sl": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "ceneji",
+          "ddg",
+          "najdi-si",
+          "odpiralni",
+          "wikipedia-sl"
+        ]
+      }
+    },
+    "son": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-france",
+          "ddg",
+          "wikipedia-fr"
+        ]
+      }
+    },
+    "sq": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-en-GB",
+          "ddg",
+          "wikipedia-sq"
+        ]
+      }
+    },
+    "sr": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-en-GB",
+          "bing",
+          "ddg",
+          "wikipedia-sr",
+          "pogodak"
+        ]
+      }
+    },
+    "sv-SE": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "allaannonser-sv-SE",
+          "ddg",
+          "prisjakt-sv-SE",
+          "tyda-sv-SE",
+          "wikipedia-sv-SE"
+        ]
+      }
+    },
+    "ta": {
+      "default": {
+        "visibleDefaultEngines": ["google", "amazon-in", "ddg", "wikipedia-ta"]
+      }
+    },
+    "te": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazon-in",
+          "ddg",
+          "wikipedia-te",
+          "wiktionary-te"
+        ]
+      }
+    },
+    "th": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "amazondotcom",
+          "bing",
+          "ddg",
+          "longdo",
+          "wikipedia-th"
+        ]
+      }
+    },
+    "tl": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-tl"
+        ]
+      }
+    },
+    "tr": {
+      "default": {
+        "visibleDefaultEngines": ["yandex-tr", "google", "ddg", "wikipedia-tr"]
+      },
+      "TR": {
+        "searchDefault": "Yandex"
+      },
+      "BY": {
+        "searchDefault": "Yandex"
+      },
+      "KZ": {
+        "searchDefault": "Yandex"
+      },
+      "RU": {
+        "searchDefault": "Yandex"
+      }
+    },
+    "trs": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-es"
+        ]
+      }
+    },
+    "uk": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "ddg",
+          "wikipedia-uk",
+          "hotline-ua"
+        ]
+      }
+    },
+    "ur": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-in",
+          "ddg",
+          "wikipedia-ur"
+        ]
+      }
+    },
+    "uz": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazondotcom",
+          "ddg",
+          "wikipedia-uz"
+        ]
+      }
+    },
+    "vi": {
+      "default": {
+        "visibleDefaultEngines": ["google", "coccoc", "ddg", "wikipedia-vi"]
+      }
+    },
+    "wo": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google",
+          "bing",
+          "amazon-france",
+          "ddg",
+          "wikipedia-wo"
+        ]
+      }
+    },
+    "xh": {
+      "default": {
+        "visibleDefaultEngines": ["google", "bing", "ddg", "wikipedia"]
+      }
+    },
+    "zh-CN": {
+      "default": {
+        "visibleDefaultEngines": [
+          "baidu",
+          "google",
+          "bing",
+          "ddg",
+          "wikipedia-zh-CN",
+          "amazondotcn"
+        ]
+      },
+      "CN": {
+        "searchDefault": "百度"
+      }
+    },
+    "zh-TW": {
+      "default": {
+        "visibleDefaultEngines": ["google", "ddg", "readmoo", "wikipedia-zh-TW"]
+      }
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/longdo/favicon.ico b/comm/mail/components/search/extensions/longdo/favicon.ico
new file mode 100644
index 0000000000..aa42cda97f
--- /dev/null
+++ b/comm/mail/components/search/extensions/longdo/favicon.ico
diff --git a/comm/mail/components/search/extensions/longdo/manifest.json b/comm/mail/components/search/extensions/longdo/manifest.json
new file mode 100644
index 0000000000..1b86c951d5
--- /dev/null
+++ b/comm/mail/components/search/extensions/longdo/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "พจนานุกรม ลองดู",
+  "description": "พจนานุกรม ลองดู",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "longdo@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "พจนานุกรม ลองดู",
+      "search_url": "https://dict.longdo.org/",
+      "search_form": "https://dict.longdo.org/",
+      "search_url_get_params": "search={searchTerms}&src=moz",
+      "suggest_url": "https://search.longdo.com/Suggest/HeadSearch",
+      "suggest_url_get_params": "ds=head&fxjson=1&key={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/mailru/favicon.ico b/comm/mail/components/search/extensions/mailru/favicon.ico
new file mode 100644
index 0000000000..a2d3a48883
--- /dev/null
+++ b/comm/mail/components/search/extensions/mailru/favicon.ico
diff --git a/comm/mail/components/search/extensions/mailru/manifest.json b/comm/mail/components/search/extensions/mailru/manifest.json
new file mode 100644
index 0000000000..9d5e799296
--- /dev/null
+++ b/comm/mail/components/search/extensions/mailru/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Поиск Mail.Ru",
+  "description": "Search with Поиск Mail.Ru",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "mailru@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Поиск Mail.Ru",
+      "search_url": "https://go.mail.ru/search",
+      "search_form": "https://go.mail.ru/?gp=900200",
+      "search_url_get_params": "q={searchTerms}&fr=osmi&gp=900200&frc=900200",
+      "suggest_url": "https://suggests.go.mail.ru/ff3",
+      "suggest_url_get_params": "q={searchTerms}&gp=900200"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/mapy-cz/favicon.ico b/comm/mail/components/search/extensions/mapy-cz/favicon.ico
new file mode 100644
index 0000000000..051204c35c
--- /dev/null
+++ b/comm/mail/components/search/extensions/mapy-cz/favicon.ico
diff --git a/comm/mail/components/search/extensions/mapy-cz/manifest.json b/comm/mail/components/search/extensions/mapy-cz/manifest.json
new file mode 100644
index 0000000000..2f8fdc32f1
--- /dev/null
+++ b/comm/mail/components/search/extensions/mapy-cz/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Mapy.cz",
+  "description": "Vyhledávání na Mapy.cz",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "mapy-cz@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Mapy.cz",
+      "search_url": "https://www.mapy.cz/",
+      "search_form": "https://www.mapy.cz/",
+      "search_url_get_params": "query={searchTerms}&sourceid=Searchmodule_3"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/marktplaats/_locales/fy-NL/messages.json b/comm/mail/components/search/extensions/marktplaats/_locales/fy-NL/messages.json
new file mode 100644
index 0000000000..4d7f884b17
--- /dev/null
+++ b/comm/mail/components/search/extensions/marktplaats/_locales/fy-NL/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "Marktplaats.nl"
+  },
+  "extensionDescription": {
+    "message": "Sykje yn alle kategoryen op Marktplaats.nl"
+  },
+  "searchUrl": {
+    "message": "https://www.marktplaats.nl/z.html"
+  },
+  "searchForm": {
+    "message": "https://www.marktplaats.nl"
+  },
+  "searchUrlGetParams": {
+    "message": "query={searchTerms}"
+  }
+}
diff --git a/comm/mail/components/search/extensions/marktplaats/_locales/nl/messages.json b/comm/mail/components/search/extensions/marktplaats/_locales/nl/messages.json
new file mode 100644
index 0000000000..c44a0a25cc
--- /dev/null
+++ b/comm/mail/components/search/extensions/marktplaats/_locales/nl/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "Marktplaats.nl"
+  },
+  "extensionDescription": {
+    "message": "Zoeken in alle categorieën op Marktplaats.nl"
+  },
+  "searchUrl": {
+    "message": "https://www.marktplaats.nl/z.html"
+  },
+  "searchForm": {
+    "message": "https://www.marktplaats.nl"
+  },
+  "searchUrlGetParams": {
+    "message": "query={searchTerms}"
+  }
+}
diff --git a/comm/mail/components/search/extensions/marktplaats/favicon.ico b/comm/mail/components/search/extensions/marktplaats/favicon.ico
new file mode 100644
index 0000000000..ed0ff305a6
--- /dev/null
+++ b/comm/mail/components/search/extensions/marktplaats/favicon.ico
diff --git a/comm/mail/components/search/extensions/marktplaats/manifest.json b/comm/mail/components/search/extensions/marktplaats/manifest.json
new file mode 100644
index 0000000000..b1a41bbd02
--- /dev/null
+++ b/comm/mail/components/search/extensions/marktplaats/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "marktplaats@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "fy-NL",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/mercadolibre/_locales/ar/messages.json b/comm/mail/components/search/extensions/mercadolibre/_locales/ar/messages.json
new file mode 100644
index 0000000000..b83f37c6fc
--- /dev/null
+++ b/comm/mail/components/search/extensions/mercadolibre/_locales/ar/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "MercadoLibre Argentina"
+  },
+  "extensionDescription": {
+    "message": "MercadoLibre Argentina"
+  },
+  "searchUrl": {
+    "message": "https://www.mercadolibre.com.ar/jm/search"
+  },
+  "searchForm": {
+    "message": "https://www.mercadolibre.com.ar/"
+  },
+  "searchUrlGetParams": {
+    "message": "as_word={searchTerms}"
+  }
+}
diff --git a/comm/mail/components/search/extensions/mercadolibre/_locales/cl/messages.json b/comm/mail/components/search/extensions/mercadolibre/_locales/cl/messages.json
new file mode 100644
index 0000000000..3c37756464
--- /dev/null
+++ b/comm/mail/components/search/extensions/mercadolibre/_locales/cl/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "MercadoLibre Chile"
+  },
+  "extensionDescription": {
+    "message": "MercadoLibre Chile"
+  },
+  "searchUrl": {
+    "message": "https://www.mercadolibre.cl/jm/search"
+  },
+  "searchForm": {
+    "message": "https://www.mercadolibre.cl/"
+  },
+  "searchUrlGetParams": {
+    "message": "as_word={searchTerms}"
+  }
+}
diff --git a/comm/mail/components/search/extensions/mercadolibre/_locales/mx/messages.json b/comm/mail/components/search/extensions/mercadolibre/_locales/mx/messages.json
new file mode 100644
index 0000000000..cb4d2b4b79
--- /dev/null
+++ b/comm/mail/components/search/extensions/mercadolibre/_locales/mx/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "MercadoLibre Mexico"
+  },
+  "extensionDescription": {
+    "message": "MercadoLibre Mexico"
+  },
+  "searchUrl": {
+    "message": "https://www.mercadolibre.com.mx/jm/search"
+  },
+  "searchForm": {
+    "message": "https://www.mercadolibre.com.mx/"
+  },
+  "searchUrlGetParams": {
+    "message": "as_word={searchTerms}"
+  }
+}
diff --git a/comm/mail/components/search/extensions/mercadolibre/favicon.ico b/comm/mail/components/search/extensions/mercadolibre/favicon.ico
new file mode 100644
index 0000000000..dc9ad5b2a9
--- /dev/null
+++ b/comm/mail/components/search/extensions/mercadolibre/favicon.ico
diff --git a/comm/mail/components/search/extensions/mercadolibre/manifest.json b/comm/mail/components/search/extensions/mercadolibre/manifest.json
new file mode 100644
index 0000000000..7af5ecc3cf
--- /dev/null
+++ b/comm/mail/components/search/extensions/mercadolibre/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "mercadolibre@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "ar",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/mercadolivre/favicon.ico b/comm/mail/components/search/extensions/mercadolivre/favicon.ico
new file mode 100644
index 0000000000..dc9ad5b2a9
--- /dev/null
+++ b/comm/mail/components/search/extensions/mercadolivre/favicon.ico
diff --git a/comm/mail/components/search/extensions/mercadolivre/manifest.json b/comm/mail/components/search/extensions/mercadolivre/manifest.json
new file mode 100644
index 0000000000..d70f94573f
--- /dev/null
+++ b/comm/mail/components/search/extensions/mercadolivre/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "MercadoLivre",
+  "description": "Onde comprar e vender de Tudo.",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "mercadolivre@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "MercadoLivre",
+      "search_url": "https://www.mercadolivre.com.br/jm/search",
+      "search_form": "https://www.mercadolivre.com.br/",
+      "search_url_get_params": "as_word={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/morfix-dic/favicon.ico b/comm/mail/components/search/extensions/morfix-dic/favicon.ico
new file mode 100644
index 0000000000..6a3231b172
--- /dev/null
+++ b/comm/mail/components/search/extensions/morfix-dic/favicon.ico
diff --git a/comm/mail/components/search/extensions/morfix-dic/manifest.json b/comm/mail/components/search/extensions/morfix-dic/manifest.json
new file mode 100644
index 0000000000..cacaad9ccf
--- /dev/null
+++ b/comm/mail/components/search/extensions/morfix-dic/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "מילון מורפיקס",
+  "description": "",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "morfix-dic@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "מילון מורפיקס",
+      "search_url": "https://milon.morfix.co.il/default.aspx",
+      "search_form": "https://milon.morfix.co.il/",
+      "search_url_get_params": "q={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/najdi-si/favicon.png b/comm/mail/components/search/extensions/najdi-si/favicon.png
new file mode 100644
index 0000000000..b470991648
--- /dev/null
+++ b/comm/mail/components/search/extensions/najdi-si/favicon.png
diff --git a/comm/mail/components/search/extensions/najdi-si/manifest.json b/comm/mail/components/search/extensions/najdi-si/manifest.json
new file mode 100644
index 0000000000..2d7e0caaad
--- /dev/null
+++ b/comm/mail/components/search/extensions/najdi-si/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Najdi.si",
+  "description": "Iskalnik Najdi.si",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "najdi-si@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Najdi.si",
+      "search_url": "https://www.najdi.si/search.jsp",
+      "search_form": "https://www.najdi.si/",
+      "search_url_get_params": "q={searchTerms}&o=0&foxsbar=ff"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/naver-kr/favicon.ico b/comm/mail/components/search/extensions/naver-kr/favicon.ico
new file mode 100644
index 0000000000..eed93a92cb
--- /dev/null
+++ b/comm/mail/components/search/extensions/naver-kr/favicon.ico
diff --git a/comm/mail/components/search/extensions/naver-kr/manifest.json b/comm/mail/components/search/extensions/naver-kr/manifest.json
new file mode 100644
index 0000000000..240fc2e0d3
--- /dev/null
+++ b/comm/mail/components/search/extensions/naver-kr/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "네이버",
+  "description": "네이버 검색",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "naver-kr@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "네이버",
+      "search_url": "https://search.naver.com/search.naver",
+      "search_form": "https://search.naver.com",
+      "search_url_get_params": "where=nexearch&frm=ff&sm=oss&ie=utf8&query={searchTerms}",
+      "suggest_url": "https://ac.search.naver.com/nx/ac",
+      "suggest_url_get_params": "of=os&ie=utf-8&q={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/neti-ee/favicon.ico b/comm/mail/components/search/extensions/neti-ee/favicon.ico
new file mode 100644
index 0000000000..1bc10ea7fb
--- /dev/null
+++ b/comm/mail/components/search/extensions/neti-ee/favicon.ico
diff --git a/comm/mail/components/search/extensions/neti-ee/manifest.json b/comm/mail/components/search/extensions/neti-ee/manifest.json
new file mode 100644
index 0000000000..900789fceb
--- /dev/null
+++ b/comm/mail/components/search/extensions/neti-ee/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Neti",
+  "description": "Neti",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "neti-ee@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Neti",
+      "search_url": "https://www.neti.ee/cgi-bin/otsing",
+      "search_form": "https://www.neti.ee/",
+      "search_url_get_params": "query={searchTerms}&src=web"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/odpiralni/favicon.png b/comm/mail/components/search/extensions/odpiralni/favicon.png
new file mode 100644
index 0000000000..044d4f13d4
--- /dev/null
+++ b/comm/mail/components/search/extensions/odpiralni/favicon.png
diff --git a/comm/mail/components/search/extensions/odpiralni/manifest.json b/comm/mail/components/search/extensions/odpiralni/manifest.json
new file mode 100644
index 0000000000..cee70b5cb6
--- /dev/null
+++ b/comm/mail/components/search/extensions/odpiralni/manifest.json
@@ -0,0 +1,23 @@
+{
+  "name": "Odpiralni Časi",
+  "description": "Odpiralni Časi v Sloveniji",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "odpiralni@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Odpiralni Časi",
+      "search_url": "https://www.odpiralnicasi.com/spots",
+      "search_url_get_params": "q={searchTerms}&source=1"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/olx/favicon.ico b/comm/mail/components/search/extensions/olx/favicon.ico
new file mode 100644
index 0000000000..22e472190b
--- /dev/null
+++ b/comm/mail/components/search/extensions/olx/favicon.ico
diff --git a/comm/mail/components/search/extensions/olx/manifest.json b/comm/mail/components/search/extensions/olx/manifest.json
new file mode 100644
index 0000000000..da80367b2f
--- /dev/null
+++ b/comm/mail/components/search/extensions/olx/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "OLX.ba",
+  "description": "OLX.ba pretraživač",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "olx@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "OLX.ba",
+      "search_url": "https://www.olx.ba/pretraga",
+      "search_form": "https://www.olx.ba/",
+      "search_url_get_params": "trazilica={searchTerms}",
+      "suggest_url": "https://www.olx.ba/sugestije/firefox_pojmovi",
+      "suggest_url_get_params": "sta={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/oshiete-goo/favicon.ico b/comm/mail/components/search/extensions/oshiete-goo/favicon.ico
new file mode 100644
index 0000000000..ee454036dd
--- /dev/null
+++ b/comm/mail/components/search/extensions/oshiete-goo/favicon.ico
diff --git a/comm/mail/components/search/extensions/oshiete-goo/manifest.json b/comm/mail/components/search/extensions/oshiete-goo/manifest.json
new file mode 100644
index 0000000000..be6d6fb8e5
--- /dev/null
+++ b/comm/mail/components/search/extensions/oshiete-goo/manifest.json
@@ -0,0 +1,23 @@
+{
+  "name": "教えて！goo",
+  "description": "教えて！goo",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "oshiete-goo@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "教えて！goo",
+      "search_url": "https://oshiete.goo.ne.jp/search_goo/result/",
+      "search_url_get_params": "MT={searchTerms}&from=Firefox30&PT=Firefox30"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/osta-ee/favicon.png b/comm/mail/components/search/extensions/osta-ee/favicon.png
new file mode 100644
index 0000000000..e67b9c3abf
--- /dev/null
+++ b/comm/mail/components/search/extensions/osta-ee/favicon.png
diff --git a/comm/mail/components/search/extensions/osta-ee/manifest.json b/comm/mail/components/search/extensions/osta-ee/manifest.json
new file mode 100644
index 0000000000..7940471355
--- /dev/null
+++ b/comm/mail/components/search/extensions/osta-ee/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Osta",
+  "description": "Osta",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "osta-ee@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Osta",
+      "search_url": "https://www.osta.ee/firefox/",
+      "search_form": "https://www.osta.ee/",
+      "search_url_get_params": "keyword={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/ozonru/favicon.ico b/comm/mail/components/search/extensions/ozonru/favicon.ico
new file mode 100644
index 0000000000..eecb97a330
--- /dev/null
+++ b/comm/mail/components/search/extensions/ozonru/favicon.ico
diff --git a/comm/mail/components/search/extensions/ozonru/manifest.json b/comm/mail/components/search/extensions/ozonru/manifest.json
new file mode 100644
index 0000000000..35d0d3f1a5
--- /dev/null
+++ b/comm/mail/components/search/extensions/ozonru/manifest.json
@@ -0,0 +1,27 @@
+{
+  "name": "OZON.ru",
+  "description": "OZON.ru provider",
+  "manifest_version": 2,
+  "version": "1.2",
+  "applications": {
+    "gecko": {
+      "id": "ozonru@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "OZON.ru",
+      "encoding": "WINDOWS-1251",
+      "search_url": "https://www.ozon.ru/?",
+      "search_form": "https://www.ozon.ru/",
+      "search_url_get_params": "context=search&text={searchTerms}&from=firefox",
+      "suggest_url": "https://www.ozon.ru/JSONSuggestionHandler.ashx",
+      "suggest_url_get_params": "text={searchTerms}&from=firefox"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/palasprint/favicon.ico b/comm/mail/components/search/extensions/palasprint/favicon.ico
new file mode 100644
index 0000000000..afa4eef392
--- /dev/null
+++ b/comm/mail/components/search/extensions/palasprint/favicon.ico
diff --git a/comm/mail/components/search/extensions/palasprint/manifest.json b/comm/mail/components/search/extensions/palasprint/manifest.json
new file mode 100644
index 0000000000..9786e0679c
--- /dev/null
+++ b/comm/mail/components/search/extensions/palasprint/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Palas Print",
+  "description": "Palas Print - Heb Ffiniau",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "palasprint@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Palas Print",
+      "search_url": "https://palasprint.com/siopa/search_all.php",
+      "search_form": "https://palasprint.com/siopa/advanced_search.php",
+      "search_url_get_params": "keywords={searchTerms}&source=mozilla"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/pazaruvaj/favicon.ico b/comm/mail/components/search/extensions/pazaruvaj/favicon.ico
new file mode 100644
index 0000000000..36f0cff233
--- /dev/null
+++ b/comm/mail/components/search/extensions/pazaruvaj/favicon.ico
diff --git a/comm/mail/components/search/extensions/pazaruvaj/manifest.json b/comm/mail/components/search/extensions/pazaruvaj/manifest.json
new file mode 100644
index 0000000000..b94dce2668
--- /dev/null
+++ b/comm/mail/components/search/extensions/pazaruvaj/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Pazaruvaj",
+  "description": "Надежден помощник за покупки, сравнение на цени, онлайн магазини, описания, мнения, видеоклипове",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "pazaruvaj@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Pazaruvaj",
+      "search_url": "https://www.pazaruvaj.com/CategorySearch.php",
+      "search_form": "https://www.pazaruvaj.com/",
+      "search_url_get_params": "st={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/pogodak/favicon.ico b/comm/mail/components/search/extensions/pogodak/favicon.ico
new file mode 100644
index 0000000000..1bae4f838d
--- /dev/null
+++ b/comm/mail/components/search/extensions/pogodak/favicon.ico
diff --git a/comm/mail/components/search/extensions/pogodak/manifest.json b/comm/mail/components/search/extensions/pogodak/manifest.json
new file mode 100644
index 0000000000..e17e175620
--- /dev/null
+++ b/comm/mail/components/search/extensions/pogodak/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Погодак",
+  "description": "Погодак: претраживач Интернета",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "pogodak@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Погодак",
+      "search_url": "https://www.pogodak.rs/pretraga",
+      "search_form": "https://www.pogodak.rs",
+      "search_url_get_params": "q={searchTerms}&foxsbar=ff"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/priberam/favicon.png b/comm/mail/components/search/extensions/priberam/favicon.png
new file mode 100644
index 0000000000..98924439d5
--- /dev/null
+++ b/comm/mail/components/search/extensions/priberam/favicon.png
diff --git a/comm/mail/components/search/extensions/priberam/manifest.json b/comm/mail/components/search/extensions/priberam/manifest.json
new file mode 100644
index 0000000000..f344d4def4
--- /dev/null
+++ b/comm/mail/components/search/extensions/priberam/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Priberam",
+  "description": "Dicionário Priberam",
+  "manifest_version": 2,
+  "version": "1.2",
+  "applications": {
+    "gecko": {
+      "id": "priberam@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Priberam",
+      "encoding": "ISO-8859-15",
+      "search_url": "https://www.priberam.pt/dlpo/firefox.aspx",
+      "search_form": "https://www.priberam.pt/dlpo/",
+      "search_url_get_params": "pal={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/priceru/favicon.ico b/comm/mail/components/search/extensions/priceru/favicon.ico
new file mode 100644
index 0000000000..ee4ca656ca
--- /dev/null
+++ b/comm/mail/components/search/extensions/priceru/favicon.ico
diff --git a/comm/mail/components/search/extensions/priceru/manifest.json b/comm/mail/components/search/extensions/priceru/manifest.json
new file mode 100644
index 0000000000..1eff4b2e47
--- /dev/null
+++ b/comm/mail/components/search/extensions/priceru/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Price.ru",
+  "description": "Поиск предложений и цен",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "priceru@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Price.ru",
+      "search_url": "https://price.ru/search",
+      "search_form": "https://price.ru/index.html",
+      "search_url_get_params": "query={searchTerms}&from=fx3"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/prisjakt-sv-SE/favicon.ico b/comm/mail/components/search/extensions/prisjakt-sv-SE/favicon.ico
new file mode 100644
index 0000000000..feac665f71
--- /dev/null
+++ b/comm/mail/components/search/extensions/prisjakt-sv-SE/favicon.ico
diff --git a/comm/mail/components/search/extensions/prisjakt-sv-SE/manifest.json b/comm/mail/components/search/extensions/prisjakt-sv-SE/manifest.json
new file mode 100644
index 0000000000..442cb0414e
--- /dev/null
+++ b/comm/mail/components/search/extensions/prisjakt-sv-SE/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Prisjakt",
+  "description": "Prisjakt - jämför priser och produkter",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "prisjakt-sv-SE@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Prisjakt",
+      "search_url": "https://www.prisjakt.nu/#rparams=ss={searchTerms}",
+      "search_form": "https://www.prisjakt.nu/#rparams=ss={searchTerms}",
+      "suggest_url": "https://www.prisjakt.nu/plugins/opensearch/suggestions.php",
+      "suggest_url_get_params": "search={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/pwn-pl/favicon.png b/comm/mail/components/search/extensions/pwn-pl/favicon.png
new file mode 100644
index 0000000000..3cbae12d48
--- /dev/null
+++ b/comm/mail/components/search/extensions/pwn-pl/favicon.png
diff --git a/comm/mail/components/search/extensions/pwn-pl/manifest.json b/comm/mail/components/search/extensions/pwn-pl/manifest.json
new file mode 100644
index 0000000000..46375e9983
--- /dev/null
+++ b/comm/mail/components/search/extensions/pwn-pl/manifest.json
@@ -0,0 +1,23 @@
+{
+  "name": "Encyklopedia PWN",
+  "description": "Wyszukiwanie w Encyklopedii PWN",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "pwn-pl@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Encyklopedia PWN",
+      "search_url": "https://encyklopedia.pwn.pl/szukaj/{searchTerms}",
+      "search_form": "https://encyklopedia.pwn.pl/szukaj/"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/qwant/favicon.ico b/comm/mail/components/search/extensions/qwant/favicon.ico
new file mode 100644
index 0000000000..d43d1d5aa6
--- /dev/null
+++ b/comm/mail/components/search/extensions/qwant/favicon.ico
diff --git a/comm/mail/components/search/extensions/qwant/manifest.json b/comm/mail/components/search/extensions/qwant/manifest.json
new file mode 100644
index 0000000000..07fbf85cce
--- /dev/null
+++ b/comm/mail/components/search/extensions/qwant/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Qwant",
+  "manifest_version": 2,
+  "version": "1.2",
+  "applications": {
+    "gecko": {
+      "id": "qwant@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Qwant",
+      "search_url": "https://www.qwant.com/",
+      "search_url_get_params": "client=brz-moz&q={searchTerms}",
+      "suggest_url": "https://api.qwant.com/api/suggest/",
+      "suggest_url_get_params": "client=opensearch&q={searchTerms}",
+      "search_form": "https://www.qwant.com/"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/qxl-NO/favicon.ico b/comm/mail/components/search/extensions/qxl-NO/favicon.ico
new file mode 100644
index 0000000000..02ee1fc283
--- /dev/null
+++ b/comm/mail/components/search/extensions/qxl-NO/favicon.ico
diff --git a/comm/mail/components/search/extensions/qxl-NO/manifest.json b/comm/mail/components/search/extensions/qxl-NO/manifest.json
new file mode 100644
index 0000000000..8f98d766ce
--- /dev/null
+++ b/comm/mail/components/search/extensions/qxl-NO/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "QXL",
+  "description": "QXL søk",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "qxl-NO@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "QXL",
+      "search_url": "https://www.qxl.no/search/search.asp",
+      "search_form": "https://www.qxl.no/",
+      "search_url_get_params": "txtSearch={searchTerms}&InTitleAndDesc=1&sourceid=Mozilla-search"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/rakuten/favicon.ico b/comm/mail/components/search/extensions/rakuten/favicon.ico
new file mode 100644
index 0000000000..66afe98469
--- /dev/null
+++ b/comm/mail/components/search/extensions/rakuten/favicon.ico
diff --git a/comm/mail/components/search/extensions/rakuten/manifest.json b/comm/mail/components/search/extensions/rakuten/manifest.json
new file mode 100644
index 0000000000..ba590dba76
--- /dev/null
+++ b/comm/mail/components/search/extensions/rakuten/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "楽天市場",
+  "description": "楽天市場 商品検索",
+  "manifest_version": 2,
+  "version": "1.2",
+  "applications": {
+    "gecko": {
+      "id": "rakuten@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "楽天市場",
+      "encoding": "EUC-JP",
+      "search_url": "https://pt.afl.rakuten.co.jp/c/013ca98b.cd7c5f0c/",
+      "search_form": "https://www.rakuten.co.jp/",
+      "search_url_get_params": "sitem={searchTerms}&sv=2&p=0"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/readmoo/favicon.ico b/comm/mail/components/search/extensions/readmoo/favicon.ico
new file mode 100644
index 0000000000..75396dc9ca
--- /dev/null
+++ b/comm/mail/components/search/extensions/readmoo/favicon.ico
diff --git a/comm/mail/components/search/extensions/readmoo/manifest.json b/comm/mail/components/search/extensions/readmoo/manifest.json
new file mode 100644
index 0000000000..f9d8a24f3c
--- /dev/null
+++ b/comm/mail/components/search/extensions/readmoo/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Readmoo 讀墨電子書",
+  "description": "Readmoo 讀墨電子書",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "readmoo@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Readmoo 讀墨電子書",
+      "search_url": "https://readmoo.com/search/keyword",
+      "search_form": "https://readmoo.com/search/keyword?pi=0&q={searchTerms}&st=true",
+      "search_url_get_params": "pi=0&q={searchTerms}&st=true"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/salidzinilv/favicon.ico b/comm/mail/components/search/extensions/salidzinilv/favicon.ico
new file mode 100644
index 0000000000..0a7d01cae8
--- /dev/null
+++ b/comm/mail/components/search/extensions/salidzinilv/favicon.ico
diff --git a/comm/mail/components/search/extensions/salidzinilv/manifest.json b/comm/mail/components/search/extensions/salidzinilv/manifest.json
new file mode 100644
index 0000000000..322a378eae
--- /dev/null
+++ b/comm/mail/components/search/extensions/salidzinilv/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Salidzini.lv",
+  "description": "Salidzini.lv - Latvijas interneta veikalu mekletajs",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "salidzinilv@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Salidzini.lv",
+      "search_url": "https://www.salidzini.lv/search.php",
+      "search_form": "https://salidzini.lv",
+      "search_url_get_params": "q={searchTerms}&utm_source=firefox-plugin",
+      "suggest_url": "https://www.salidzini.lv/suggested_search.php",
+      "suggest_url_get_params": "q={searchTerms}&utm_source=firefox-plugin"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/seznam-cz/favicon.ico b/comm/mail/components/search/extensions/seznam-cz/favicon.ico
new file mode 100644
index 0000000000..f3e078a107
--- /dev/null
+++ b/comm/mail/components/search/extensions/seznam-cz/favicon.ico
diff --git a/comm/mail/components/search/extensions/seznam-cz/manifest.json b/comm/mail/components/search/extensions/seznam-cz/manifest.json
new file mode 100644
index 0000000000..838cbb497f
--- /dev/null
+++ b/comm/mail/components/search/extensions/seznam-cz/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Seznam",
+  "description": "Vyhledávání na Seznam.cz",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "seznam-cz@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Seznam",
+      "search_url": "https://search.seznam.cz/",
+      "search_form": "https://search.seznam.cz/?q={searchTerms}&sourceid=firefox",
+      "search_url_get_params": "q={searchTerms}&sourceid=firefox",
+      "suggest_url": "https://suggest.seznam.cz/fulltext_ff",
+      "suggest_url_get_params": "phrase={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/sslv/favicon.ico b/comm/mail/components/search/extensions/sslv/favicon.ico
new file mode 100644
index 0000000000..c6869229a2
--- /dev/null
+++ b/comm/mail/components/search/extensions/sslv/favicon.ico
diff --git a/comm/mail/components/search/extensions/sslv/manifest.json b/comm/mail/components/search/extensions/sslv/manifest.json
new file mode 100644
index 0000000000..3de8483fae
--- /dev/null
+++ b/comm/mail/components/search/extensions/sslv/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "SS.lv",
+  "description": "SS.lv - Lielākais sludinājumu serviss Latvijā",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "sslv@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "SS.lv",
+      "search_url": "https://www.ss.lv/lv/search_result/index.html",
+      "search_form": "https://www.ss.lv",
+      "search_url_post_params": "txt={searchTerms}&from=firefox-plugin"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/tearma/favicon.ico b/comm/mail/components/search/extensions/tearma/favicon.ico
new file mode 100644
index 0000000000..23866521ea
--- /dev/null
+++ b/comm/mail/components/search/extensions/tearma/favicon.ico
diff --git a/comm/mail/components/search/extensions/tearma/manifest.json b/comm/mail/components/search/extensions/tearma/manifest.json
new file mode 100644
index 0000000000..ae081f5927
--- /dev/null
+++ b/comm/mail/components/search/extensions/tearma/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "tearma.ie",
+  "description": "tearma.ie: Cuardach Comhtháite",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "tearma@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "tearma.ie",
+      "search_url": "https://www.tearma.ie/Search.aspx",
+      "search_form": "https://www.tearma.ie/Home.aspx",
+      "search_url_get_params": "term={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/tyda-sv-SE/favicon.ico b/comm/mail/components/search/extensions/tyda-sv-SE/favicon.ico
new file mode 100644
index 0000000000..7415cbb160
--- /dev/null
+++ b/comm/mail/components/search/extensions/tyda-sv-SE/favicon.ico
diff --git a/comm/mail/components/search/extensions/tyda-sv-SE/manifest.json b/comm/mail/components/search/extensions/tyda-sv-SE/manifest.json
new file mode 100644
index 0000000000..2e13ba2a52
--- /dev/null
+++ b/comm/mail/components/search/extensions/tyda-sv-SE/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Tyda.se",
+  "description": "Tyda.se, lexikon, ordlista och översättning.",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "tyda-sv-SE@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Tyda.se",
+      "search_url": "https://tyda.se",
+      "search_form": "https://tyda.se",
+      "search_url_get_params": "w={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/vatera/favicon.ico b/comm/mail/components/search/extensions/vatera/favicon.ico
new file mode 100644
index 0000000000..5b02f16cb9
--- /dev/null
+++ b/comm/mail/components/search/extensions/vatera/favicon.ico
diff --git a/comm/mail/components/search/extensions/vatera/manifest.json b/comm/mail/components/search/extensions/vatera/manifest.json
new file mode 100644
index 0000000000..af690f27e0
--- /dev/null
+++ b/comm/mail/components/search/extensions/vatera/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Vatera.hu",
+  "description": "Keresés a Vatera.hu piacterén",
+  "manifest_version": 2,
+  "version": "1.2",
+  "applications": {
+    "gecko": {
+      "id": "vatera@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Vatera.hu",
+      "encoding": "ISO-8859-2",
+      "search_url": "https://www.vatera.hu/listings/index.php",
+      "search_form": "https://www.vatera.hu/",
+      "search_url_get_params": "q={searchTerms}&c=0&td=on"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/NN/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/NN/messages.json
new file mode 100644
index 0000000000..04f669eed9
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/NN/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (nn)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, det frie oppslagsverket"
+  },
+  "searchUrl": {
+    "message": "https://nn.wikipedia.org/wiki/Spesial:Søk"
+  },
+  "searchForm": {
+    "message": "https://nn.wikipedia.org/wiki/Spesial:Søk?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://nn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/NO/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/NO/messages.json
new file mode 100644
index 0000000000..243806e727
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/NO/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (no)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, den frie encyklopedi"
+  },
+  "searchUrl": {
+    "message": "https://no.wikipedia.org/wiki/Spesial:Søk"
+  },
+  "searchForm": {
+    "message": "https://no.wikipedia.org/wiki/Spesial:Søk?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://no.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/af/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/af/messages.json
new file mode 100644
index 0000000000..9314533645
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/af/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (af)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, die vrye ensiklopedie"
+  },
+  "searchUrl": {
+    "message": "https://af.wikipedia.org/wiki/Spesiaal:Soek"
+  },
+  "searchForm": {
+    "message": "https://af.wikipedia.org/wiki/Spesiaal:Soek?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://af.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/an/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/an/messages.json
new file mode 100644
index 0000000000..ec6fdbf01e
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/an/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Biquipedia (an)"
+  },
+  "extensionDescription": {
+    "message": "A enciclopedia Libre"
+  },
+  "searchUrl": {
+    "message": "https://an.wikipedia.org/wiki/Especial:Mirar"
+  },
+  "searchForm": {
+    "message": "https://an.wikipedia.org/wiki/Especial:Mirar?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://an.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ar/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ar/messages.json
new file mode 100644
index 0000000000..7b5b0a2cab
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ar/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "ويكيبيديا (ar)"
+  },
+  "extensionDescription": {
+    "message": "ويكيبيديا (ar)"
+  },
+  "searchUrl": {
+    "message": "https://ar.wikipedia.org/wiki/خاص:بحث"
+  },
+  "searchForm": {
+    "message": "https://ar.wikipedia.org/wiki/خاص:بحث?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ar.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/as/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/as/messages.json
new file mode 100644
index 0000000000..ecdffd517e
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/as/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (as)"
+  },
+  "extensionDescription": {
+    "message": "ৱিকিপিডিয়া, এখন মুক্ত বিশ্বকোষ"
+  },
+  "searchUrl": {
+    "message": "https://as.wikipedia.org/wiki/বিশেষ:সন্ধান"
+  },
+  "searchForm": {
+    "message": "https://as.wikipedia.org/wiki/বিশেষ:সন্ধান?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://as.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ast/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ast/messages.json
new file mode 100644
index 0000000000..c6b9c18c88
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ast/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Uiquipedia (ast)"
+  },
+  "extensionDescription": {
+    "message": "La enciclopedia llibre"
+  },
+  "searchUrl": {
+    "message": "https://ast.wikipedia.org/wiki/Especial:Gueta"
+  },
+  "searchForm": {
+    "message": "https://ast.wikipedia.org/wiki/Especial:Gueta?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ast.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/az/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/az/messages.json
new file mode 100644
index 0000000000..638af3d874
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/az/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Vikipediya (az)"
+  },
+  "extensionDescription": {
+    "message": "Vikipediya, açıq ensiklopediya"
+  },
+  "searchUrl": {
+    "message": "https://az.wikipedia.org/wiki/Xüsusi:Axtar"
+  },
+  "searchForm": {
+    "message": "https://az.wikipedia.org/wiki/Xüsusi:Axtar?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://az.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/be-tarask/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/be-tarask/messages.json
new file mode 100644
index 0000000000..6a399c8268
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/be-tarask/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Вікіпэдыя (be-tarask)"
+  },
+  "extensionDescription": {
+    "message": "Вікіпэдыя, вольная энцыкляпэдыя"
+  },
+  "searchUrl": {
+    "message": "https://be-tarask.wikipedia.org/wiki/Спэцыяльныя:Пошук"
+  },
+  "searchForm": {
+    "message": "https://be-tarask.wikipedia.org/wiki/Спэцыяльныя:Пошук?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://be-tarask.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/be/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/be/messages.json
new file mode 100644
index 0000000000..651ecfa2aa
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/be/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Вікіпедыя (be)"
+  },
+  "extensionDescription": {
+    "message": "Вікіпедыя, свабодная энцыклапедыя"
+  },
+  "searchUrl": {
+    "message": "https://be.wikipedia.org/wiki/Адмысловае:Search"
+  },
+  "searchForm": {
+    "message": "https://be.wikipedia.org/wiki/Адмысловае:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://be.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/bg/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/bg/messages.json
new file mode 100644
index 0000000000..4061aa8e94
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/bg/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Уикипедия (bg)"
+  },
+  "extensionDescription": {
+    "message": "Уикипедия, свободната енциклоподия"
+  },
+  "searchUrl": {
+    "message": "https://bg.wikipedia.org/wiki/Специални:Търсене"
+  },
+  "searchForm": {
+    "message": "https://bg.wikipedia.org/wiki/Специални:Търсене?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://bg.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/bn/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/bn/messages.json
new file mode 100644
index 0000000000..c41a811f81
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/bn/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "উইকিপিডিয়া (bn)"
+  },
+  "extensionDescription": {
+    "message": "উইকিপিডিয়া, মুক্ত বিশ্বকোষ"
+  },
+  "searchUrl": {
+    "message": "https://bn.wikipedia.org/wiki/বিশেষ:Search"
+  },
+  "searchForm": {
+    "message": "https://bn.wikipedia.org/wiki/বিশেষ:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://bn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/br/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/br/messages.json
new file mode 100644
index 0000000000..7f59a6dd26
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/br/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (br)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, an holloueziadur digor"
+  },
+  "searchUrl": {
+    "message": "https://br.wikipedia.org/wiki/Dibar:Klask"
+  },
+  "searchForm": {
+    "message": "https://br.wikipedia.org/wiki/Dibar:Klask?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://br.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/bs/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/bs/messages.json
new file mode 100644
index 0000000000..06e27829f3
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/bs/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (bs)"
+  },
+  "extensionDescription": {
+    "message": "Slobodna enciklopedija"
+  },
+  "searchUrl": {
+    "message": "https://bs.wikipedia.org/wiki/Posebno:Pretraga"
+  },
+  "searchForm": {
+    "message": "https://bs.wikipedia.org/wiki/Posebno:Pretraga?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://bs.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ca/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ca/messages.json
new file mode 100644
index 0000000000..22ab489096
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ca/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Viquipèdia (ca)"
+  },
+  "extensionDescription": {
+    "message": "L'enciclopèdia lliure"
+  },
+  "searchUrl": {
+    "message": "https://ca.wikipedia.org/wiki/Especial:Cerca"
+  },
+  "searchForm": {
+    "message": "https://ca.wikipedia.org/wiki/Especial:Cerca?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ca.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/crh/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/crh/messages.json
new file mode 100644
index 0000000000..1e1a76452c
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/crh/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Vikipediya (crh)"
+  },
+  "extensionDescription": {
+    "message": "Vikipediya, Azat Entsiklopediya"
+  },
+  "searchUrl": {
+    "message": "https://crh.wikipedia.org/wiki/Mahsus:Search"
+  },
+  "searchForm": {
+    "message": "https://crh.wikipedia.org/wiki/Mahsus:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://crh.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/cy/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/cy/messages.json
new file mode 100644
index 0000000000..62915e52a5
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/cy/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wicipedia (cy)"
+  },
+  "extensionDescription": {
+    "message": "Wicipedia, Y Gwyddioniadur Rhydd"
+  },
+  "searchUrl": {
+    "message": "https://cy.wikipedia.org/wiki/Arbennig:Search"
+  },
+  "searchForm": {
+    "message": "https://cy.wikipedia.org/wiki/Arbennig:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://cy.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/cz/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/cz/messages.json
new file mode 100644
index 0000000000..53b17f885a
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/cz/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedie (cs)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, svobodná encyclopedie"
+  },
+  "searchUrl": {
+    "message": "https://cs.wikipedia.org/wiki/Speciální:Hledání"
+  },
+  "searchForm": {
+    "message": "https://cs.wikipedia.org/wiki/Speciální:Hledání?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://cs.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/da/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/da/messages.json
new file mode 100644
index 0000000000..5deb79d125
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/da/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (da)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, den frie encyklopædi"
+  },
+  "searchUrl": {
+    "message": "https://da.wikipedia.org/wiki/Speciel:Søgning"
+  },
+  "searchForm": {
+    "message": "https://da.wikipedia.org/wiki/Speciel:Søgning?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://da.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/de/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/de/messages.json
new file mode 100644
index 0000000000..c4d2dd558c
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/de/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (de)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, die freie Enzyklopädie"
+  },
+  "searchUrl": {
+    "message": "https://de.wikipedia.org/wiki/Spezial:Suche"
+  },
+  "searchForm": {
+    "message": "https://de.wikipedia.org/wiki/Spezial:Suche?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://de.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/dsb/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/dsb/messages.json
new file mode 100644
index 0000000000..e8cb687084
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/dsb/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedija (dsb)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedija, lichotna encyklopedija"
+  },
+  "searchUrl": {
+    "message": "https://dsb.wikipedia.org/wiki/Specialne:Pytaś"
+  },
+  "searchForm": {
+    "message": "https://dsb.wikipedia.org/wiki/Specialne:Pytaś?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://dsb.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/el/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/el/messages.json
new file mode 100644
index 0000000000..5b8c494f98
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/el/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (el)"
+  },
+  "extensionDescription": {
+    "message": "Βικιπαίδεια, η ελεύθερη εγκυκλοπαίδεια"
+  },
+  "searchUrl": {
+    "message": "https://el.wikipedia.org/wiki/Ειδικό:Αναζήτηση"
+  },
+  "searchForm": {
+    "message": "https://el.wikipedia.org/wiki/Ειδικό:Αναζήτηση?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://el.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/en/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/en/messages.json
new file mode 100644
index 0000000000..56c69e5c32
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/en/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (en)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, the Free Encyclopedia"
+  },
+  "searchUrl": {
+    "message": "https://en.wikipedia.org/wiki/Special:Search"
+  },
+  "searchForm": {
+    "message": "https://en.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://en.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/eo/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/eo/messages.json
new file mode 100644
index 0000000000..66b3212e5b
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/eo/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Vikipedio (eo)"
+  },
+  "extensionDescription": {
+    "message": "Vikipedio, la libera enciklopedio"
+  },
+  "searchUrl": {
+    "message": "https://eo.wikipedia.org/wiki/Specialaĵo:Serĉi"
+  },
+  "searchForm": {
+    "message": "https://eo.wikipedia.org/wiki/Specialaĵo:Serĉi?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://eo.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/es/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/es/messages.json
new file mode 100644
index 0000000000..ff797d0834
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/es/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (es)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, la enciclopedia libre"
+  },
+  "searchUrl": {
+    "message": "https://es.wikipedia.org/wiki/Especial:Buscar"
+  },
+  "searchForm": {
+    "message": "https://es.wikipedia.org/wiki/Especial:Buscar?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://es.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/et/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/et/messages.json
new file mode 100644
index 0000000000..25cf22893b
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/et/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Vikipeedia (et)"
+  },
+  "extensionDescription": {
+    "message": "Vikipeedia, vaba entsüklopeedia"
+  },
+  "searchUrl": {
+    "message": "https://et.wikipedia.org/wiki/Eri:Otsimine"
+  },
+  "searchForm": {
+    "message": "https://et.wikipedia.org/wiki/Eri:Otsimine?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://et.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/eu/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/eu/messages.json
new file mode 100644
index 0000000000..eea1c365d8
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/eu/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (eu)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, entziklopedia askea"
+  },
+  "searchUrl": {
+    "message": "https://eu.wikipedia.org/wiki/Berezi:Bilatu"
+  },
+  "searchForm": {
+    "message": "https://eu.wikipedia.org/wiki/Berezi:Bilatu?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://eu.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/fa/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/fa/messages.json
new file mode 100644
index 0000000000..a48eca478f
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/fa/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "ویکی‌پدیا (fa)"
+  },
+  "extensionDescription": {
+    "message": "ویکی‌پدیا، دانشنامهٔ آزاد"
+  },
+  "searchUrl": {
+    "message": "https://fa.wikipedia.org/wiki/ویژه:جستجو"
+  },
+  "searchForm": {
+    "message": "https://fa.wikipedia.org/wiki/ویژه:جستجو?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://fa.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/fi/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/fi/messages.json
new file mode 100644
index 0000000000..696a953ca1
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/fi/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (fi)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia (fi), vapaa tietosanakirja"
+  },
+  "searchUrl": {
+    "message": "https://fi.wikipedia.org/wiki/Toiminnot:Haku"
+  },
+  "searchForm": {
+    "message": "https://fi.wikipedia.org/wiki/Toiminnot:Haku?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://fi.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/fr/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/fr/messages.json
new file mode 100644
index 0000000000..80612181ad
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/fr/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipédia (fr)"
+  },
+  "extensionDescription": {
+    "message": "Wikipédia, l'encyclopédie libre"
+  },
+  "searchUrl": {
+    "message": "https://fr.wikipedia.org/wiki/Spécial:Recherche"
+  },
+  "searchForm": {
+    "message": "https://fr.wikipedia.org/wiki/Spécial:Recherche?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://fr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/fy-NL/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/fy-NL/messages.json
new file mode 100644
index 0000000000..4767aad436
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/fy-NL/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedy (fy)"
+  },
+  "extensionDescription": {
+    "message": "De fergese ensyklopedy"
+  },
+  "searchUrl": {
+    "message": "https://fy.wikipedia.org/wiki/Wiki:Sykje"
+  },
+  "searchForm": {
+    "message": "https://fy.wikipedia.org/wiki/Wiki:Sykje?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://fy.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ga-IE/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ga-IE/messages.json
new file mode 100644
index 0000000000..a9330bb066
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ga-IE/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Vicipéid (ga)"
+  },
+  "extensionDescription": {
+    "message": "Vicipéid, an Chiclipéid Shaor"
+  },
+  "searchUrl": {
+    "message": "https://ga.wikipedia.org/wiki/Speisialta:Search"
+  },
+  "searchForm": {
+    "message": "https://ga.wikipedia.org/wiki/Speisialta:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ga.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/gd/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/gd/messages.json
new file mode 100644
index 0000000000..3b389e12c8
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/gd/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Uicipeid (gd)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, An leabhar mòr-eòlais"
+  },
+  "searchUrl": {
+    "message": "https://gd.wikipedia.org/wiki/Sònraichte:Search"
+  },
+  "searchForm": {
+    "message": "https://gd.wikipedia.org/wiki/Sònraichte:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://gd.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/gl/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/gl/messages.json
new file mode 100644
index 0000000000..18cc3d73f6
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/gl/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (gl)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, a enciclopedia libre"
+  },
+  "searchUrl": {
+    "message": "https://gl.wikipedia.org/wiki/Especial:Procurar"
+  },
+  "searchForm": {
+    "message": "https://gl.wikipedia.org/wiki/Especial:Procurar?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://gl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/gn/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/gn/messages.json
new file mode 100644
index 0000000000..e914aa66bb
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/gn/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Vikipetã (gn)"
+  },
+  "extensionDescription": {
+    "message": "Vikipetã, opaite tembikuaa hekosãsóva renda"
+  },
+  "searchUrl": {
+    "message": "https://gn.wikipedia.org/wiki/Mba'echĩchĩ:Buscar"
+  },
+  "searchForm": {
+    "message": "https://gn.wikipedia.org/wiki/Mba'echĩchĩ:Buscar?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://gn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/gu/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/gu/messages.json
new file mode 100644
index 0000000000..f268ccb6af
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/gu/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "વિકિપીડિયા (gu)"
+  },
+  "extensionDescription": {
+    "message": "વીકીપીડિયા, મુક્ત એનસાયક્લોપીડિયા"
+  },
+  "searchUrl": {
+    "message": "https://gu.wikipedia.org/wiki/વિશેષ:શોધ"
+  },
+  "searchForm": {
+    "message": "https://gu.wikipedia.org/wiki/વિશેષ:શોધ?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://gu.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/he/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/he/messages.json
new file mode 100644
index 0000000000..f8a548f72c
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/he/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "ויקיפדיה"
+  },
+  "extensionDescription": {
+    "message": "ויקיפדיה"
+  },
+  "searchUrl": {
+    "message": "https://he.wikipedia.org/wiki/מיוחד:חיפוש"
+  },
+  "searchForm": {
+    "message": "https://he.wikipedia.org/wiki/מיוחד:חיפוש?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://he.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/hi/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/hi/messages.json
new file mode 100644
index 0000000000..7db4ed195f
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/hi/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "विकिपीडिया (hi)"
+  },
+  "extensionDescription": {
+    "message": "विकिपीडिया (हिन्दी)"
+  },
+  "searchUrl": {
+    "message": "https://hi.wikipedia.org/wiki/विशेष:खोज"
+  },
+  "searchForm": {
+    "message": "https://hi.wikipedia.org/wiki/विशेष:खोज?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://hi.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/hr/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/hr/messages.json
new file mode 100644
index 0000000000..f02f694c9a
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/hr/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedija (hr)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedija, slobodna enciklopedija"
+  },
+  "searchUrl": {
+    "message": "https://hr.wikipedia.org/wiki/Posebno:Traži"
+  },
+  "searchForm": {
+    "message": "https://hr.wikipedia.org/wiki/Posebno:Traži?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://hr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/hsb/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/hsb/messages.json
new file mode 100644
index 0000000000..a459ffbe46
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/hsb/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedija (hsb)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedija, swobodna encyklopedija"
+  },
+  "searchUrl": {
+    "message": "https://hsb.wikipedia.org/wiki/Specialnje:Pytać"
+  },
+  "searchForm": {
+    "message": "https://hsb.wikipedia.org/wiki/Specialnje:Pytać?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://hsb.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/hu/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/hu/messages.json
new file mode 100644
index 0000000000..37e725d687
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/hu/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipédia (hu)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, a szabad enciklopédia"
+  },
+  "searchUrl": {
+    "message": "https://hu.wikipedia.org/wiki/Speciális:Keresés"
+  },
+  "searchForm": {
+    "message": "https://hu.wikipedia.org/wiki/Speciális:Keresés?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://hu.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/hy/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/hy/messages.json
new file mode 100644
index 0000000000..a6d527cc4e
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/hy/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (hy)"
+  },
+  "extensionDescription": {
+    "message": "Վիքիփեդիա՝ ազատ հանրագիտարան"
+  },
+  "searchUrl": {
+    "message": "https://hy.wikipedia.org/wiki/Սպասարկող:Որոնել"
+  },
+  "searchForm": {
+    "message": "https://hy.wikipedia.org/wiki/Սպասարկող:Որոնել?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://hy.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ia/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ia/messages.json
new file mode 100644
index 0000000000..fbca585c30
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ia/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (ia)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, le encyclopedia libere"
+  },
+  "searchUrl": {
+    "message": "https://ia.wikipedia.org/wiki/Special:Recerca"
+  },
+  "searchForm": {
+    "message": "https://ia.wikipedia.org/wiki/Special:Recerca?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ia.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/id/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/id/messages.json
new file mode 100644
index 0000000000..608dad05b7
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/id/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (id)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, ensiklopedia bebas"
+  },
+  "searchUrl": {
+    "message": "https://id.wikipedia.org/wiki/Istimewa:Pencarian"
+  },
+  "searchForm": {
+    "message": "https://id.wikipedia.org/wiki/Istimewa:Pencarian?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://id.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/is/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/is/messages.json
new file mode 100644
index 0000000000..f33e0dd015
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/is/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (is)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, the free encyclopedia"
+  },
+  "searchUrl": {
+    "message": "https://is.wikipedia.org/wiki/Kerfissíða:Leit"
+  },
+  "searchForm": {
+    "message": "https://is.wikipedia.org/wiki/Kerfissíða:Leit?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://is.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/it/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/it/messages.json
new file mode 100644
index 0000000000..27cff3c07b
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/it/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (it)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, l'enciclopedia libera"
+  },
+  "searchUrl": {
+    "message": "https://it.wikipedia.org/wiki/Speciale:Ricerca"
+  },
+  "searchForm": {
+    "message": "https://it.wikipedia.org/wiki/Speciale:Ricerca?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://it.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ja/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ja/messages.json
new file mode 100644
index 0000000000..84df085d54
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ja/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (ja)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia - フリー百科事典"
+  },
+  "searchUrl": {
+    "message": "https://ja.wikipedia.org/wiki/特別:検索"
+  },
+  "searchForm": {
+    "message": "https://ja.wikipedia.org/wiki/特別:検索?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ja.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ka/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ka/messages.json
new file mode 100644
index 0000000000..efe876cded
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ka/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "ვიკიპედია (ka)"
+  },
+  "extensionDescription": {
+    "message": "ვიკიპედია, თავისუფალი ენციკლოპედია"
+  },
+  "searchUrl": {
+    "message": "https://ka.wikipedia.org/wiki/სპეციალური:ძიება"
+  },
+  "searchForm": {
+    "message": "https://ka.wikipedia.org/wiki/სპეციალური:ძიება?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ka.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/kab/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/kab/messages.json
new file mode 100644
index 0000000000..375b69d098
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/kab/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (kab)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, tasanayt tilellit"
+  },
+  "searchUrl": {
+    "message": "https://kab.wikipedia.org/wiki/Uslig:Search"
+  },
+  "searchForm": {
+    "message": "https://kab.wikipedia.org/wiki/Uslig:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://kab.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/kk/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/kk/messages.json
new file mode 100644
index 0000000000..ae3ce7cc1a
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/kk/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Уикипедия (kk)"
+  },
+  "extensionDescription": {
+    "message": "Уикипедия (kk)"
+  },
+  "searchUrl": {
+    "message": "https://kk.wikipedia.org/wiki/Арнайы:Іздеу"
+  },
+  "searchForm": {
+    "message": "https://kk.wikipedia.org/wiki/Арнайы:Іздеу?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://kk.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/km/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/km/messages.json
new file mode 100644
index 0000000000..ca51223b15
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/km/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "វីគីភីឌា (km)"
+  },
+  "extensionDescription": {
+    "message": "វីគីភីឌា សព្វ​វចនា​ធិប្បាយ​សេរី"
+  },
+  "searchUrl": {
+    "message": "https://km.wikipedia.org/wiki/ពិសេស:ស្វែងរក"
+  },
+  "searchForm": {
+    "message": "https://km.wikipedia.org/wiki/ពិសេស:ស្វែងរក?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://km.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/kn/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/kn/messages.json
new file mode 100644
index 0000000000..20958768cb
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/kn/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (kn)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, the free encyclopedia"
+  },
+  "searchUrl": {
+    "message": "https://kn.wikipedia.org/wiki/ವಿಶೇಷ:Search"
+  },
+  "searchForm": {
+    "message": "https://kn.wikipedia.org/wiki/ವಿಶೇಷ:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://kn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/kr/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/kr/messages.json
new file mode 100644
index 0000000000..9504c3ffb9
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/kr/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "위키백과 (ko)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, the free encyclopedia"
+  },
+  "searchUrl": {
+    "message": "https://ko.wikipedia.org/wiki/특수기능:찾기"
+  },
+  "searchForm": {
+    "message": "https://ko.wikipedia.org/wiki/특수기능:찾기?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ko.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/lij/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/lij/messages.json
new file mode 100644
index 0000000000..83a20b3776
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/lij/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (lij)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, l'enciclopedia libera"
+  },
+  "searchUrl": {
+    "message": "https://lij.wikipedia.org/wiki/Speçiale:Riçerca"
+  },
+  "searchForm": {
+    "message": "https://lij.wikipedia.org/wiki/Speçiale:Riçerca?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://lij.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/lo/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/lo/messages.json
new file mode 100644
index 0000000000..30f9b0ff26
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/lo/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "ວິກິພີເດຍ (lo)"
+  },
+  "extensionDescription": {
+    "message": "ວິກິພີເດຍ, ສາລານຸກົມເສລີ"
+  },
+  "searchUrl": {
+    "message": "https://lo.wikipedia.org/wiki/ພິເສດ:ຊອກຫາ"
+  },
+  "searchForm": {
+    "message": "https://lo.wikipedia.org/wiki/ພິເສດ:ຊອກຫາ?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://lo.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/lt/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/lt/messages.json
new file mode 100644
index 0000000000..93ce604144
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/lt/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (lt)"
+  },
+  "extensionDescription": {
+    "message": "Vikipedija, laisvoji enciklopedija"
+  },
+  "searchUrl": {
+    "message": "https://lt.wikipedia.org/wiki/Specialus:Paieška"
+  },
+  "searchForm": {
+    "message": "https://lt.wikipedia.org/wiki/Specialus:Paieška?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://lt.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ltg/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ltg/messages.json
new file mode 100644
index 0000000000..0456f31dba
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ltg/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Vikipedeja (ltg)"
+  },
+  "extensionDescription": {
+    "message": "Vikipēdija, breivuo eņciklopedeja"
+  },
+  "searchUrl": {
+    "message": "https://ltg.wikipedia.org/wiki/Seviškuo:Search"
+  },
+  "searchForm": {
+    "message": "https://ltg.wikipedia.org/wiki/Seviškuo:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ltg.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/lv/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/lv/messages.json
new file mode 100644
index 0000000000..90b542f4b4
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/lv/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Vikipēdija"
+  },
+  "extensionDescription": {
+    "message": "Vikipēdija, brīvā enciklopēdija"
+  },
+  "searchUrl": {
+    "message": "https://lv.wikipedia.org/wiki/Special:Search"
+  },
+  "searchForm": {
+    "message": "https://lv.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://lv.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/mk/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/mk/messages.json
new file mode 100644
index 0000000000..ae826197ff
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/mk/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Википедија (mk)"
+  },
+  "extensionDescription": {
+    "message": "Википедија, слободната енциклопедија"
+  },
+  "searchUrl": {
+    "message": "https://mk.wikipedia.org/wiki/Специјална:Барај"
+  },
+  "searchForm": {
+    "message": "https://mk.wikipedia.org/wiki/Специјална:Барај?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://mk.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ml/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ml/messages.json
new file mode 100644
index 0000000000..9f4b397904
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ml/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "വിക്കിപീഡിയ (ml)"
+  },
+  "extensionDescription": {
+    "message": "വിക്കിപീഡിയ, സ്വതന്ത്ര സര്‍വ്വവിജ്ഞാനകോശം "
+  },
+  "searchUrl": {
+    "message": "https://ml.wikipedia.org/wiki/പ്രത്യേകം:അന്വേഷണം"
+  },
+  "searchForm": {
+    "message": "https://ml.wikipedia.org/wiki/പ്രത്യേകം:അന്വേഷണം?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ml.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/mr/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/mr/messages.json
new file mode 100644
index 0000000000..42bd8e2426
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/mr/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "विकिपीडिया (mr)"
+  },
+  "extensionDescription": {
+    "message": "विकिपीडिया, मोफत माहितीकोष"
+  },
+  "searchUrl": {
+    "message": "https://mr.wikipedia.org/wiki/विशेष:शोधा"
+  },
+  "searchForm": {
+    "message": "https://mr.wikipedia.org/wiki/विशेष:शोधा?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://mr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ms/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ms/messages.json
new file mode 100644
index 0000000000..e804b1796a
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ms/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (ms)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, ensiklopedia bebas"
+  },
+  "searchUrl": {
+    "message": "https://ms.wikipedia.org/wiki/Khas:Gelintar"
+  },
+  "searchForm": {
+    "message": "https://ms.wikipedia.org/wiki/Khas:Gelintar?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ms.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/my/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/my/messages.json
new file mode 100644
index 0000000000..e0fda1a466
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/my/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (my)"
+  },
+  "extensionDescription": {
+    "message": "အခမဲ့လွတ်လပ်စွယ်စုံကျမ်း"
+  },
+  "searchUrl": {
+    "message": "https://my.wikipedia.org/wiki/Special:Search"
+  },
+  "searchForm": {
+    "message": "https://my.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://my.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ne/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ne/messages.json
new file mode 100644
index 0000000000..1d549a943e
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ne/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "विकिपीडिया (ne)"
+  },
+  "extensionDescription": {
+    "message": "विकिपिडिया एक स्वतन्त्र विश्वकोष"
+  },
+  "searchUrl": {
+    "message": "https://ne.wikipedia.org/wiki/विशेष:Search"
+  },
+  "searchForm": {
+    "message": "https://ne.wikipedia.org/wiki/विशेष:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ne.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/nl/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/nl/messages.json
new file mode 100644
index 0000000000..2dda1f6deb
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/nl/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (nl)"
+  },
+  "extensionDescription": {
+    "message": "De vrije encyclopedie"
+  },
+  "searchUrl": {
+    "message": "https://nl.wikipedia.org/wiki/Speciaal:Zoeken"
+  },
+  "searchForm": {
+    "message": "https://nl.wikipedia.org/wiki/Speciaal:Zoeken?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://nl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/oc/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/oc/messages.json
new file mode 100644
index 0000000000..b341752c63
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/oc/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipèdia (oc)"
+  },
+  "extensionDescription": {
+    "message": "Wikipèdia, l'enciclopèdia liura"
+  },
+  "searchUrl": {
+    "message": "https://oc.wikipedia.org/wiki/Especial:Recèrca"
+  },
+  "searchForm": {
+    "message": "https://oc.wikipedia.org/wiki/Especial:Recèrca?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://oc.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/or/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/or/messages.json
new file mode 100644
index 0000000000..b07957a4b7
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/or/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (or)"
+  },
+  "extensionDescription": {
+    "message": "ୱିକିପିଡ଼ିଆ  (ଓଡ଼ିଆ)"
+  },
+  "searchUrl": {
+    "message": "https://or.wikipedia.org/wiki/ବିଶେଷ:ଖୋଜନ୍ତୁ"
+  },
+  "searchForm": {
+    "message": "https://or.wikipedia.org/wiki/ବିଶେଷ:ଖୋଜନ୍ତୁ?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://or.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/pa/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/pa/messages.json
new file mode 100644
index 0000000000..07804ca265
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/pa/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (pa)"
+  },
+  "extensionDescription": {
+    "message": "ਵਿਕਿਪੀਡਿਆ, ਮੁਫ਼ਤ/ਮੁਕਤ ਸ਼ਬਦਕੋਸ਼"
+  },
+  "searchUrl": {
+    "message": "https://pa.wikipedia.org/wiki/ਖ਼ਾਸ:ਖੋਜੋ"
+  },
+  "searchForm": {
+    "message": "https://pa.wikipedia.org/wiki/ਖ਼ਾਸ:ਖੋਜੋ?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://pa.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/pl/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/pl/messages.json
new file mode 100644
index 0000000000..3e7704b21a
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/pl/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (pl)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, wolna encyklopedia"
+  },
+  "searchUrl": {
+    "message": "https://pl.wikipedia.org/wiki/Specjalna:Szukaj"
+  },
+  "searchForm": {
+    "message": "https://pl.wikipedia.org/wiki/Specjalna:Szukaj?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://pl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/pt/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/pt/messages.json
new file mode 100644
index 0000000000..8e9bc20c77
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/pt/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (pt)"
+  },
+  "extensionDescription": {
+    "message": "Wikipédia, a enciclopédia livre"
+  },
+  "searchUrl": {
+    "message": "https://pt.wikipedia.org/wiki/Especial:Pesquisar"
+  },
+  "searchForm": {
+    "message": "https://pt.wikipedia.org/wiki/Especial:Pesquisar?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://pt.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/rm/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/rm/messages.json
new file mode 100644
index 0000000000..889657ad7e
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/rm/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (rm)"
+  },
+  "extensionDescription": {
+    "message": "Vichipedia, l'enciclopedia libra"
+  },
+  "searchUrl": {
+    "message": "https://rm.wikipedia.org/wiki/Spezial:Search"
+  },
+  "searchForm": {
+    "message": "https://rm.wikipedia.org/wiki/Spezial:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://rm.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ro/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ro/messages.json
new file mode 100644
index 0000000000..8aac1e2244
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ro/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (ro)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, enciclopedia liberă"
+  },
+  "searchUrl": {
+    "message": "https://ro.wikipedia.org/wiki/Special:Căutare"
+  },
+  "searchForm": {
+    "message": "https://ro.wikipedia.org/wiki/Special:Căutare?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ro.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ru/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ru/messages.json
new file mode 100644
index 0000000000..49243790a6
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ru/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Википедия (ru)"
+  },
+  "extensionDescription": {
+    "message": "Википедия, свободная энциклопедия"
+  },
+  "searchUrl": {
+    "message": "https://ru.wikipedia.org/wiki/Служебная:Поиск"
+  },
+  "searchForm": {
+    "message": "https://ru.wikipedia.org/wiki/Служебная:Поиск?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ru.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/si/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/si/messages.json
new file mode 100644
index 0000000000..dea75a5308
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/si/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (si)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, the free encyclopedia"
+  },
+  "searchUrl": {
+    "message": "https://si.wikipedia.org/wiki/විශේෂ:ගවේෂණය"
+  },
+  "searchForm": {
+    "message": "https://si.wikipedia.org/wiki/විශේෂ:ගවේෂණය?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://si.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/sk/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/sk/messages.json
new file mode 100644
index 0000000000..3cfa642df7
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/sk/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipédia (sk)"
+  },
+  "extensionDescription": {
+    "message": "Wikipédia, slobodná a otvorená encyklopédia"
+  },
+  "searchUrl": {
+    "message": "https://sk.wikipedia.org/wiki/Špeciálne:Hľadanie"
+  },
+  "searchForm": {
+    "message": "https://sk.wikipedia.org/wiki/Špeciálne:Hľadanie?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://sk.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/sl/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/sl/messages.json
new file mode 100644
index 0000000000..0e9b8433a4
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/sl/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedija (sl)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedija, prosta enciklopedija"
+  },
+  "searchUrl": {
+    "message": "https://sl.wikipedia.org/wiki/Posebno:Iskanje"
+  },
+  "searchForm": {
+    "message": "https://sl.wikipedia.org/wiki/Posebno:Iskanje?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://sl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/sq/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/sq/messages.json
new file mode 100644
index 0000000000..6d6240b54f
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/sq/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (sq)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, enciklopedia e lirë"
+  },
+  "searchUrl": {
+    "message": "https://sq.wikipedia.org/wiki/Speciale:Kërkim"
+  },
+  "searchForm": {
+    "message": "https://sq.wikipedia.org/wiki/Speciale:Kërkim?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://sq.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/sr/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/sr/messages.json
new file mode 100644
index 0000000000..cf1558ffe9
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/sr/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Википедија (sr)"
+  },
+  "extensionDescription": {
+    "message": "Претрага Википедије на српском језику"
+  },
+  "searchUrl": {
+    "message": "https://sr.wikipedia.org/wiki/Посебно:Претражи"
+  },
+  "searchForm": {
+    "message": "https://sr.wikipedia.org/wiki/Посебно:Претражи?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://sr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/sv-SE/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/sv-SE/messages.json
new file mode 100644
index 0000000000..4912d25364
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/sv-SE/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (sv)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, den fria encyklopedin"
+  },
+  "searchUrl": {
+    "message": "https://sv.wikipedia.org/wiki/Special:Sök"
+  },
+  "searchForm": {
+    "message": "https://sv.wikipedia.org/wiki/Special:Sök?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://sv.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ta/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ta/messages.json
new file mode 100644
index 0000000000..b6de753a1f
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ta/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "விக்கிப்பீடியா (ta)"
+  },
+  "extensionDescription": {
+    "message": "விக்கிப்பீடியா (ta)"
+  },
+  "searchUrl": {
+    "message": "https://ta.wikipedia.org/wiki/சிறப்பு:Search"
+  },
+  "searchForm": {
+    "message": "https://ta.wikipedia.org/wiki/சிறப்பு:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ta.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/te/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/te/messages.json
new file mode 100644
index 0000000000..f9352844d1
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/te/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "వికీపీడియా (te)"
+  },
+  "extensionDescription": {
+    "message": "వికీపీడియా (te)"
+  },
+  "searchUrl": {
+    "message": "https://te.wikipedia.org/wiki/ప్రత్యేక:అన్వేషణ"
+  },
+  "searchForm": {
+    "message": "https://te.wikipedia.org/wiki/ప్రత్యేక:అన్వేషణ?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://te.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/th/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/th/messages.json
new file mode 100644
index 0000000000..0176b84b7b
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/th/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "วิกิพีเดีย"
+  },
+  "extensionDescription": {
+    "message": "วิกิพีเดีย สารานุกรมเสรี"
+  },
+  "searchUrl": {
+    "message": "https://th.wikipedia.org/wiki/พิเศษ:ค้นหา"
+  },
+  "searchForm": {
+    "message": "https://th.wikipedia.org/wiki/พิเศษ:ค้นหา?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://th.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/tl/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/tl/messages.json
new file mode 100644
index 0000000000..a5faae07cd
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/tl/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (tl)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, ang malayang ensiklopedya"
+  },
+  "searchUrl": {
+    "message": "https://tl.wikipedia.org/wiki/Natatangi:Maghanap"
+  },
+  "searchForm": {
+    "message": "https://tl.wikipedia.org/wiki/Natatangi:Maghanap?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://tl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/tr/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/tr/messages.json
new file mode 100644
index 0000000000..7551d615f0
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/tr/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (tr)"
+  },
+  "extensionDescription": {
+    "message": "Vikipedi, özgür ansiklopedi"
+  },
+  "searchUrl": {
+    "message": "https://tr.wikipedia.org/wiki/Özel:Ara"
+  },
+  "searchForm": {
+    "message": "https://tr.wikipedia.org/wiki/Özel:Ara?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://tr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/uk/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/uk/messages.json
new file mode 100644
index 0000000000..c81490394b
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/uk/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Вікіпедія (uk)"
+  },
+  "extensionDescription": {
+    "message": "Вікіпедія, вільна енциклопедія"
+  },
+  "searchUrl": {
+    "message": "https://uk.wikipedia.org/wiki/Спеціальна:Пошук"
+  },
+  "searchForm": {
+    "message": "https://uk.wikipedia.org/wiki/Спеціальна:Пошук?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://uk.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/ur/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/ur/messages.json
new file mode 100644
index 0000000000..f27436e3a4
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/ur/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "ویکیپیڈیا (ur)"
+  },
+  "extensionDescription": {
+    "message": "ویکیپیڈیا آزاد دائرۃ المعارف"
+  },
+  "searchUrl": {
+    "message": "https://ur.wikipedia.org/wiki/خاص:تلاش"
+  },
+  "searchForm": {
+    "message": "https://ur.wikipedia.org/wiki/خاص:تلاش?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://ur.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/uz/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/uz/messages.json
new file mode 100644
index 0000000000..eff11c31e2
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/uz/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Vikipediya (uz)"
+  },
+  "extensionDescription": {
+    "message": "Vikipediya, ochiq ensiklopediya"
+  },
+  "searchUrl": {
+    "message": "https://uz.wikipedia.org/wiki/Maxsus:Search"
+  },
+  "searchForm": {
+    "message": "https://uz.wikipedia.org/wiki/Maxsus:Search?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://uz.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/vi/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/vi/messages.json
new file mode 100644
index 0000000000..cfab54090e
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/vi/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (vi)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, bách khoa toàn thư mở"
+  },
+  "searchUrl": {
+    "message": "https://vi.wikipedia.org/wiki/Đặc_biệt:Tìm_kiếm"
+  },
+  "searchForm": {
+    "message": "https://vi.wikipedia.org/wiki/Đặc_biệt:Tìm_kiếm?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://vi.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/wo/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/wo/messages.json
new file mode 100644
index 0000000000..43f133c54b
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/wo/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (wo)"
+  },
+  "extensionDescription": {
+    "message": "Wikipedia, Jimbulang bu Ubbeeku bi"
+  },
+  "searchUrl": {
+    "message": "https://wo.wikipedia.org/wiki/Jagleel:Ceet"
+  },
+  "searchForm": {
+    "message": "https://wo.wikipedia.org/wiki/Jagleel:Ceet?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://wo.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/zh-CN/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/zh-CN/messages.json
new file mode 100644
index 0000000000..840677e3dd
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/zh-CN/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "维基百科"
+  },
+  "extensionDescription": {
+    "message": "维基百科，自由的百科全书"
+  },
+  "searchUrl": {
+    "message": "https://zh.wikipedia.org/wiki/Special:搜索"
+  },
+  "searchForm": {
+    "message": "https://zh.wikipedia.org/wiki/Special:搜索?search={searchTerms}&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://zh.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/_locales/zh-TW/messages.json b/comm/mail/components/search/extensions/wikipedia/_locales/zh-TW/messages.json
new file mode 100644
index 0000000000..60151f4265
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/_locales/zh-TW/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikipedia (zh)"
+  },
+  "extensionDescription": {
+    "message": "維基百科，自由的百科全書"
+  },
+  "searchUrl": {
+    "message": "https://zh.wikipedia.org/wiki/Special:搜索"
+  },
+  "searchForm": {
+    "message": "https://zh.wikipedia.org/wiki/Special:搜索?search={searchTerms}&sourceid=Mozilla-search&variant=zh-tw"
+  },
+  "suggestUrl": {
+    "message": "https://zh.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}&sourceid=Mozilla-search&variant=zh-tw"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wikipedia/favicon.ico b/comm/mail/components/search/extensions/wikipedia/favicon.ico
new file mode 100644
index 0000000000..4314071e24
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/favicon.ico
diff --git a/comm/mail/components/search/extensions/wikipedia/manifest.json b/comm/mail/components/search/extensions/wikipedia/manifest.json
new file mode 100644
index 0000000000..f26061aadb
--- /dev/null
+++ b/comm/mail/components/search/extensions/wikipedia/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "wikipedia@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "en",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "suggest_url": "__MSG_suggestUrl__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/wiktionary/_locales/oc/messages.json b/comm/mail/components/search/extensions/wiktionary/_locales/oc/messages.json
new file mode 100644
index 0000000000..612ef8c44a
--- /dev/null
+++ b/comm/mail/components/search/extensions/wiktionary/_locales/oc/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikiccionari (oc)"
+  },
+  "extensionDescription": {
+    "message": "Wikiccionari, lo diccionari liure"
+  },
+  "searchUrl": {
+    "message": "https://oc.wiktionary.org/wiki/Especial:Recèrca"
+  },
+  "searchForm": {
+    "message": "https://oc.wiktionary.org/wiki/Especial:Recèrca?search={searchTerms}"
+  },
+  "suggestUrl": {
+    "message": "https://oc.wiktionary.org/w/api.php?action=opensearch&search={searchTerms}&namespace=0"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wiktionary/_locales/te/messages.json b/comm/mail/components/search/extensions/wiktionary/_locales/te/messages.json
new file mode 100644
index 0000000000..7bca94e025
--- /dev/null
+++ b/comm/mail/components/search/extensions/wiktionary/_locales/te/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "విక్షనరీ (te)"
+  },
+  "extensionDescription": {
+    "message": "విక్షనరీ (te)"
+  },
+  "searchUrl": {
+    "message": "https://te.wiktionary.org/wiki/ప్రత్యేక:అన్వేషణ"
+  },
+  "searchForm": {
+    "message": "https://te.wiktionary.org/wiki/ప్రత్యేక:అన్వేషణ?search={searchTerms}"
+  },
+  "suggestUrl": {
+    "message": "https://te.wiktionary.org/w/api.php?action=opensearch&search={searchTerms}&namespace=0"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}"
+  }
+}
diff --git a/comm/mail/components/search/extensions/wiktionary/favicon.ico b/comm/mail/components/search/extensions/wiktionary/favicon.ico
new file mode 100644
index 0000000000..31b0e38092
--- /dev/null
+++ b/comm/mail/components/search/extensions/wiktionary/favicon.ico
diff --git a/comm/mail/components/search/extensions/wiktionary/manifest.json b/comm/mail/components/search/extensions/wiktionary/manifest.json
new file mode 100644
index 0000000000..2206a2f8bb
--- /dev/null
+++ b/comm/mail/components/search/extensions/wiktionary/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "wiktionary@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "oc",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "suggest_url": "__MSG_suggestUrl__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/wolnelektury-pl/favicon.png b/comm/mail/components/search/extensions/wolnelektury-pl/favicon.png
new file mode 100644
index 0000000000..77f6db5322
--- /dev/null
+++ b/comm/mail/components/search/extensions/wolnelektury-pl/favicon.png
diff --git a/comm/mail/components/search/extensions/wolnelektury-pl/manifest.json b/comm/mail/components/search/extensions/wolnelektury-pl/manifest.json
new file mode 100644
index 0000000000..25d93be370
--- /dev/null
+++ b/comm/mail/components/search/extensions/wolnelektury-pl/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Wolne Lektury",
+  "description": "Biblioteka internetowa WolneLektury.pl",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "wolnelektury-pl@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Wolne Lektury",
+      "search_url": "https://wolnelektury.pl/szukaj/?q={searchTerms}",
+      "search_form": "https://wolnelektury.pl",
+      "suggest_url": "https://wolnelektury.pl/katalog/jtags/?mozhint=1&q={searchTerms}"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/yahoo-jp-auctions/favicon.ico b/comm/mail/components/search/extensions/yahoo-jp-auctions/favicon.ico
new file mode 100644
index 0000000000..4401c7a40e
--- /dev/null
+++ b/comm/mail/components/search/extensions/yahoo-jp-auctions/favicon.ico
diff --git a/comm/mail/components/search/extensions/yahoo-jp-auctions/manifest.json b/comm/mail/components/search/extensions/yahoo-jp-auctions/manifest.json
new file mode 100644
index 0000000000..62f5fe20b4
--- /dev/null
+++ b/comm/mail/components/search/extensions/yahoo-jp-auctions/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "ヤフオク!",
+  "description": "ヤフオク! 検索",
+  "manifest_version": 2,
+  "version": "1.3",
+  "applications": {
+    "gecko": {
+      "id": "yahoo-jp-auctions@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "ヤフオク!",
+      "encoding": "EUC-JP",
+      "search_url": "https://auctions.yahoo.co.jp/search/search",
+      "search_form": "https://auctions.yahoo.co.jp/",
+      "search_url_get_params": "p={searchTerms}&ei=EUC-JP"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/yahoo-jp/favicon.ico b/comm/mail/components/search/extensions/yahoo-jp/favicon.ico
new file mode 100644
index 0000000000..34a916ccde
--- /dev/null
+++ b/comm/mail/components/search/extensions/yahoo-jp/favicon.ico
diff --git a/comm/mail/components/search/extensions/yahoo-jp/manifest.json b/comm/mail/components/search/extensions/yahoo-jp/manifest.json
new file mode 100644
index 0000000000..6f0c339fbd
--- /dev/null
+++ b/comm/mail/components/search/extensions/yahoo-jp/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Yahoo! JAPAN",
+  "description": "Yahoo Search",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "yahoo-jp@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": ["favicon.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Yahoo! JAPAN",
+      "search_url": "https://search.yahoo.co.jp/search",
+      "search_form": "https://search.yahoo.co.jp/",
+      "search_url_get_params": "p={searchTerms}&ei=UTF-8"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/yandex/_locales/az/messages.json b/comm/mail/components/search/extensions/yandex/_locales/az/messages.json
new file mode 100644
index 0000000000..a26b49f041
--- /dev/null
+++ b/comm/mail/components/search/extensions/yandex/_locales/az/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Yandex"
+  },
+  "extensionDescription": {
+    "message": "İnternetdə axtarış üçün Yandexdən istifadə edin."
+  },
+  "searchUrl": {
+    "message": "https://yandex.az/search"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.az/"
+  },
+  "suggestUrl": {
+    "message": "https://yandex.az/suggest/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "extensionIcon": {
+    "message": "yandex-ru.ico"
+  }
+}
diff --git a/comm/mail/components/search/extensions/yandex/_locales/by/messages.json b/comm/mail/components/search/extensions/yandex/_locales/by/messages.json
new file mode 100644
index 0000000000..440c062610
--- /dev/null
+++ b/comm/mail/components/search/extensions/yandex/_locales/by/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Яндекс"
+  },
+  "extensionDescription": {
+    "message": "Пошук з дапамогаю Яндекс"
+  },
+  "searchUrl": {
+    "message": "https://yandex.by/search"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.by/"
+  },
+  "suggestUrl": {
+    "message": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "extensionIcon": {
+    "message": "yandex-ru.ico"
+  }
+}
diff --git a/comm/mail/components/search/extensions/yandex/_locales/en/messages.json b/comm/mail/components/search/extensions/yandex/_locales/en/messages.json
new file mode 100644
index 0000000000..593c0c93e7
--- /dev/null
+++ b/comm/mail/components/search/extensions/yandex/_locales/en/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Yandex"
+  },
+  "extensionDescription": {
+    "message": "Use Yandex to search the Internet."
+  },
+  "searchUrl": {
+    "message": "https://www.yandex.com/search"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.com/"
+  },
+  "suggestUrl": {
+    "message": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "extensionIcon": {
+    "message": "yandex-en.ico"
+  }
+}
diff --git a/comm/mail/components/search/extensions/yandex/_locales/kk/messages.json b/comm/mail/components/search/extensions/yandex/_locales/kk/messages.json
new file mode 100644
index 0000000000..2796cd93ec
--- /dev/null
+++ b/comm/mail/components/search/extensions/yandex/_locales/kk/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Яндекс"
+  },
+  "extensionDescription": {
+    "message": "Воспользуйтесь Яндексом для поиска в Интернете."
+  },
+  "searchUrl": {
+    "message": "https://yandex.kz/search"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.kz/"
+  },
+  "suggestUrl": {
+    "message": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "extensionIcon": {
+    "message": "yandex-ru.ico"
+  }
+}
diff --git a/comm/mail/components/search/extensions/yandex/_locales/ru/messages.json b/comm/mail/components/search/extensions/yandex/_locales/ru/messages.json
new file mode 100644
index 0000000000..cdc5ff13be
--- /dev/null
+++ b/comm/mail/components/search/extensions/yandex/_locales/ru/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Яндекс"
+  },
+  "extensionDescription": {
+    "message": "Воспользуйтесь Яндексом для поиска в Интернете."
+  },
+  "searchUrl": {
+    "message": "https://yandex.ru/search"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.ru/"
+  },
+  "suggestUrl": {
+    "message": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "extensionIcon": {
+    "message": "yandex-ru.ico"
+  }
+}
diff --git a/comm/mail/components/search/extensions/yandex/_locales/tr/messages.json b/comm/mail/components/search/extensions/yandex/_locales/tr/messages.json
new file mode 100644
index 0000000000..55d16d9956
--- /dev/null
+++ b/comm/mail/components/search/extensions/yandex/_locales/tr/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Yandex"
+  },
+  "extensionDescription": {
+    "message": "Yandex Türkiye arama motoru"
+  },
+  "searchUrl": {
+    "message": "https://yandex.com.tr/search"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.com.tr/"
+  },
+  "suggestUrl": {
+    "message": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "extensionIcon": {
+    "message": "yandex-en.ico"
+  }
+}
diff --git a/comm/mail/components/search/extensions/yandex/manifest.json b/comm/mail/components/search/extensions/yandex/manifest.json
new file mode 100644
index 0000000000..d5885f5c29
--- /dev/null
+++ b/comm/mail/components/search/extensions/yandex/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "yandex@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "en",
+  "icons": {
+    "16": "__MSG_extensionIcon__"
+  },
+  "web_accessible_resources": ["yandex-en.ico", "yandex-ru.ico"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "suggest_url": "__MSG_suggestUrl__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
diff --git a/comm/mail/components/search/extensions/yandex/yandex-en.ico b/comm/mail/components/search/extensions/yandex/yandex-en.ico
new file mode 100644
index 0000000000..6398f30e9d
--- /dev/null
+++ b/comm/mail/components/search/extensions/yandex/yandex-en.ico
diff --git a/comm/mail/components/search/extensions/yandex/yandex-ru.ico b/comm/mail/components/search/extensions/yandex/yandex-ru.ico
new file mode 100644
index 0000000000..226fc0a071
--- /dev/null
+++ b/comm/mail/components/search/extensions/yandex/yandex-ru.ico
diff --git a/comm/mail/components/search/extensions/zoznam-sk/favicon.png b/comm/mail/components/search/extensions/zoznam-sk/favicon.png
new file mode 100644
index 0000000000..5774c6ff52
--- /dev/null
+++ b/comm/mail/components/search/extensions/zoznam-sk/favicon.png
diff --git a/comm/mail/components/search/extensions/zoznam-sk/manifest.json b/comm/mail/components/search/extensions/zoznam-sk/manifest.json
new file mode 100644
index 0000000000..118cd1ba7f
--- /dev/null
+++ b/comm/mail/components/search/extensions/zoznam-sk/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Zoznam",
+  "description": "Zoznam slovenskeho internetu",
+  "manifest_version": 2,
+  "version": "1.2",
+  "applications": {
+    "gecko": {
+      "id": "zoznam-sk@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": ["favicon.png"],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Zoznam",
+      "encoding": "WINDOWS-1250",
+      "search_url": "https://www.zoznam.sk/hladaj.fcgi",
+      "search_form": "https://www.zoznam.sk/",
+      "search_url_get_params": "co=odkazy&s={searchTerms}"
+    }
+  }
+}