diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 7f0c01e6e..66fd7a208 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="1.6.3.6" />
+    Version="1.6.4.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 81943af37..0b77e71d2 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,6,3,6
- PRODUCTVERSION 1,6,3,6
+ FILEVERSION 1,6,4,0
+ PRODUCTVERSION 1,6,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -52,10 +52,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "1.6.3.6"
+            VALUE "FileVersion", "1.6.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2019"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.6.3.6"
+            VALUE "ProductVersion", "1.6.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 496007972..eafccf3d8 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,6,3,6
- PRODUCTVERSION 1,6,3,6
+ FILEVERSION 1,6,4,0
+ PRODUCTVERSION 1,6,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "1.6.3.6"
+            VALUE "FileVersion", "1.6.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2019"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.6.3.6"
+            VALUE "ProductVersion", "1.6.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index e7d30fdef..e1e8d5c21 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -69,6 +69,17 @@ std::map<int, const char*> BetaLogs() {
 		"without waiting for them to download.\n"
 
 		"- Press CTRL+0 (CMD+0 on macOS) to jump to your Saved Messages."
+	},
+	{
+		1006004,
+		"- Replace media when editing messages with media content.\n"
+
+		"- Jump quickly to the top of your chats list.\n"
+
+		"- Get emoji suggestions for the first word you type in a message.\n"
+
+		"- Help Telegram improve emoji suggestions in your language "
+		"using this interface https://translations.telegram.org/en/emoji"
 	}
 	};
 }
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index fb1ed4285..131612f75 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (1006003006ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL)
 
 #ifdef TDESKTOP_OFFICIAL_TARGET
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
@@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #define TDESKTOP_ALPHA_VERSION (0ULL)
 #endif // TDESKTOP_OFFICIAL_TARGET
 
-constexpr auto AppVersion = 1006003;
-constexpr auto AppVersionStr = "1.6.3";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 1006004;
+constexpr auto AppVersionStr = "1.6.4";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index ca89d2c2e..52c085ec9 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,6 +1,6 @@
-AppVersion         1006003
+AppVersion         1006004
 AppVersionStrMajor 1.6
-AppVersionStrSmall 1.6.3
-AppVersionStr      1.6.3
-BetaChannel        0
-AlphaVersion       1006003006
+AppVersionStrSmall 1.6.4
+AppVersionStr      1.6.4
+BetaChannel        1
+AlphaVersion       0
diff --git a/changelog.txt b/changelog.txt
index 42d30d965..fcdff26c5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+1.6.4 beta (05.04.19)
+
+- Replace media when editing messages with media content.
+- Jump quickly to the top of your chats list.
+- Get emoji suggestions for the first word you type in a message.
+- Help Telegram improve emoji suggestions in your language using this interface https://translations.telegram.org/en/emoji
+
 1.6.3 (25.03.19)
 
 - Bug fixes and other minor improvements.