diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index faca41d41..ea3e12815 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -228,6 +228,7 @@ jobs:
           --disable-autodetect \
           --disable-everything \
           --disable-neon \
+          --disable-alsa \
           --disable-iconv \
           --enable-libopus \
           --enable-vaapi \
@@ -385,30 +386,37 @@ jobs:
           cd $LibrariesPath
           sudo cp -R openssl-cache/. /
 
-      - name: Libxkbcommon.
-        run: |
-          cd $LibrariesPath
-
-          git clone -b xkbcommon-0.8.4 --depth=1 $GIT/xkbcommon/libxkbcommon.git
-          cd libxkbcommon
-          ./autogen.sh
-          make -j$(nproc)
-          sudo make install
-          cd ..
-          rm -rf libxkbcommon
-
       - name: Libwayland.
         run: |
           cd $LibrariesPath
 
           git clone -b 1.16 https://gitlab.freedesktop.org/wayland/wayland
           cd wayland
-          ./autogen.sh --enable-static --disable-documentation  --disable-dtd-validation
+          ./autogen.sh \
+          --enable-static \
+          --disable-documentation \
+          --disable-dtd-validation
           make -j$(nproc)
           sudo make install
           cd ..
           rm -rf wayland
 
+      - name: Libxkbcommon.
+        run: |
+          cd $LibrariesPath
+
+          git clone -b xkbcommon-0.8.4 --depth=1 $GIT/xkbcommon/libxkbcommon.git
+          cd libxkbcommon
+          ./autogen.sh \
+          --disable-docs \
+          --disable-wayland \
+          --with-xkb-config-root=/usr/share/X11/xkb \
+          --with-x-locale-root=/usr/share/X11/locale
+          make -j$(nproc)
+          sudo make install
+          cd ..
+          rm -rf libxkbcommon
+
       - name: Qt 5.12.8 cache.
         id: cache-qt
         uses: actions/cache@v1
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 997d53765..5e32af10a 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -90,6 +90,7 @@ if (LINUX)
         PRIVATE
             desktop-app::external_statusnotifieritem
             desktop-app::external_dbusmenu_qt
+            desktop-app::external_fcitx_qt5
             desktop-app::external_fcitx5_qt5
             desktop-app::external_hime_qt
         )
@@ -810,7 +811,6 @@ PRIVATE
     platform/mac/file_utilities_mac.h
     platform/mac/launcher_mac.mm
     platform/mac/launcher_mac.h
-    platform/mac/mac_iconv_helper.c
     platform/mac/main_window_mac.mm
     platform/mac/main_window_mac.h
     platform/mac/notifications_manager_mac.mm
@@ -1048,6 +1048,8 @@ PRIVATE
 
 if (DESKTOP_APP_USE_PACKAGED)
     nice_target_sources(Telegram ${src_loc} PRIVATE qt_functions.cpp)
