diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings
index 7ba3e5d8a3..2fa9a96d49 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram-iOS/en.lproj/Localizable.strings
@@ -4308,6 +4308,8 @@ Sorry for the inconvenience.";
 "Channel.DiscussionGroup.PrivateChannelLink" = "Do you want to make %1$@ the discussion board for %2$@?
 
 Any member of this group will be able to see messages in the channel.";
+"Channel.DiscussionGroup.MakeHistoryPublic" = "Warning: If you set this private group as the disccussion group for your channel, all channel subscribers will be able to access the group. \"Chat history for new members\" will be switched to Visible.";
+"Channel.DiscussionGroup.MakeHistoryPublicProceed" = "Proceed";
 
 "Channel.DiscussionGroup.SearchPlaceholder" = "Search";
 
diff --git a/submodules/TelegramCore b/submodules/TelegramCore
index 66d26febc1..ff6b90f4f4 160000
--- a/submodules/TelegramCore
+++ b/submodules/TelegramCore
@@ -1 +1 @@
-Subproject commit 66d26febc1dc242eb7b60a812d49b3af6473618e
+Subproject commit ff6b90f4f4c688b40d94efc40e5536f123d4bb84
diff --git a/submodules/TelegramUI b/submodules/TelegramUI
index 493465e2fc..25b6d8e826 160000
--- a/submodules/TelegramUI
+++ b/submodules/TelegramUI
@@ -1 +1 @@
-Subproject commit 493465e2fc09cb3cd96361d96b79683e50792ea6
+Subproject commit 25b6d8e8263c415bed79837801085cfe1942c8c9