diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 9345f5398..b55fe8f5d 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="2.1.20.0" />
+    Version="2.1.21.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 4c4cab47b..ef07d72fc 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,20,0
- PRODUCTVERSION 2,1,20,0
+ FILEVERSION 2,1,21,0
+ PRODUCTVERSION 2,1,21,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "2.1.20.0"
+            VALUE "FileVersion", "2.1.21.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.1.20.0"
+            VALUE "ProductVersion", "2.1.21.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index e7e96f8db..5493a0ea6 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,20,0
- PRODUCTVERSION 2,1,20,0
+ FILEVERSION 2,1,21,0
+ PRODUCTVERSION 2,1,21,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "2.1.20.0"
+            VALUE "FileVersion", "2.1.21.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.1.20.0"
+            VALUE "ProductVersion", "2.1.21.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index 8916b2eeb..e31932583 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -85,6 +85,16 @@ std::map<int, const char*> BetaLogs() {
 
 		"- Passcode doesn't auto-lock while you're active in other apps on Linux X11."
 	},
+	{
+		2001021,
+		"- Edit your scheduled messages.\n"
+
+		"- See the unread messages indicator for the secondary accounts on the main menu button.\n"
+
+		"- Use Auto-Night Mode to make Telegram night mode match the system Dark Mode settings.\n"
+
+		"- Enjoy dark native window frame for Telegram night mode on Windows.\n"
+	},
 	};
 };
 
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 910322243..3d3e19d98 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 2001020;
-constexpr auto AppVersionStr = "2.1.20";
+constexpr auto AppVersion = 2001021;
+constexpr auto AppVersionStr = "2.1.21";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index e854f198d..fb3e57549 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2001020
+AppVersion         2001021
 AppVersionStrMajor 2.1
-AppVersionStrSmall 2.1.20
-AppVersionStr      2.1.20
+AppVersionStrSmall 2.1.21
+AppVersionStr      2.1.21
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 2.1.20.beta
+AppVersionOriginal 2.1.21.beta
diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck
index 135783777..c650fe72d 160000
--- a/Telegram/lib_spellcheck
+++ b/Telegram/lib_spellcheck
@@ -1 +1 @@
-Subproject commit 1357837771a8b237c8a6ce90060f5a4f0fd5e339
+Subproject commit c650fe72d6c486bbee1d92f73f97b02c523dd37b
diff --git a/changelog.txt b/changelog.txt
index e87a98787..f72391629 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+2.1.21 beta (24.07.20)
+
+- Edit your scheduled messages.
+- See the unread messages indicator for the secondary accounts on the main menu button.
+- Use Auto-Night Mode to make Telegram night mode match the system Dark Mode settings.
+- Enjoy dark native window frame for Telegram night mode on Windows.
+
 2.1.20 beta (17.07.20)
 
 - Fix animated emoji.
diff --git a/cmake b/cmake
index 408083f52..80835258c 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 408083f52e1815cd2a359aa3877185d48e82d4f9
+Subproject commit 80835258c7fed0bf1de9b3c2fb094bd92ad2f825