+else()
+    nice_target_sources(Telegram ${src_loc} PRIVATE platform/mac/mac_iconv_helper.c)
 endif()
 
 nice_target_sources(Telegram ${res_loc}
@@ -1083,11 +1085,11 @@ if (WIN32)
     #     $<IF:${release},"Appending compatibility manifest.","Finalizing build.">
     # )
 elseif (APPLE)
-    target_link_libraries(Telegram
-    PRIVATE
-        desktop-app::external_sp_media_key_tap
-        desktop-app::external_iconv
-    )
+    target_link_libraries(Telegram PRIVATE desktop-app::external_sp_media_key_tap)
+
+    if (NOT DESKTOP_APP_USE_PACKAGED)
+        target_link_libraries(Telegram PRIVATE desktop-app::external_iconv)
+    endif()
 
     set(icons_path ${CMAKE_CURRENT_SOURCE_DIR}/Telegram/Images.xcassets)
     set_target_properties(Telegram PROPERTIES RESOURCE ${icons_path})
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 20d5f72ba..cd5529380 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1454,6 +1454,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_edit_msg" = "Edit";
 "lng_context_forward_msg" = "Forward Message";
 "lng_context_send_now_msg" = "Send now";
+"lng_context_reschedule" = "Reschedule";
 "lng_context_delete_msg" = "Delete Message";
 "lng_context_select_msg" = "Select Message";
 "lng_context_report_msg" = "Report Message";
diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 5a33266bd..17ae248a0 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.6.0" />
+    Version="2.1.7.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 c3e1d417f..9831bdbb6 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,6,0
- PRODUCTVERSION 2,1,6,0
+ FILEVERSION 2,1,7,0
+ PRODUCTVERSION 2,1,7,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.6.0"
+            VALUE "FileVersion", "2.1.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.1.6.0"
+            VALUE "ProductVersion", "2.1.7.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 0a9fdd05d..f23946b71 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,6,0
- PRODUCTVERSION 2,1,6,0
+ FILEVERSION 2,1,7,0
+ PRODUCTVERSION 2,1,7,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.6.0"
+            VALUE "FileVersion", "2.1.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.1.6.0"
+            VALUE "ProductVersion", "2.1.7.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/_other/updater_osx.m b/Telegram/SourceFiles/_other/updater_osx.m
index 3e63a69b5..7fa9cd039 100644
--- a/Telegram/SourceFiles/_other/updater_osx.m
+++ b/Telegram/SourceFiles/_other/updater_osx.m
@@ -90,7 +90,7 @@ int main(int argc, const char * argv[]) {
 
 	openLog();
 	pid_t procId = 0;
-	BOOL update = YES, toSettings = NO, autoStart = NO, startInTray = NO, testMode = NO, externalUpdater = NO;
+	BOOL update = YES, toSettings = NO, autoStart = NO, startInTray = NO, testMode = NO, freeType = NO, externalUpdater = NO;
 	BOOL customWorkingDir = NO;
 	NSString *key = nil;
 	for (int i = 0; i < argc; ++i) {
@@ -116,6 +116,8 @@ int main(int argc, const char * argv[]) {
 			startInTray = YES;
 		} else if ([@"-testmode" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
 			testMode = YES;
+		} else if ([@"-freetype" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
+			freeType = YES;
 		} else if ([@"-externalupdater" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
 			externalUpdater = YES;
 		} else if ([@"-workdir_custom" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
@@ -255,6 +257,7 @@ int main(int argc, const char * argv[]) {
 	if (_debug) [args addObject:@"-debug"];
 	if (startInTray) [args addObject:@"-startintray"];
 	if (testMode) [args addObject:@"-testmode"];
+	if (freeType) [args addObject:@"-freetype"];
 	if (externalUpdater) [args addObject:@"-externalupdater"];
 	if (autoStart) [args addObject:@"-autostart"];
 	if (key) {
diff --git a/Telegram/SourceFiles/_other/updater_win.cpp b/Telegram/SourceFiles/_other/updater_win.cpp
index 15e0b81ff..4c54e3029 100644
--- a/Telegram/SourceFiles/_other/updater_win.cpp
+++ b/Telegram/SourceFiles/_other/updater_win.cpp
@@ -339,7 +339,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdPara
 	LPWSTR *args;
 	int argsCount;
 
-	bool needupdate = false, autostart = false, debug = false, writeprotected = false, startintray = false, testmode = false, externalupdater = false;
+	bool needupdate = false, autostart = false, debug = false, writeprotected = false, startintray = false, testmode = false, freetype = false, externalupdater = false;
 	args = CommandLineToArgvW(GetCommandLine(), &argsCount);
 	if (args) {
 		for (int i = 1; i < argsCount; ++i) {
@@ -355,6 +355,8 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdPara
 				startintray = true;
 			} else if (equal(args[i], L"-testmode")) {
 				testmode = true;
+			} else if (equal(args[i], L"-freetype")) {
+				freetype = true;
 			} else if (equal(args[i], L"-externalupdater")) {
 				externalupdater = true;
 			} else if (equal(args[i], L"-writeprotected") && ++i < argsCount) {
@@ -427,6 +429,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdPara
 	if (debug) targs += L" -debug";
 	if (startintray) targs += L" -startintray";
 	if (testmode) targs += L" -testmode";
+	if (freetype) targs += L" -freetype";
 	if (externalupdater) targs += L" -externalupdater";
 	if (!customWorkingDir.empty()) {
 		targs += L" -workdir \"" + customWorkingDir + L"\"";
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index dacd96d0d..1e8627445 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -30,6 +30,26 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Api {
 namespace {
 
+void InnerFillMessagePostFlags(
+		const Api::SendOptions &options,
+		not_null<PeerData*> peer,
+		MTPDmessage::Flags &flags) {
+	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
+	if (!channelPost) {
+		flags |= MTPDmessage::Flag::f_from_id;
+		return;
+	}
+	flags |= MTPDmessage::Flag::f_post;
+	// Don't display views and author of a new post when it's scheduled.
+	if (options.scheduled) {
+		return;
+	}
+	flags |= MTPDmessage::Flag::f_views;
+	if (peer->asChannel()->addsSignature()) {
+		flags |= MTPDmessage::Flag::f_post_author;
+	}
+}
+
 template <typename MediaData>
 void SendExistingMedia(
 		Api::MessageToSend &&message,
@@ -60,15 +80,7 @@ void SendExistingMedia(
 	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
 	const auto silentPost = message.action.options.silent
 		|| (channelPost && session->data().notifySilentPosts(peer));
-	if (channelPost) {
-		flags |= MTPDmessage::Flag::f_views;
-		flags |= MTPDmessage::Flag::f_post;
-	}
-	if (!channelPost) {
-		flags |= MTPDmessage::Flag::f_from_id;
-	} else if (peer->asChannel()->addsSignature()) {
-		flags |= MTPDmessage::Flag::f_post_author;
-	}
+	InnerFillMessagePostFlags(message.action.options, peer, flags);
 	if (silentPost) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 	}
@@ -246,15 +258,7 @@ bool SendDice(Api::MessageToSend &message) {
 	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
 	const auto silentPost = message.action.options.silent
 		|| (channelPost && session->data().notifySilentPosts(peer));
-	if (channelPost) {
-		flags |= MTPDmessage::Flag::f_views;
-		flags |= MTPDmessage::Flag::f_post;
-	}
-	if (!channelPost) {
-		flags |= MTPDmessage::Flag::f_from_id;
-	} else if (peer->asChannel()->addsSignature()) {
-		flags |= MTPDmessage::Flag::f_post_author;
-	}
+	InnerFillMessagePostFlags(message.action.options, peer, flags);
 	if (silentPost) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 	}
@@ -320,4 +324,11 @@ bool SendDice(Api::MessageToSend &message) {
 	return true;
 }
 
+void FillMessagePostFlags(
+		const Api::SendAction &action,
+		not_null<PeerData*> peer,
+		MTPDmessage::Flags &flags) {
+	InnerFillMessagePostFlags(action.options, peer, flags);
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_sending.h b/Telegram/SourceFiles/api/api_sending.h
index 86bde8c93..0a8d9f08e 100644
--- a/Telegram/SourceFiles/api/api_sending.h
+++ b/Telegram/SourceFiles/api/api_sending.h
@@ -25,4 +25,9 @@ void SendExistingPhoto(
 
 bool SendDice(Api::MessageToSend &message);
 
+void FillMessagePostFlags(
+	const SendAction &action,
+	not_null<PeerData*> peer,
+	MTPDmessage::Flags &flags);
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 24d30648d..3426a1551 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -4328,15 +4328,7 @@ void ApiWrap::forwardMessages(
 	auto flags = MTPDmessage::Flags(0);
 	auto clientFlags = MTPDmessage_ClientFlags();
 	auto sendFlags = MTPmessages_ForwardMessages::Flags(0);
-	if (channelPost) {
-		flags |= MTPDmessage::Flag::f_views;
-		flags |= MTPDmessage::Flag::f_post;
-	}
-	if (!channelPost) {
-		flags |= MTPDmessage::Flag::f_from_id;
-	} else if (peer->asChannel()->addsSignature()) {
-		flags |= MTPDmessage::Flag::f_post_author;
-	}
+	FillMessagePostFlags(action, peer, flags);
 	if (silentPost) {
 		sendFlags |= MTPmessages_ForwardMessages::Flag::f_silent;
 	}
@@ -4489,15 +4481,7 @@ void ApiWrap::sendSharedContact(
 	if (action.replyTo) {
 		flags |= MTPDmessage::Flag::f_reply_to_msg_id;
 	}
-	if (channelPost) {
-		flags |= MTPDmessage::Flag::f_views;
-		flags |= MTPDmessage::Flag::f_post;
-		if (peer->asChannel()->addsSignature()) {
-			flags |= MTPDmessage::Flag::f_post_author;
-		}
-	} else {
-		flags |= MTPDmessage::Flag::f_from_id;
-	}
+	FillMessagePostFlags(action, peer, flags);
 	if (action.options.scheduled) {
 		flags |= MTPDmessage::Flag::f_from_scheduled;
 	} else {
@@ -4874,15 +4858,7 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 		const auto channelPost = peer->isChannel() && !peer->isMegagroup();
 		const auto silentPost = action.options.silent
 			|| (channelPost && _session->data().notifySilentPosts(peer));
-		if (channelPost) {
-			flags |= MTPDmessage::Flag::f_views;
-			flags |= MTPDmessage::Flag::f_post;
-		}
-		if (!channelPost) {
-			flags |= MTPDmessage::Flag::f_from_id;
-		} else if (peer->asChannel()->addsSignature()) {
-			flags |= MTPDmessage::Flag::f_post_author;
-		}
+		FillMessagePostFlags(action, peer, flags);
 		if (silentPost) {
 			sendFlags |= MTPmessages_SendMessage::Flag::f_silent;
 		}
@@ -5019,15 +4995,7 @@ void ApiWrap::sendInlineResult(
 	bool channelPost = peer->isChannel() && !peer->isMegagroup();
 	bool silentPost = action.options.silent
 		|| (channelPost && _session->data().notifySilentPosts(peer));
-	if (channelPost) {
-		flags |= MTPDmessage::Flag::f_views;
-		flags |= MTPDmessage::Flag::f_post;
-	}
-	if (!channelPost) {
-		flags |= MTPDmessage::Flag::f_from_id;
-	} else if (peer->asChannel()->addsSignature()) {
-		flags |= MTPDmessage::Flag::f_post_author;
-	}
+	FillMessagePostFlags(action, peer, flags);
 	if (silentPost) {
 		sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_silent;
 	}
@@ -5857,6 +5825,43 @@ void ApiWrap::closePoll(not_null<HistoryItem*> item) {
 	_pollCloseRequestIds.emplace(itemId, requestId);
 }
 
+void ApiWrap::rescheduleMessage(
+		not_null<HistoryItem*> item,
+		Api::SendOptions options) {
+	const auto text = item->originalText().text;
+	const auto sentEntities = Api::EntitiesToMTP(
+		item->originalText().entities,
+		Api::ConvertOption::SkipLocal);
+	const auto media = item->media();
+
+	const auto emptyFlag = MTPmessages_EditMessage::Flag(0);
+	const auto flags = MTPmessages_EditMessage::Flag::f_schedule_date
+	| (!text.isEmpty()
+		? MTPmessages_EditMessage::Flag::f_message
+		: emptyFlag)
+	| ((!media || !media->webpage())
+		? MTPmessages_EditMessage::Flag::f_no_webpage
+		: emptyFlag)
+	| (!sentEntities.v.isEmpty()
+		? MTPmessages_EditMessage::Flag::f_entities
+		: emptyFlag);
+
+	const auto id = _session->data().scheduledMessages().lookupId(item);
+	request(MTPmessages_EditMessage(
+		MTP_flags(flags),
+		item->history()->peer->input,
+		MTP_int(id),
+		MTP_string(text),
+		MTPInputMedia(),
+		MTPReplyMarkup(),
+		sentEntities,
+		MTP_int(options.scheduled)
+	)).done([=](const MTPUpdates &result) {
+		applyUpdates(result);
+	}).fail([](const RPCError &error) {
+	}).send();
+}
+
 void ApiWrap::reloadPollResults(not_null<HistoryItem*> item) {
 	const auto itemId = item->fullId();
 	if (!IsServerMsgId(item->id)
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index eb4015625..65a148a81 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -476,6 +476,10 @@ public:
 	void closePoll(not_null<HistoryItem*> item);
 	void reloadPollResults(not_null<HistoryItem*> item);
 
+	void rescheduleMessage(
+		not_null<HistoryItem*> item,
+		Api::SendOptions options);
+
 private:
 	struct MessageDataRequest {
 		using Callbacks = QList<RequestMessageDataCallback>;
diff --git a/Telegram/SourceFiles/boxes/calendar_box.cpp b/Telegram/SourceFiles/boxes/calendar_box.cpp
index 48cfdd794..a9d5158f7 100644
--- a/Telegram/SourceFiles/boxes/calendar_box.cpp
+++ b/Telegram/SourceFiles/boxes/calendar_box.cpp
@@ -599,4 +599,19 @@ void CalendarBox::keyPressEvent(QKeyEvent *e) {
 	}
 }
 
+void CalendarBox::wheelEvent(QWheelEvent *e) {
+	// Only a mouse wheel is accepted.
+	constexpr auto step = static_cast<int>(QWheelEvent::DefaultDeltasPerStep);
+	const auto delta = e->angleDelta().y();
+	if (std::abs(delta) != step) {
+		return;
+	}
+
+	if (delta < 0) {
+		goPreviousMonth();
+	} else {
+		goNextMonth();
+	}
+}
+
 CalendarBox::~CalendarBox() = default;
diff --git a/Telegram/SourceFiles/boxes/calendar_box.h b/Telegram/SourceFiles/boxes/calendar_box.h
index 066d0425f..391f25bed 100644
--- a/Telegram/SourceFiles/boxes/calendar_box.h
+++ b/Telegram/SourceFiles/boxes/calendar_box.h
@@ -46,6 +46,7 @@ protected:
 
 	void keyPressEvent(QKeyEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
+	void wheelEvent(QWheelEvent *e) override;
 
 private:
 	void monthChanged(QDate month);
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 948a1150a..811cb455d 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -551,10 +551,7 @@ void EditCaptionBox::prepare() {
 			} else if (data->hasImage()) {
 				return true;
 			} else if (const auto urls = data->urls(); !urls.empty()) {
-				if (ranges::find_if(
-					urls,
-					[](const QUrl &url) { return !url.isLocalFile(); }
-				) == urls.end()) {
+				if (ranges::all_of(urls, &QUrl::isLocalFile)) {
 					return true;
 				}
 			}
diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index 3156242a2..59e7bc53b 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -299,7 +299,8 @@ QImage Panel::Button::prepareRippleMask() const {
 }
 
 Panel::Panel(not_null<Call*> call)
-: _call(call)
+:RpWidget(App::wnd())
+, _call(call)
 , _user(call->user())
 , _answerHangupRedial(this, st::callAnswer, &st::callHangup)
 , _decline(this, object_ptr<Button>(this, st::callHangup))
@@ -595,14 +596,18 @@ bool Panel::isGoodUserPhoto(PhotoData *photo) {
 }
 
 void Panel::initGeometry() {
-	auto center = Core::App().getPointForCallPanelCenter();
+	const auto center = Core::App().getPointForCallPanelCenter();
 	_useTransparency = Ui::Platform::TranslucentWindowsSupported(center);
 	setAttribute(Qt::WA_OpaquePaintEvent, !_useTransparency);
 	_padding = _useTransparency ? st::callShadow.extend : style::margins(st::lineWidth, st::lineWidth, st::lineWidth, st::lineWidth);
 	_contentTop = _padding.top() + st::callWidth;
-	auto screen = QApplication::desktop()->screenGeometry(center);
-	auto rect = QRect(0, 0, st::callWidth, st::callHeight);
-	setGeometry(rect.translated(center - rect.center()).marginsAdded(_padding));
+	const auto rect = [&] {
+		const QRect initRect(0, 0, st::callWidth, st::callHeight);
+		return initRect.translated(center - initRect.center()).marginsAdded(_padding);
+	}();
+	setGeometry(rect);
+	setMinimumSize(rect.size());
+	setMaximumSize(rect.size());
 	createBottomImage();
 	updateControlsGeometry();
 }
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index 2ff95d4ae..284fe2609 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -98,13 +98,29 @@ void ComputeDebugMode() {
 }
 
 void ComputeTestMode() {
-	if (QFile(cWorkingDir() + qsl("tdata/withtestmode")).exists()) {
+	if (QFile::exists(cWorkingDir() + qsl("tdata/withtestmode"))) {
 		cSetTestMode(true);
 	}
 }
 
+void ComputeExternalUpdater() {
+	QFile file(qsl("/etc/tdesktop/externalupdater"));
+
+	if (file.exists() && file.open(QIODevice::ReadOnly)) {
+		QTextStream fileStream(&file);
+		while (!fileStream.atEnd()) {
+			const auto path = fileStream.readLine();
+
+			if (path == (cWorkingDir() + cExeName())) {
+				SetUpdaterDisabledAtStartup();
+				return;
+			}
+		}
+	}
+}
+
 void ComputeFreeType() {
-	if (QFile(cWorkingDir() + qsl("tdata/withfreetype")).exists()) {
+	if (QFile::exists(cWorkingDir() + qsl("tdata/withfreetype"))) {
 		cSetUseFreeType(true);
 	}
 }
@@ -124,7 +140,7 @@ void ComputeInstallBetaVersions() {
 	const auto installBetaSettingPath = InstallBetaVersionsSettingPath();
 	if (cAlphaVersion()) {
 		cSetInstallBetaVersion(false);
-	} else if (QFile(installBetaSettingPath).exists()) {
+	} else if (QFile::exists(installBetaSettingPath)) {
 		QFile f(installBetaSettingPath);
 		if (f.open(QIODevice::ReadOnly)) {
 			cSetInstallBetaVersion(f.read(1) != "0");
@@ -168,7 +184,7 @@ bool MoveLegacyAlphaFolder(const QString &folder, const QString &file) {
 	if (QDir(was).exists() && !QDir(now).exists()) {
 		const auto oldFile = was + "/tdata/" + file;
 		const auto newFile = was + "/tdata/alpha";
-		if (QFile(oldFile).exists() && !QFile(newFile).exists()) {
+		if (QFile::exists(oldFile) && !QFile::exists(newFile)) {
 			if (!QFile(oldFile).copy(newFile)) {
 				LOG(("FATAL: Could not copy '%1' to '%2'"
 					).arg(oldFile
@@ -283,6 +299,14 @@ void Launcher::init() {
 	QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
 #endif // OS_MAC_OLD
 
+	// fallback session management is useless for tdesktop since it doesn't have
+	// any "are you sure you want to close this window?" dialogs
+	// but it produces bugs like https://github.com/telegramdesktop/tdesktop/issues/5022
+	// and https://github.com/telegramdesktop/tdesktop/issues/7549
+	// and https://github.com/telegramdesktop/tdesktop/issues/948
+	// more info: https://doc.qt.io/qt-5/qguiapplication.html#isFallbackSessionManagementEnabled
+	QApplication::setFallbackSessionManagementEnabled(false);
+
 	initHook();
 }
 
@@ -328,6 +352,7 @@ void Launcher::workingFolderReady() {
 
 	ComputeTestMode();
 	ComputeDebugMode();
+	ComputeExternalUpdater();
 	ComputeFreeType();
 	ComputeInstallBetaVersions();
 	ComputeInstallationTag();
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 22db8a280..b0fec54c4 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -23,7 +23,7 @@ constexpr auto AppId = "{C4A4AE8F-B9F7-4CC7-8A6C-BF7EEE87ACA5}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Kotatogram Desktop"_cs;
 constexpr auto AppFile = "Kotatogram"_cs;
-constexpr auto AppVersion = 2001006;
-constexpr auto AppVersionStr = "2.1.6";
+constexpr auto AppVersion = 2001007;
+constexpr auto AppVersionStr = "2.1.7";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/SourceFiles/data/data_scheduled_messages.cpp b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
index 8d6831675..75b725b3e 100644
--- a/Telegram/SourceFiles/data/data_scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
@@ -414,6 +414,7 @@ HistoryItem *ScheduledMessages::append(
 			}, data.vmedia());
 			existing->updateReplyMarkup(data.vreply_markup());
 			existing->updateForwardedInfo(data.vfwd_from());
+			existing->updateDate(data.vdate().v);
 			history->owner().requestItemTextRefresh(existing);
 		}, [&](const auto &data) {});
 		return existing;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 10298ce63..d23e8e19d 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -708,6 +708,17 @@ MsgId HistoryItem::idOriginal() const {
 	return id;
 }
 
+void HistoryItem::updateDate(TimeId newDate) {
+	if (canUpdateDate() && _date != newDate) {
+		_date = newDate;
+		_history->owner().requestItemViewRefresh(this);
+	}
+}
+
+bool HistoryItem::canUpdateDate() const {
+	return isScheduled();
+}
+
 void HistoryItem::sendFailed() {
 	Expects(_clientFlags & MTPDmessage_ClientFlag::f_sending);
 	Expects(!(_clientFlags & MTPDmessage_ClientFlag::f_failed));
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 92f149492..20ec30e1e 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -328,6 +328,9 @@ public:
 	[[nodiscard]] virtual std::unique_ptr<HistoryView::Element> createView(
 		not_null<HistoryView::ElementDelegate*> delegate) = 0;
 
+	void updateDate(TimeId newDate);
+	[[nodiscard]] bool canUpdateDate() const;
+
 	virtual ~HistoryItem();
 
 	MsgId id;
diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp
index 524e4c5ea..6a2232b7c 100644
--- a/Telegram/SourceFiles/history/history_message.cpp
+++ b/Telegram/SourceFiles/history/history_message.cpp
@@ -695,7 +695,7 @@ void HistoryMessage::createComponentsHelper(
 	if (flags & MTPDmessage::Flag::f_reply_to_msg_id) config.replyTo = replyTo;
 	if (flags & MTPDmessage::Flag::f_reply_markup) config.mtpMarkup = &markup;
 	if (flags & MTPDmessage::Flag::f_post_author) config.author = postAuthor;
-	if (isPost()) config.viewsCount = 1;
+	if (flags & MTPDmessage::Flag::f_views) config.viewsCount = 1;
 
 	createComponents(config);
 }
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index bf0d0b0c1..a6685ed25 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4570,10 +4570,7 @@ bool HistoryWidget::canSendFiles(not_null<const QMimeData*> data) const {
 	} else if (data->hasImage()) {
 		return true;
 	} else if (const auto urls = data->urls(); !urls.empty()) {
-		if (ranges::find_if(
-			urls,
-			[](const QUrl &url) { return !url.isLocalFile(); }
-		) == urls.end()) {
+		if (ranges::all_of(urls, &QUrl::isLocalFile)) {
 			return true;
 		}
 	}
@@ -4775,15 +4772,7 @@ void HistoryWidget::sendFileConfirmed(
 	}
 	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
 	const auto silentPost = file->to.options.silent;
-	if (channelPost) {
-		flags |= MTPDmessage::Flag::f_views;
-		flags |= MTPDmessage::Flag::f_post;
-	}
-	if (!channelPost) {
-		flags |= MTPDmessage::Flag::f_from_id;
-	} else if (peer->asChannel()->addsSignature()) {
-		flags |= MTPDmessage::Flag::f_post_author;
-	}
+	Api::FillMessagePostFlags(action, peer, flags);
 	if (silentPost) {
 		flags |= MTPDmessage::Flag::f_silent;
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
index af14fb3a8..04daa403f 100644
--- a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
@@ -110,6 +110,10 @@ rpl::producer<> ComposeControls::attachRequests() const {
 	});
 }
 
+void ComposeControls::setMimeDataHook(MimeDataHook hook) {
+	_field->setMimeDataHook(std::move(hook));
+}
+
 rpl::producer<not_null<DocumentData*>> ComposeControls::fileChosen() const {
 	return _fileChosen.events();
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/history_view_compose_controls.h
index ecda04061..239b7b1f3 100644
--- a/Telegram/SourceFiles/history/view/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/history_view_compose_controls.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unique_qptr.h"
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
+#include "ui/widgets/input_fields.h"
 #include "chat_helpers/tabbed_selector.h"
 
 class History;
@@ -31,7 +32,6 @@ namespace Ui {
 class SendButton;
 class IconButton;
 class EmojiButton;
-class InputField;
 } // namespace Ui
 
 namespace Main {
@@ -76,6 +76,11 @@ public:
 	[[nodiscard]] auto inlineResultChosen() const
 		-> rpl::producer<ChatHelpers::TabbedSelector::InlineChosen>;
 
+	using MimeDataHook = Fn<bool(
+		not_null<const QMimeData*> data,
+		Ui::InputField::MimeAction action)>;
+	void setMimeDataHook(MimeDataHook hook);
+
 	bool pushTabbedSelectorToThirdSection(
 		not_null<PeerData*> peer,
 		const Window::SectionShow &params);
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index ec3da7b81..397162308 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item.h"
 #include "history/history_message.h"
 #include "history/history_item_text.h"
+#include "history/view/history_view_schedule_box.h"
 #include "history/view/media/history_view_media.h"
 #include "history/view/media/history_view_web_page.h"
 #include "ui/widgets/popup_menu.h"
@@ -29,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_groups.h"
 #include "data/data_channel.h"
 #include "data/data_file_origin.h"
+#include "data/data_scheduled_messages.h"
 #include "core/file_utilities.h"
 #include "base/platform/base_platform_info.h"
 #include "window/window_peer_menu.h"
@@ -61,6 +63,14 @@ constexpr auto kExportLocalTimeout = crl::time(1000);
 //	}
 //}
 
+MsgId ItemIdAcrossData(not_null<HistoryItem*> item) {
+	if (!item->isScheduled()) {
+		return item->id;
+	}
+	const auto session = &item->history()->session();
+	return session->data().scheduledMessages().lookupId(item);
+}
+
 void SavePhotoToFile(not_null<PhotoData*> photo) {
 	if (photo->isNull() || !photo->loaded()) {
 		return;
@@ -385,6 +395,49 @@ bool AddSendNowMessageAction(
 	return true;
 }
 
+bool AddRescheduleMessageAction(
+		not_null<Ui::PopupMenu*> menu,
+		const ContextMenuRequest &request) {
+	const auto item = request.item;
+	if (!item || item->isSending() || !request.selectedItems.empty()) {
+		return false;
+	}
+	const auto peer = item->history()->peer;
+	if (const auto channel = peer->asChannel()) {
+		if (!channel->canEditMessages()) {
+			return false;
+		}
+	}
+	const auto owner = &item->history()->owner();
+	const auto itemId = item->fullId();
+	menu->addAction(tr::lng_context_reschedule(tr::now), [=] {
+		const auto item = owner->message(itemId);
+		if (!item) {
+			return;
+		}
+		const auto callback = [=](Api::SendOptions options) {
+			item->history()->session().api().rescheduleMessage(item, options);
+		};
+
+		const auto sendMenuType = !peer
+			? SendMenuType::Disabled
+			: peer->isSelf()
+			? SendMenuType::Reminder
+			: HistoryView::CanScheduleUntilOnline(peer)
+			? SendMenuType::ScheduledToUser
+			: SendMenuType::Scheduled;
+
+		Ui::show(
+			HistoryView::PrepareScheduleBox(
+				&request.navigation->session(),
+				sendMenuType,
+				callback,
+			item->date() + 600),
+			Ui::LayerOption::KeepOther);
+	});
+	return true;
+}
+
 void AddSendNowAction(
 		not_null<Ui::PopupMenu*> menu,
 		const ContextMenuRequest &request,
@@ -436,7 +489,8 @@ bool AddDeleteMessageAction(
 	if (asGroup) {
 		if (const auto group = owner->groups().find(item)) {
 			if (ranges::find_if(group->items, [](auto item) {
-				return !IsServerMsgId(item->id) || !item->canDelete();
+				const auto id = ItemIdAcrossData(item);
+				return !IsServerMsgId(id) || !item->canDelete();
 			}) != end(group->items)) {
 				return false;
 			}
@@ -495,7 +549,9 @@ bool AddSelectMessageAction(
 	const auto item = request.item;
 	if (request.overSelection && !request.selectedItems.empty()) {
 		return false;
-	} else if (!item || !IsServerMsgId(item->id) || item->serviceMsg()) {
+	} else if (!item
+			|| !IsServerMsgId(ItemIdAcrossData(item))
+			|| item->serviceMsg()) {
 		return false;
 	}
 	const auto owner = &item->history()->owner();
@@ -531,6 +587,7 @@ void AddMessageActions(
 	AddSendNowAction(menu, request, list);
 	AddDeleteAction(menu, request, list);
 	AddSelectionAction(menu, request, list);
+	AddRescheduleMessageAction(menu, request);
 }
 
 void AddCopyLinkAction(
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 40330163e..83fbf0e1b 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -937,6 +937,7 @@ void ListWidget::selectItemAsGroup(not_null<HistoryItem*> item) {
 			item,
 			SelectAction::Select);
 		pushSelectedItems();
+		update();
 	}
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index a286ecddc..42c2e95bb 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1779,6 +1779,9 @@ void Message::fromNameUpdated(int width) const {
 }
 
 TextSelection Message::skipTextSelection(TextSelection selection) const {
+	if (selection.from == 0xFFFF) {
+		return selection;
+	}
 	return HistoryView::UnshiftItemSelection(selection, message()->_text);
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.h b/Telegram/SourceFiles/history/view/history_view_schedule_box.h
index 6e4e9c3c2..d51b2e2b1 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.h
+++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.h
@@ -29,12 +29,13 @@ template <typename Guard, typename Submit>
 [[nodiscard]] object_ptr<Ui::GenericBox> PrepareScheduleBox(
 		Guard &&guard,
 		SendMenuType type,
-		Submit &&submit) {
+		Submit &&submit,
+		TimeId scheduleTime = DefaultScheduleTime()) {
 	return Box(
 		ScheduleBox,
 		type,
 		crl::guard(std::forward<Guard>(guard), std::forward<Submit>(submit)),
-		DefaultScheduleTime());
+		scheduleTime);
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 5e519f23f..24ddbb0d4 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -44,6 +44,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_info.h"
 #include "styles/style_boxes.h"
 
+#include <QtCore/QMimeData>
+
 namespace HistoryView {
 namespace {
 
@@ -55,6 +57,17 @@ void ShowErrorToast(const QString &text) {
 	});
 }
 
+bool CanSendFiles(not_null<const QMimeData*> data) {
+	if (data->hasImage()) {
+		return true;
+	} else if (const auto urls = data->urls(); !urls.empty()) {
+		if (ranges::all_of(urls, &QUrl::isLocalFile)) {
+			return true;
+		}
+	}
+	return false;
+}
+
 } // namespace
 
 object_ptr<Window::SectionWidget> ScheduledMemento::createWidget(
@@ -165,6 +178,20 @@ void ScheduledWidget::setupComposeControls() {
 			ChatHelpers::TabbedSelector::InlineChosen chosen) {
 		sendInlineResult(chosen.result, chosen.bot);
 	}, lifetime());
+
+	_composeControls->setMimeDataHook([=](
+			not_null<const QMimeData*> data,
+			Ui::InputField::MimeAction action) {
+		if (action == Ui::InputField::MimeAction::Check) {
+			return CanSendFiles(data);
+		} else if (action == Ui::InputField::MimeAction::Insert) {
+			return confirmSendingFiles(
+				data,
+				CompressConfirm::Auto,
+				data->text());
+		}
+		Unexpected("action in MimeData hook.");
+	});
 }
 
 void ScheduledWidget::chooseAttach() {
@@ -214,6 +241,43 @@ void ScheduledWidget::chooseAttach() {
 	}), nullptr);
 }
 
+bool ScheduledWidget::confirmSendingFiles(
+		not_null<const QMimeData*> data,
+		CompressConfirm compressed,
+		const QString &insertTextOnCancel) {
+	const auto hasImage = data->hasImage();
+
+	if (const auto urls = data->urls(); !urls.empty()) {
+		auto list = Storage::PrepareMediaList(
+			urls,
+			st::sendMediaPreviewSize);
+		if (list.error != Storage::PreparedList::Error::NonLocalUrl) {
+			if (list.error == Storage::PreparedList::Error::None
+				|| !hasImage) {
+				const auto emptyTextOnCancel = QString();
+				confirmSendingFiles(
+					std::move(list),
+					compressed,
+					emptyTextOnCancel);
+				return true;
+			}
+		}
+	}
+
+	if (hasImage) {
+		auto image = qvariant_cast<QImage>(data->imageData());
+		if (!image.isNull()) {
+			confirmSendingFiles(
+				std::move(image),
+				QByteArray(),
+				compressed,
+				insertTextOnCancel);
+			return true;
+		}
+	}
+	return false;
+}
+
 bool ScheduledWidget::confirmSendingFiles(
 		Storage::PreparedList &&list,
 		CompressConfirm compressed,
@@ -834,6 +898,10 @@ void ScheduledWidget::listScrollTo(int top) {
 }
 
 void ScheduledWidget::listCancelRequest() {
+	if (_inner && !_inner->getSelectedItems().empty()) {
+		clearSelected();
+		return;
+	}
 	controller()->showBackFromStack();
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index a7c92df1a..146059209 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -159,6 +159,10 @@ private:
 		Storage::PreparedList &&list,
 		CompressConfirm compressed,
 		const QString &insertTextOnCancel = QString());
+	bool confirmSendingFiles(
+		not_null<const QMimeData*> data,
+		CompressConfirm compressed,
+		const QString &insertTextOnCancel = QString());
 	bool showSendingFilesError(const Storage::PreparedList &list) const;
 	void uploadFilesAfterConfirmation(
 		Storage::PreparedList &&list,
diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index 9356bfc78..9c405c00c 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -21,9 +21,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "facades.h"
 #include "app.h"
 
-#include <AL/al.h>
-#include <AL/alc.h>
-#include <AL/alext.h>
+#include <al.h>
+#include <alc.h>
+#ifndef TDESKTOP_DISABLE_OPENAL_EFFECTS
+#include <alext.h>
+#endif // !TDESKTOP_DISABLE_OPENAL_EFFECTS
 
 #include <numeric>
 
@@ -82,18 +84,31 @@ bool PlaybackErrorHappened() {
 
 void EnumeratePlaybackDevices() {
 	auto deviceNames = QStringList();
-	auto devices = alcGetString(nullptr, ALC_ALL_DEVICES_SPECIFIER);
+	auto devices = [&] {
+		if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT")) {
+			return alcGetString(nullptr, alcGetEnumValue(nullptr, "ALC_ALL_DEVICES_SPECIFIER"));
+		} else {
+			return alcGetString(nullptr, ALC_DEVICE_SPECIFIER);
+		}
+	}();
 	Assert(devices != nullptr);
 	while (*devices != 0) {
 		auto deviceName8Bit = QByteArray(devices);
-		auto deviceName = QString::fromLocal8Bit(deviceName8Bit);
+		auto deviceName = QString::fromUtf8(deviceName8Bit);
 		deviceNames.append(deviceName);
 		devices += deviceName8Bit.size() + 1;
 	}
 	LOG(("Audio Playback Devices: %1").arg(deviceNames.join(';')));
 
-	if (auto device = alcGetString(nullptr, ALC_DEFAULT_ALL_DEVICES_SPECIFIER)) {
-		LOG(("Audio Playback Default Device: %1").arg(QString::fromLocal8Bit(device)));
+	auto device = [&] {
+		if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT")) {
+			return alcGetString(nullptr, alcGetEnumValue(nullptr, "ALC_DEFAULT_ALL_DEVICES_SPECIFIER"));
+		} else {
+			return alcGetString(nullptr, ALC_DEFAULT_DEVICE_SPECIFIER);
+		}
+	}();
+	if (device) {
+		LOG(("Audio Playback Default Device: %1").arg(QString::fromUtf8(device)));
 	} else {
 		LOG(("Audio Playback Default Device: (null)"));
 	}
@@ -105,14 +120,14 @@ void EnumerateCaptureDevices() {
 	Assert(devices != nullptr);
 	while (*devices != 0) {
 		auto deviceName8Bit = QByteArray(devices);
-		auto deviceName = QString::fromLocal8Bit(deviceName8Bit);
+		auto deviceName = QString::fromUtf8(deviceName8Bit);
 		deviceNames.append(deviceName);
 		devices += deviceName8Bit.size() + 1;
 	}
 	LOG(("Audio Capture Devices: %1").arg(deviceNames.join(';')));
 
 	if (auto device = alcGetString(nullptr, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER)) {
-		LOG(("Audio Capture Default Device: %1").arg(QString::fromLocal8Bit(device)));
+		LOG(("Audio Capture Default Device: %1").arg(QString::fromUtf8(device)));
 	} else {
 		LOG(("Audio Capture Default Device: (null)"));
 	}
@@ -1498,8 +1513,11 @@ bool audioDeviceIsConnected() {
 	if (!AudioDevice) {
 		return false;
 	}
-	auto isConnected = ALint(0);
-	alcGetIntegerv(AudioDevice, ALC_CONNECTED, 1, &isConnected);
+	// always connected in the basic OpenAL, disconnect status is an extension
+	auto isConnected = ALint(1);
+	if (alcIsExtensionPresent(nullptr, "ALC_EXT_disconnect")) {
+		alcGetIntegerv(AudioDevice, alcGetEnumValue(nullptr, "ALC_CONNECTED"), 1, &isConnected);
+	}
 	if (Audio::ContextErrorHappened()) {
 		return false;
 	}
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
index 3bc9a3845..d2ce3a392 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
@@ -9,9 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "media/audio/media_audio_ffmpeg_loader.h"
 
-#include <AL/al.h>
-#include <AL/alc.h>
-#include <AL/alext.h>
+#include <al.h>
+#include <alc.h>
 
 #include <numeric>
 
@@ -63,7 +62,7 @@ Instance::Instance() : _inner(new Inner(&_thread)) {
 void Instance::check() {
 	_available = false;
 	if (auto device = alcGetString(0, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER)) {
-		if (!QString::fromLocal8Bit(device).isEmpty()) {
+		if (!QString::fromUtf8(device).isEmpty()) {
 			_available = true;
 			return;
 		}
diff --git a/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h
index 03581b626..c0c5f32ca 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h
@@ -18,7 +18,7 @@ extern "C" {
 #include <libswresample/swresample.h>
 } // extern "C"
 
-#include <AL/al.h>
+#include <al.h>
 
 namespace Media {
 
diff --git a/Telegram/SourceFiles/media/audio/media_audio_track.cpp b/Telegram/SourceFiles/media/audio/media_audio_track.cpp
index 3ce449af6..6e5e56c45 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_track.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_track.cpp
@@ -11,9 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_audio.h"
 #include "core/application.h"
 
-#include <AL/al.h>
-#include <AL/alc.h>
-#include <AL/alext.h>
+#include <al.h>
+#include <alc.h>
 
 namespace Media {
 namespace Audio {
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index eaffe80b8..f9281f366 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -271,6 +271,14 @@ bool IsGtkFileDialogForced() {
 #endif // !TDESKTOP_FORCE_GTK_FILE_DIALOG
 }
 
+bool IsQtPluginsBundled() {
+#ifdef DESKTOP_APP_USE_PACKAGED_LAZY
+	return true;
+#else // DESKTOP_APP_USE_PACKAGED_LAZY
+	return false;
+#endif // !DESKTOP_APP_USE_PACKAGED_LAZY
+}
+
 bool IsXDGDesktopPortalPresent() {
 #ifdef TDESKTOP_DISABLE_DBUS_INTEGRATION
 	static const auto XDGDesktopPortalPresent = false;
@@ -633,14 +641,16 @@ void start() {
 	if(IsStaticBinary()
 		|| InAppImage()
 		|| InSandbox()
-		|| InSnap()) {
+		|| InSnap()
+		|| IsQtPluginsBundled()) {
 		qputenv("QT_WAYLAND_DECORATION", "material");
 	}
 
 	if(IsStaticBinary()
 		|| InAppImage()
 		|| InSnap()
-		|| IsGtkFileDialogForced()) {
+		|| IsGtkFileDialogForced()
+		|| IsQtPluginsBundled()) {
 		LOG(("Checking for XDG Desktop Portal..."));
 		// this can give us a chance to use a proper file dialog for current session
 		if (IsXDGDesktopPortalPresent()) {
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h
index f3a79555e..a0cff2971 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.h
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.h
@@ -25,6 +25,7 @@ bool InSnap();
 bool InAppImage();
 bool IsStaticBinary();
 bool IsGtkFileDialogForced();
+bool IsQtPluginsBundled();
 
 bool IsXDGDesktopPortalPresent();
 bool UseXDGDesktopPortal();
diff --git a/Telegram/SourceFiles/platform/mac/launcher_mac.mm b/Telegram/SourceFiles/platform/mac/launcher_mac.mm
index 28da1bf59..080f7471b 100644
--- a/Telegram/SourceFiles/platform/mac/launcher_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/launcher_mac.mm
@@ -64,6 +64,7 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
 		if (Logs::DebugEnabled()) [args addObject:@"-debug"];
 		if (cStartInTray()) [args addObject:@"-startintray"];
 		if (cTestMode()) [args addObject:@"-testmode"];
+		if (cUseFreeType()) [args addObject:@"-freetype"];
 #ifndef TDESKTOP_DISABLE_AUTOUPDATE
 		if (Core::UpdaterDisabled()) [args addObject:@"-externalupdater"];
 #endif // !TDESKTOP_DISABLE_AUTOUPDATE
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
index 6f327d121..6f0e0b765 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@@ -34,7 +34,7 @@ void queryDoNotDisturbState() {
 
 	auto userDefaults = [NSUserDefaults alloc];
 	if ([userDefaults respondsToSelector:@selector(initWithSuiteName:)]) {
-		id userDefaultsValue = [[[NSUserDefaults alloc] initWithSuiteName:@"com.apple.notificationcenterui_test"] objectForKey:@"doNotDisturb"];
+		id userDefaultsValue = [[[NSUserDefaults alloc] initWithSuiteName:@"com.apple.notificationcenterui"] objectForKey:@"doNotDisturb"];
 		DoNotDisturbEnabled = ([userDefaultsValue boolValue] == YES);
 	} else {
 		DoNotDisturbEnabled = false;
diff --git a/Telegram/SourceFiles/platform/win/launcher_win.cpp b/Telegram/SourceFiles/platform/win/launcher_win.cpp
index 176dd041a..b2584cd0c 100644
--- a/Telegram/SourceFiles/platform/win/launcher_win.cpp
+++ b/Telegram/SourceFiles/platform/win/launcher_win.cpp
@@ -71,6 +71,9 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
 	if (cTestMode()) {
 		pushArgument(qsl("-testmode"));
 	}
+	if (cUseFreeType()) {
+		pushArgument(qsl("-freetype"));
+	}
 #ifndef TDESKTOP_DISABLE_AUTOUPDATE
 	if (Core::UpdaterDisabled()) {
 		pushArgument(qsl("-externalupdater"));
diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp
index f3522641b..4174957d3 100644
--- a/Telegram/SourceFiles/qt_static_plugins.cpp
+++ b/Telegram/SourceFiles/qt_static_plugins.cpp
@@ -53,6 +53,7 @@ Q_IMPORT_PLUGIN(QWaylandMaterialDecorationPlugin)
 Q_IMPORT_PLUGIN(NimfInputContextPlugin)
 #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
 Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
+Q_IMPORT_PLUGIN(QFcitx5PlatformInputContextPlugin)
 Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
 #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
 #endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY
diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp
index 5952ccf8e..3f7345c9b 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications.cpp
@@ -431,13 +431,17 @@ NotificationsCount::~NotificationsCount() {
 NotificationsCount::SampleWidget::SampleWidget(
 	NotificationsCount *owner,
 	const QPixmap &cache)
-: QWidget(nullptr)
+: QWidget(App::wnd())
 , _owner(owner)
 , _cache(cache) {
-	resize(
+	const QSize size(
 		cache.width() / cache.devicePixelRatio(),
 		cache.height() / cache.devicePixelRatio());
 
+	resize(size);
+	setMinimumSize(size);
+	setMaximumSize(size);
+
 	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint)
 		| Qt::WindowStaysOnTopHint
 		| Qt::BypassWindowManagerHint
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 5cc8c142f..e9aa14e15 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -37,6 +37,12 @@ namespace {
 constexpr auto kMinimalAlertDelay = crl::time(500);
 constexpr auto kWaitingForAllGroupedDelay = crl::time(1000);
 
+#ifdef Q_OS_MAC
+constexpr auto kSystemAlertDuration = crl::time(1000);
+#else // !Q_OS_MAC
+constexpr auto kSystemAlertDuration = crl::time(0);
+#endif // Q_OS_MAC
+
 } // namespace
 
 System::System(not_null<Main::Session*> session)
@@ -297,7 +303,7 @@ void System::showNext() {
 		if (Global::FlashBounceNotify() && !Platform::Notifications::SkipFlashBounce()) {
 			if (const auto widget = App::wnd()) {
 				if (const auto window = widget->windowHandle()) {
-					window->alert(0);
+					window->alert(kSystemAlertDuration);
 					// (window, SLOT(_q_clearAlert())); in the future.
 				}
 			}
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index 965da1904..da1318266 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/call_delayed.h"
 #include "facades.h"
 #include "app.h"
+#include "mainwindow.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_layers.h"
 #include "styles/style_window.h"
@@ -374,7 +375,7 @@ Widget::Widget(
 	QPoint startPosition,
 	int shift,
 	Direction shiftDirection)
-: TWidget(nullptr)
+: TWidget(App::wnd())
 , _manager(manager)
 , _startPosition(startPosition)
 , _direction(shiftDirection)
@@ -488,6 +489,8 @@ void Widget::addToHeight(int add) {
 
 void Widget::updateGeometry(int x, int y, int width, int height) {
 	setGeometry(x, y, width, height);
+	setMinimumSize(QSize(width, height));
+	setMaximumSize(QSize(width, height));
 	update();
 }
 
diff --git a/Telegram/ThirdParty/fcitx5-qt b/Telegram/ThirdParty/fcitx5-qt
index 7561f994a..b7bdd8aec 160000
--- a/Telegram/ThirdParty/fcitx5-qt
+++ b/Telegram/ThirdParty/fcitx5-qt
@@ -1 +1 @@
-Subproject commit 7561f994a79320a4940a1f95c884004c4dd178f4
+Subproject commit b7bdd8aec2dcb44dc792fedec89d67be0c527ca1
diff --git a/Telegram/build/version b/Telegram/build/version
index d3e7a2eaf..e2838af08 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2001006
+AppVersion         2001007
 AppVersionStrMajor 2.1
-AppVersionStrSmall 2.1.6
-AppVersionStr      2.1.6
+AppVersionStrSmall 2.1.7
+AppVersionStr      2.1.7
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 2.1.6
+AppVersionOriginal 2.1.7
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index d21837e8a..6e72dcb00 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit d21837e8ac9464225245ed86a80dca8050f86272
+Subproject commit 6e72dcb00a83aff5b22daa2b7dcd434abb82dbb4
diff --git a/changelog.txt b/changelog.txt
index 6036949fe..6fd363d75 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+2.1.7 (24.05.20)
+
+- Fix the Fcitx input method plugin.
+
 2.1.6 (14.05.20)
 
 - Bug fixes and other minor improvements.
diff --git a/cmake b/cmake
index 4ea254886..f4271f2cd 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 4ea254886efd273cd4b01eb5128fe67d47959e4e
+Subproject commit f4271f2cd44b66b042a076ef1e2fa0d442c33afe
diff --git a/docs/building-cmake.md b/docs/building-cmake.md
index 8a40103c7..dbd42d068 100644
--- a/docs/building-cmake.md
+++ b/docs/building-cmake.md
@@ -91,6 +91,7 @@ Go to ***BuildPath*** and run
     --disable-autodetect \
     --disable-everything \
     --disable-neon \
+    --disable-alsa \
     --disable-iconv \
     --enable-libopus \
     --enable-vaapi \
@@ -211,18 +212,25 @@ Go to ***BuildPath*** and run
     sudo make install_sw
     cd ..
 
-    git clone https://github.com/xkbcommon/libxkbcommon.git
-    cd libxkbcommon
-    git checkout xkbcommon-0.8.4
-    ./autogen.sh
-    make $MAKE_THREADS_CNT
+    git clone -b 1.16 https://gitlab.freedesktop.org/wayland/wayland
+    cd wayland
+    ./autogen.sh \
+    --enable-static \
+    --disable-documentation \
+    --disable-dtd-validation
+    make -j$(nproc)
     sudo make install
     cd ..
 
-    git clone -b 1.16 https://gitlab.freedesktop.org/wayland/wayland
-    cd wayland
-    ./autogen.sh --enable-static --disable-documentation  --disable-dtd-validation
-    make -j$(nproc)
+    git clone https://github.com/xkbcommon/libxkbcommon.git
+    cd libxkbcommon
+    git checkout xkbcommon-0.8.4
+    ./autogen.sh \
+    --disable-docs \
+    --disable-wayland \
+    --with-xkb-config-root=/usr/share/X11/xkb \
+    --with-x-locale-root=/usr/share/X11/locale
+    make $MAKE_THREADS_CNT
     sudo make install
     cd ..
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index c4daacbec..c69fe5d87 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -217,7 +217,6 @@ parts:
     source-branch: release/4.2
     plugin: autotools
     build-packages:
-      - libasound2-dev
       - libopus-dev
       - libva-dev
       - libvdpau-dev
@@ -231,6 +230,7 @@ parts:
       - --disable-autodetect
       - --disable-everything
       - --disable-neon
+      - --disable-alsa
       - --disable-iconv
       - --enable-shared
       - --enable-libdav1d