diff --git a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
index 9afbf9c86..2ab0dbe7a 100644
--- a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
+++ b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
@@ -63,16 +63,6 @@ private:
 base::unique_qptr<Loader> GlobalLoader;
 rpl::event_stream<Loader*> GlobalLoaderValues;
 
-QLocale LocaleFromLangId(int langId) {
-	if (langId > 1000) {
-		const auto l = langId / 1000;
-		const auto lang = static_cast<QLocale::Language>(l);
-		const auto country = static_cast<QLocale::Country>(langId - l * 1000);
-		return QLocale(lang, country);
-	}
-	return QLocale(static_cast<QLocale::Language>(langId));
-}
-
 void SetGlobalLoader(base::unique_qptr<Loader> loader) {
 	GlobalLoader = std::move(loader);
 	GlobalLoaderValues.fire(GlobalLoader.get());
diff --git a/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp b/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp
index fc8cd3bb8..81d87500e 100644
--- a/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp
+++ b/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #ifndef TDESKTOP_DISABLE_SPELLCHECK
 
+#include "spellcheck/spellcheck_utils.h"
 #include "base/zlib_help.h"
 
 namespace Spellchecker {
@@ -17,6 +18,8 @@ namespace {
 
 using namespace Storage::CloudBlob;
 
+constexpr auto kDictExtensions = { "dic", "aff" };
+
 // Language With Country.
 inline auto LWC(QLocale::Country country) {
 	const auto l = QLocale::matchingLocales(
@@ -70,16 +73,6 @@ const auto kDictionaries = {
 	Dict{{ QLocale::Vietnamese,           52,    12'949, "\x54\x69\xe1\xba\xbf\x6e\x67\x20\x56\x69\xe1\xbb\x87\x74" }},
 };
 
-QLocale LocaleFromLangId(int langId) {
-	if (langId > 1000) {
-		const auto l = langId / 1000;
-		const auto lang = static_cast<QLocale::Language>(l);
-		const auto country = static_cast<QLocale::Country>(langId - l * 1000);
-		return QLocale(lang, country);
-	}
-	return QLocale(static_cast<QLocale::Language>(langId));
-}
-
 void EnsurePath() {
 	if (!QDir::current().mkpath(Spellchecker::DictionariesPath())) {
 		LOG(("App Error: Could not create dictionaries path."));
@@ -93,15 +86,16 @@ std::initializer_list<const Dict> Dictionaries() {
 }
 
 bool IsGoodPartName(const QString &name) {
-	return name.endsWith(qsl(".dic"))
-		|| name.endsWith(qsl(".aff"));
+	return ranges::find_if(kDictExtensions, [&](const auto &ext) {
+		return name.endsWith(ext);
+	}) != end(kDictExtensions);
 }
 
 QString DictPathByLangId(int langId) {
 	EnsurePath();
 	return qsl("%1/%2")
 		.arg(DictionariesPath())
-		.arg(LocaleFromLangId(langId).name());
+		.arg(Spellchecker::LocaleFromLangId(langId).name());
 }
 
 QString DictionariesPath() {
@@ -118,12 +112,11 @@ bool DictionaryExists(int langId) {
 		return true;
 	}
 	const auto folder = DictPathByLangId(langId) + '/';
-	const auto exts = { "dic", "aff" };
-	const auto bad = ranges::find_if(exts, [&](const QString &ext) {
-		const auto name = LocaleFromLangId(langId).name();
+	const auto bad = ranges::find_if(kDictExtensions, [&](const auto &ext) {
+		const auto name = Spellchecker::LocaleFromLangId(langId).name();
 		return !QFile(folder + name + '.' + ext).exists();
 	});
-	return (bad == exts.end());
+	return (bad == end(kDictExtensions));
 }
 
 bool WriteDefaultDictionary() {